Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Add feed title to imported entries

Browse Source 
Also fixes one bug where a new feed was not saved and
improved HTML stripping a bit.
This commit is contained in:
Torsten Grote
2016-08-22 12:04:20 -03:00
parent 22e7ec5b27
commit e10f68b496
4 changed files with 69 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-api/src/org/briarproject/api/feed/Feed.java
View File

@@ -83,14 +83,17 @@ public class Feed {
lastEntryTime);
}
@Nullable
public String getTitle() {
return title;
}
@Nullable
public String getDescription() {
return description;
}
@Nullable
public String getAuthor() {
return author;
}

3
briar-api/src/org/briarproject/api/identity/IdentityManager.java
View File

@@ -20,6 +20,9 @@ public interface IdentityManager {
/** Returns the local pseudonym with the given ID. */
LocalAuthor getLocalAuthor(AuthorId a) throws DbException;
/** Returns the local pseudonym with the given ID. */
LocalAuthor getLocalAuthor(Transaction txn, AuthorId a) throws DbException;
/** Returns the main local identity. */
LocalAuthor getLocalAuthor() throws DbException;

76
briar-core/src/org/briarproject/feed/FeedManagerImpl.java
View File

@@ -149,19 +149,42 @@ class FeedManagerImpl implements FeedManager, Service, Client {
LOG.info("Adding new RSS feed...");
// TODO check for existing feed?
// fetch feed to get its metadata
Feed feed = new Feed(url, g, clock.currentTimeMillis());
try {
feed = fetchFeed(feed);
feed = fetchFeed(feed, false);
} catch (FeedException e) {
throw new IOException(e);
}
// store feed
Transaction txn = db.startTransaction(false);
try {
List<Feed> feeds = getFeeds(txn);
feeds.add(feed);
storeFeeds(txn, feeds);
txn.setComplete();
} finally {
//noinspection ThrowFromFinallyBlock
db.endTransaction(txn);
}
// fetch feed again, post entries this time
try {
feed = fetchFeed(feed, true);
} catch (FeedException e) {
throw new IOException(e);
}
// store feed again to also store last added entry
txn = db.startTransaction(false);
try {
List<Feed> feeds = getFeeds(txn);
feeds.add(feed);
storeFeeds(txn, feeds);
txn.setComplete();
} finally {
//noinspection ThrowFromFinallyBlock
db.endTransaction(txn);
}
}
@@ -182,6 +205,7 @@ class FeedManagerImpl implements FeedManager, Service, Client {
}
if (!found) throw new DbException();
storeFeeds(txn, feeds);
txn.setComplete();
} finally {
db.endTransaction(txn);
}
@@ -263,7 +287,7 @@ class FeedManagerImpl implements FeedManager, Service, Client {
List<Feed> newFeeds = new ArrayList<Feed>(feeds.size());
for (Feed feed : feeds) {
try {
newFeeds.add(fetchFeed(feed));
newFeeds.add(fetchFeed(feed, true));
} catch (FeedException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
@@ -283,7 +307,8 @@ class FeedManagerImpl implements FeedManager, Service, Client {
LOG.info("Done updating RSS feeds");
}
private Feed fetchFeed(Feed feed) throws FeedException, IOException {
private Feed fetchFeed(Feed feed, boolean post)
throws FeedException, IOException {
if (LOG.isLoggable(INFO))
LOG.info("Fetching feed from " + feed.getUrl());
@@ -301,23 +326,28 @@ class FeedManagerImpl implements FeedManager, Service, Client {
StringUtils.isNullOrEmpty(f.getAuthor()) ? null : f.getAuthor();
if (author != null) author = stripHTML(author);
if (f.getEntries().size() == 0)
throw new FeedException("Feed has no entries");
// sort and add new entries
Collections.sort(f.getEntries(), getEntryComparator());
for (SyndEntry entry : f.getEntries()) {
long entryTime;
if (entry.getPublishedDate() != null) {
entryTime = entry.getPublishedDate().getTime();
} else if (entry.getUpdatedDate() != null) {
entryTime = entry.getUpdatedDate().getTime();
} else {
// no time information available, ignore this entry
if (LOG.isLoggable(WARNING))
LOG.warning("Entry has no date: " + entry.getTitle());
continue;
}
if (entryTime > feed.getLastEntryTime()) {
postEntry(feed, entry);
if (entryTime > lastEntryTime) lastEntryTime = entryTime;
if (post) {
Collections.sort(f.getEntries(), getEntryComparator());
for (SyndEntry entry : f.getEntries()) {
long entryTime;
if (entry.getPublishedDate() != null) {
entryTime = entry.getPublishedDate().getTime();
} else if (entry.getUpdatedDate() != null) {
entryTime = entry.getUpdatedDate().getTime();
} else {
// no time information available, ignore this entry
if (LOG.isLoggable(WARNING))
LOG.warning("Entry has no date: " + entry.getTitle());
continue;
}
if (entryTime > feed.getLastEntryTime()) {
postEntry(feed, entry);
if (entryTime > lastEntryTime) lastEntryTime = entryTime;
}
}
}
return new Feed(feed.getUrl(), feed.getBlogId(), title, description,
@@ -356,9 +386,14 @@ class FeedManagerImpl implements FeedManager, Service, Client {
private void postEntry(Feed feed, SyndEntry entry) {
LOG.info("Adding new entry...");
// TODO do this within one database transaction?
// build post body
StringBuilder b = new StringBuilder();
if (feed.getTitle() != null) {
// HTML in feed title was already stripped
b.append(feed.getTitle()).append("\n\n");
}
if (!StringUtils.isNullOrEmpty(entry.getTitle())) {
b.append(stripHTML(entry.getTitle())).append("\n\n");
}
@@ -416,7 +451,8 @@ class FeedManagerImpl implements FeedManager, Service, Client {
}
private String stripHTML(String s) {
return StringUtils.trim(s.replaceAll("<.*?>", ""));
s = s.replaceAll("<script.*?>(?s).*?</script>", "");
return StringUtils.trim(s.replaceAll("<(?s).*?>", ""));
}
private byte[] getPostBody(String text) {

8
briar-core/src/org/briarproject/identity/IdentityManagerImpl.java
View File

@@ -60,7 +60,7 @@ class IdentityManagerImpl implements IdentityManager {
LocalAuthor author;
Transaction txn = db.startTransaction(true);
try {
author = db.getLocalAuthor(txn, a);
author = getLocalAuthor(txn, a);
txn.setComplete();
} finally {
db.endTransaction(txn);
@@ -68,6 +68,12 @@ class IdentityManagerImpl implements IdentityManager {
return author;
}
@Override
public LocalAuthor getLocalAuthor(Transaction txn, AuthorId a)
throws DbException {
return db.getLocalAuthor(txn, a);
}
@Override
public LocalAuthor getLocalAuthor() throws DbException {
return getLocalAuthors().iterator().next();