Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

new fetchedfeed class

Browse Source
This commit is contained in:
Athou
2013-04-25 12:30:21 +02:00
parent 3cbdbcc6f7
commit effa009241
6 changed files with 81 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
View File

@@ -28,11 +28,11 @@ public class FeedFetcher {
@Inject
HttpGetter getter;
public Feed fetch(String feedUrl, boolean extractFeedUrlFromHtml,
public FetchedFeed fetch(String feedUrl, boolean extractFeedUrlFromHtml,
String lastModified, String eTag) throws FeedException,
ClientProtocolException, IOException, NotModifiedException {
log.debug("Fetching feed {}", feedUrl);
Feed feed = null;
FetchedFeed fetchedFeed = null;
HttpResult result = getter.getBinary(feedUrl, lastModified, eTag);
if (extractFeedUrlFromHtml) {
@@ -43,12 +43,12 @@ public class FeedFetcher {
feedUrl = extractedUrl;
}
}
feed = parser.parse(feedUrl, result.getContent());
fetchedFeed = parser.parse(feedUrl, result.getContent());
Feed feed = fetchedFeed.getFeed();
feed.setLastModifiedHeader(result.getLastModifiedSince());
feed.setEtagHeader(result.geteTag());
feed.setFetchDuration(result.getDuration());
return feed;
fetchedFeed.setFetchDuration(result.getDuration());
return fetchedFeed;
}
private String extractFeedUrl(String html, String baseUri) {