From 5370db7c5ead42d4c3280cc8f2d7e0d859b53e31 Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 17 Mar 2019 07:05:29 +0100 Subject: [PATCH] rename for clarity --- .../java/com/commafeed/backend/feed/FeedFetcher.java | 10 +++++----- .../commafeed/backend/urlprovider/FeedURLProvider.java | 5 ++++- .../urlprovider/InPageReferenceFeedURLProvider.java | 4 ++-- .../backend/urlprovider/YoutubeFeedURLProvider.java | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/commafeed/backend/feed/FeedFetcher.java b/src/main/java/com/commafeed/backend/feed/FeedFetcher.java index 0cc546c7..bfd17ff7 100644 --- a/src/main/java/com/commafeed/backend/feed/FeedFetcher.java +++ b/src/main/java/com/commafeed/backend/feed/FeedFetcher.java @@ -43,7 +43,7 @@ public class FeedFetcher { fetchedFeed = parser.parse(result.getUrlAfterRedirect(), content); } catch (FeedException e) { if (extractFeedUrlFromHtml) { - String extractedUrl = extractFeedUrl(urlProviders, StringUtils.newStringUtf8(result.getContent()), feedUrl); + String extractedUrl = extractFeedUrl(urlProviders, feedUrl, StringUtils.newStringUtf8(result.getContent())); if (org.apache.commons.lang3.StringUtils.isNotBlank(extractedUrl)) { feedUrl = extractedUrl; @@ -83,11 +83,11 @@ public class FeedFetcher { return fetchedFeed; } - private static String extractFeedUrl(Set urlProviders, String html, String baseUri) { + private static String extractFeedUrl(Set urlProviders, String url, String urlContent) { for (FeedURLProvider urlProvider : urlProviders) { - String url = urlProvider.get(html, baseUri); - if (url != null) - return url; + String feedUrl = urlProvider.get(url, urlContent); + if (feedUrl != null) + return feedUrl; } return null; diff --git a/src/main/java/com/commafeed/backend/urlprovider/FeedURLProvider.java b/src/main/java/com/commafeed/backend/urlprovider/FeedURLProvider.java index 87547c2c..34b137f1 100644 --- a/src/main/java/com/commafeed/backend/urlprovider/FeedURLProvider.java +++ b/src/main/java/com/commafeed/backend/urlprovider/FeedURLProvider.java @@ -1,7 +1,10 @@ package com.commafeed.backend.urlprovider; +/** + * Tries to find a feed url given the url and page content + */ public interface FeedURLProvider { - String get(String html, String url); + String get(String url, String urlContent); } diff --git a/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java b/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java index 11c72261..36913423 100644 --- a/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java +++ b/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java @@ -7,10 +7,10 @@ import org.jsoup.select.Elements; public class InPageReferenceFeedURLProvider implements FeedURLProvider { @Override - public String get(String html, String url) { + public String get(String url, String urlContent) { String foundUrl = null; - Document doc = Jsoup.parse(html, url); + Document doc = Jsoup.parse(urlContent, url); String root = doc.children().get(0).tagName(); if ("html".equals(root)) { Elements atom = doc.select("link[type=application/atom+xml]"); diff --git a/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java b/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java index 4fc60e57..ab94a1c0 100644 --- a/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java +++ b/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java @@ -14,7 +14,7 @@ public class YoutubeFeedURLProvider implements FeedURLProvider { private static final Pattern REGEXP = Pattern.compile("(.*\\byoutube\\.com)\\/channel\\/([^\\/]+)", Pattern.CASE_INSENSITIVE); @Override - public String get(String html, String url) { + public String get(String url, String urlContent) { Matcher matcher = REGEXP.matcher(url); return matcher.find() ? matcher.group(1) + "/feeds/videos.xml?channel_id=" + matcher.group(2) : null; }