FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add items sorting before insertion

This commit is contained in:
Shinokuni 2019-02-07 14:32:49 +00:00
parent 098ae50044
commit 659eeaa48b
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/readrops/app/LocalFeedRepository.java
View File

@ -22,12 +22,16 @@ import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
import com.readrops.readropslibrary.localfeed.json.JSONFeed; import com.readrops.readropslibrary.localfeed.json.JSONFeed;
import com.readrops.readropslibrary.localfeed.rss.RSSFeed; import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
import org.joda.time.LocalDateTime;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.TreeMap;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
@ -134,7 +138,12 @@ public class LocalFeedRepository extends ARepository implements QueryCallback {
database.feedDao().updateHeaders(rssFeed.getEtag(), rssFeed.getLastModified(), dbFeed.getId()); database.feedDao().updateHeaders(rssFeed.getEtag(), rssFeed.getLastModified(), dbFeed.getId());
List<Item> dbItems = Item.itemsFromRSS(rssFeed.getChannel().getItems(), dbFeed); List<Item> dbItems = Item.itemsFromRSS(rssFeed.getChannel().getItems(), dbFeed);
insertItems(dbItems, dbFeed); TreeMap<LocalDateTime, Item> sortedItems = new TreeMap<>(LocalDateTime::compareTo);
for (Item item : dbItems) {
sortedItems.put(item.getPubDate(), item);
}
insertItems(sortedItems.values(), dbFeed);
} catch (Exception e) { } catch (Exception e) {
failureCallBackInMainThread(e); failureCallBackInMainThread(e);
@ -154,7 +163,12 @@ public class LocalFeedRepository extends ARepository implements QueryCallback {
database.feedDao().updateHeaders(feed.getEtag(), feed.getLastModified(), dbFeed.getId()); database.feedDao().updateHeaders(feed.getEtag(), feed.getLastModified(), dbFeed.getId());
List<Item> dbItems = Item.itemsFromATOM(feed.getEntries(), dbFeed); List<Item> dbItems = Item.itemsFromATOM(feed.getEntries(), dbFeed);
insertItems(dbItems, dbFeed); TreeMap<LocalDateTime, Item> sortedItems = new TreeMap<>(LocalDateTime::compareTo);
for (Item item : dbItems) {
sortedItems.put(item.getPubDate(), item);
}
insertItems(sortedItems.values(), dbFeed);
} catch (Exception e) { } catch (Exception e) {
failureCallBackInMainThread(e); failureCallBackInMainThread(e);
@ -173,14 +187,19 @@ public class LocalFeedRepository extends ARepository implements QueryCallback {
database.feedDao().updateHeaders(feed.getEtag(), feed.getLastModified(), dbFeed.getId()); database.feedDao().updateHeaders(feed.getEtag(), feed.getLastModified(), dbFeed.getId());
List<Item> dbItems = Item.itemsFromJSON(feed.getItems(), dbFeed); List<Item> dbItems = Item.itemsFromJSON(feed.getItems(), dbFeed);
insertItems(dbItems, dbFeed); TreeMap<LocalDateTime, Item> sortedItems = new TreeMap<>(LocalDateTime::compareTo);
for (Item item : dbItems) {
sortedItems.put(item.getPubDate(), item);
}
insertItems(sortedItems.values(), dbFeed);
} catch (Exception e) { } catch (Exception e) {
failureCallBackInMainThread(e); failureCallBackInMainThread(e);
} }
} }
private void insertItems(List<Item> items, Feed feed) { private void insertItems(Collection<Item> items, Feed feed) {
for (Item dbItem : items) { for (Item dbItem : items) {
if (!Boolean.valueOf(database.itemDao().guidExist(dbItem.getGuid()))) { if (!Boolean.valueOf(database.itemDao().guidExist(dbItem.getGuid()))) {
if (dbItem.getDescription() != null) { if (dbItem.getDescription() != null) {

2
app/src/main/java/com/readrops/app/Utils.java → app/src/main/java/com/readrops/app/utils/Utils.java
View File

@ -1,4 +1,4 @@
package com.readrops.app; package com.readrops.app.utils;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;