Add alwaysSetReadByID option to plugins

jangernert · Nov 29, 2018 · 4eb2972 · 4eb2972
1 parent 5ce8d7e
commit 4eb2972
Show file tree

Hide file tree

Showing 14 changed files with 150 additions and 9 deletions.
diff --git a/plugins/backend/bazqux/bazquxInterface.vala b/plugins/backend/bazqux/bazquxInterface.vala
@@ -244,6 +244,11 @@ public class FeedReader.bazquxInterface : Peas.ExtensionBase, FeedServerInterfac
 			m_api.edidTag(articleID, "user/-/state/com.google/starred", false);
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		m_api.markAsRead(feedID);

diff --git a/plugins/backend/demo/demoInterface.vala b/plugins/backend/demo/demoInterface.vala
@@ -357,6 +357,17 @@ public class FeedReader.demoInterface : Peas.ExtensionBase, FeedServerInterface
 
 	}
 
+	//--------------------------------------------------------------------------------------
+	// Should setArticleIsRead always be used instead of setFeedRead, setCategoryRead or
+	// markAllItemsRead?
+	// By using IDs as identifier, the articles are known, but it may be less efficient.
+	// If "true", the methods setFeedRead/setCategoryRead/markAllItemsRead never get called.
+	//--------------------------------------------------------------------------------------
+	public bool alwaysSetReadByID()
+	{
+
+	}
+
 
 	//--------------------------------------------------------------------------------------
 	// Mark all articles of the feed as read

diff --git a/plugins/backend/feedbin/feedbinInterface.vala b/plugins/backend/feedbin/feedbinInterface.vala
@@ -309,6 +309,11 @@ public class FeedReader.FeedbinInterface : Peas.ExtensionBase, FeedServerInterfa
 		}
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feed_id)
 	{
 		setRead(feed_id, FeedListType.FEED);

diff --git a/plugins/backend/feedhq/feedhqInterface.vala b/plugins/backend/feedhq/feedhqInterface.vala
@@ -246,6 +246,11 @@ public class FeedReader.FeedHQInterface : Peas.ExtensionBase, FeedServerInterfac
 			m_api.edidTag(articleID, "user/-/state/com.google/starred", false);
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		m_api.markAsRead(feedID);

diff --git a/plugins/backend/feedly/feedlyInterface.vala b/plugins/backend/feedly/feedlyInterface.vala
@@ -202,6 +202,11 @@ public class FeedReader.feedlyInterface : Peas.ExtensionBase, FeedServerInterfac
 		}
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		m_api.mark_as_read(feedID, "feeds", ArticleStatus.READ);

diff --git a/plugins/backend/fresh/freshInterface.vala b/plugins/backend/fresh/freshInterface.vala
@@ -308,6 +308,11 @@ public class FeedReader.freshInterface : Peas.ExtensionBase, FeedServerInterface
 			m_api.editTags(articleID, null, "user/-/state/com.google/starred");
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		m_api.markAllAsRead(feedID);

diff --git a/plugins/backend/inoreader/InoReaderInterface.vala b/plugins/backend/inoreader/InoReaderInterface.vala
@@ -219,6 +219,11 @@ public class FeedReader.InoReaderInterface : Peas.ExtensionBase, FeedServerInter
 			m_api.edidTag(articleID, "user/-/state/com.google/starred", false);
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		m_api.markAsRead(feedID);

diff --git a/plugins/backend/local/localInterface.vala b/plugins/backend/local/localInterface.vala
@@ -335,6 +335,11 @@ public class FeedReader.localInterface : Peas.ExtensionBase, FeedServerInterface
 		return;
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		return;

diff --git a/plugins/backend/oldreader/oldreaderInterface.vala b/plugins/backend/oldreader/oldreaderInterface.vala
@@ -245,6 +245,11 @@ public class FeedReader.OldReaderInterface : Peas.ExtensionBase, FeedServerInter
 			m_api.edidTag(articleID, "user/-/state/com.google/starred", false);
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		m_api.markAsRead(feedID);

diff --git a/plugins/backend/owncloud/OwncloudNewsInterface.vala b/plugins/backend/owncloud/OwncloudNewsInterface.vala
@@ -297,6 +297,11 @@ public class FeedReader.OwncloudNewsInterface : Peas.ExtensionBase, FeedServerIn
 		m_api.updateArticleMarked(articleID, marked);
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		m_api.markFeedRead(feedID, false);

diff --git a/plugins/backend/ttrss/ttrssInterface.vala b/plugins/backend/ttrss/ttrssInterface.vala
@@ -302,6 +302,11 @@ public class FeedReader.ttrssInterface : Peas.ExtensionBase, FeedServerInterface
 		m_api.updateArticleMarked(int.parse(articleID), marked);
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		return false;
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		m_api.catchupFeed(feedID, false);

