only download articles which are newer than the last stored in local db

2 files changed, 11 insertions, 1 deletions

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 64e7df2f0..4212c1b8c 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -516,6 +516,7 @@
 
 		if ($subop == "download") {
 			$stage = (int) $_REQUEST["stage"];
+			$cid = db_escape_string($_REQUEST["cid"]);
 			$amount = (int) $_REQUEST["amount"];
 			$unread_only = db_escape_string($_REQUEST["unread_only"]);
 
@@ -561,11 +562,15 @@
 						$unread_qpart = "unread = true AND ";
 					}
 
+					if ($cid) {
+						$cid_qpart =  "id > $cid AND ";
+					}
+
 					$result = db_query($link,
 						"SELECT DISTINCT id,title,guid,link,
 								feed_id,content,updated,unread,marked FROM
 							ttrss_user_entries,ttrss_entries
-							WHERE $unread_qpart
+							WHERE $unread_qpart $cid_qpart
 							ref_id = id AND owner_uid = ".$_SESSION["uid"]."
 							ORDER BY updated DESC LIMIT $limit OFFSET $skip");
 	
diff --git a/tt-rss.js b/tt-rss.js
index 15227c325..666476778 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1600,6 +1600,11 @@ function initiate_offline_download(stage) {
 
 		var query = "backend.php?op=rpc&subop=download&stage=" + stage;
 
+		var rs = db.execute("SELECT MAX(id) FROM articles");
+		if (rs.isValidRow()) {
+			query = query + "&cid=" + rs.field(0);
+		}
+
 		if (document.getElementById("download_ops_form")) {
 			query = query + "&" + Form.serialize("download_ops_form");
 		}