diff --git a/src/Backend/Backend.vala b/src/Backend/Backend.vala
@@ -505,17 +505,46 @@ namespace FeedReader {
 
 		public void markFeedAsRead(string feedID, bool isCat)
 		{
+			var useID = FeedServer.get_default().alwaysSetReadByID();
+			var articleIDs = "";
+			if(useID)
+			{
+				var listType = isCat ? FeedListType.CATEGORY : FeedListType.FEED;
+				var articles = DataBase.readOnly().read_articles(feedID, listType, ArticleListState.UNREAD, "", -1);
+				foreach (var article in articles)
+				{
+					articleIDs += "," + article.getArticleID();
+				}
+				if (articleIDs != "")
+				{
+					articleIDs = articleIDs.substring(1);
+				}
+			}
+
 			if(isCat)
 			{
 				if(m_offline)
 				{
-					CachedActionManager.get_default().markCategoryRead(feedID);
+					if(useID)
+						CachedActionManager.get_default().markArticleRead(articleIDs, ArticleStatus.READ);
+					else
+						CachedActionManager.get_default().markCategoryRead(feedID);
 				}
 				else
 				{
 					if(m_cacheSync)
-						ActionCache.get_default().markCategoryRead(feedID);
-					asyncPayload pl = () => { FeedServer.get_default().setCategoryRead(feedID); };
+					{
+						if(useID)
+							ActionCache.get_default().markArticleRead(articleIDs, ArticleStatus.READ);
+						else
+							ActionCache.get_default().markCategoryRead(feedID);
+					}
+					asyncPayload pl = () => {
+						if(useID)
+							FeedServer.get_default().setArticleIsRead(articleIDs, ArticleStatus.READ);
+						else
+							FeedServer.get_default().setCategoryRead(feedID);
+					};
 					callAsync.begin((owned)pl, (obj, res) => { callAsync.end(res); });
 				}
 
@@ -531,13 +560,26 @@ namespace FeedReader {
 			{
 				if(m_offline)
 				{
-					CachedActionManager.get_default().markFeedRead(feedID);
+					if(useID)
+						CachedActionManager.get_default().markArticleRead(articleIDs, ArticleStatus.READ);
+					else
+						CachedActionManager.get_default().markFeedRead(feedID);
 				}
 				else
 				{
 					if(m_cacheSync)
-						ActionCache.get_default().markFeedRead(feedID);
-					asyncPayload pl = () => { FeedServer.get_default().setFeedRead(feedID); };
+					{
+						if(useID)
+							ActionCache.get_default().markArticleRead(articleIDs, ArticleStatus.READ);
+						else
+							ActionCache.get_default().markFeedRead(feedID);
+					}
+					asyncPayload pl = () => {
+						if(useID)
+							FeedServer.get_default().setArticleIsRead(articleIDs, ArticleStatus.READ);
+						else
+							FeedServer.get_default().setFeedRead(feedID);
+					};
 					callAsync.begin((owned)pl, (obj, res) => { callAsync.end(res); });
 				}
 
@@ -553,15 +595,43 @@ namespace FeedReader {
 
 		public void markAllItemsRead()
 		{
+			var useID = FeedServer.get_default().alwaysSetReadByID();
+			var articleIDs = "";
+			if(useID)
+			{
+				var articles = DataBase.readOnly().read_articles(FeedID.ALL.to_string(), FeedListType.FEED, ArticleListState.UNREAD, "", -1);
+				foreach (var article in articles)
+				{
+					articleIDs += "," + article.getArticleID();
+				}
+				if (articleIDs != "")
+				{
+					articleIDs = articleIDs.substring(1);
+				}
+			}
+
 			if(m_offline)
 			{
-				CachedActionManager.get_default().markAllRead();
+				if(useID)
+					CachedActionManager.get_default().markArticleRead(articleIDs, ArticleStatus.READ);
+				else
+					CachedActionManager.get_default().markAllRead();
 			}
 			else
 			{
 				if(m_cacheSync)
-					ActionCache.get_default().markAllRead();
-				asyncPayload pl = () => { FeedServer.get_default().markAllItemsRead(); };
+				{
+					if(useID)
+						ActionCache.get_default().markArticleRead(articleIDs, ArticleStatus.READ);
+					else
+						ActionCache.get_default().markAllRead();
+				}
+				asyncPayload pl = () => {
+					if(useID)
+						FeedServer.get_default().setArticleIsRead(articleIDs, ArticleStatus.READ);
+					else
+						FeedServer.get_default().markAllItemsRead();
+				};
 				callAsync.begin((owned)pl, (obj, res) => { callAsync.end(res); });
 			}
 

diff --git a/src/Backend/FeedServer.vala b/src/Backend/FeedServer.vala
@@ -815,6 +815,14 @@ public class FeedReader.FeedServer : GLib.Object {
 		m_plugin.setArticleIsMarked(articleID, marked);
 	}
 
+	public bool alwaysSetReadByID()
+	{
+		if(!m_pluginLoaded)
+			return false;
+
+		return m_plugin.alwaysSetReadByID();
+	}
+
 	public void setFeedRead(string feedID)
 	{
 		if(!m_pluginLoaded)

diff --git a/src/Backend/FeedServerInterface.vala b/src/Backend/FeedServerInterface.vala
@@ -60,6 +60,8 @@ public interface FeedReader.FeedServerInterface : GLib.Object {
 
 	public abstract bool logout();
 
+	public abstract bool alwaysSetReadByID();
+
 	public abstract void setArticleIsRead(string articleIDs, ArticleStatus read);
 
 	public abstract void setArticleIsMarked(string articleID, ArticleStatus marked);