Merge pull request #1835 from TAKeanice/remove_deleted_articles_from_…

…cache Filter article from cache when it was marked deleted
ViennaRSS · Oct 26, 2024 · a108bb2 · a108bb2
2 parents fd467d5 + f7ac919
commit a108bb2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Vienna/Sources/Database/Database.m b/Vienna/Sources/Database/Database.m
@@ -2472,7 +2472,7 @@ -(void)markArticleDeleted:(Article *)article isDeleted:(BOOL)isDeleted
 	NSString * guid = article.guid;
 	Folder * folder = [self folderFromID:folderId];
 	if (folder !=nil) {
-		if (isDeleted && !article.read) {
+        if (isDeleted && !article.read) {
 			[self markArticleRead:folderId guid:guid isRead:YES];
 		}
         FMDatabaseQueue *queue = self.databaseQueue;
@@ -2483,6 +2483,9 @@ -(void)markArticleDeleted:(Article *)article isDeleted:(BOOL)isDeleted
              guid];
         }];
         [article markDeleted:isDeleted];
+        //TODO this should all move to the folder implementation, to make this less of a god object.
+        // Or even better: when marking an article as deleted it triggers the deletion from its folder itself, and that in turn triggers the db update.
+        // The same also applies to deleteArticle and probably many other parts of this class.
         if (folder.countOfCachedArticles > 0) {
             // If we're in a smart folder, the cached article may be different.
             Article * cachedArticle = [folder articleFromGuid:guid];

diff --git a/Vienna/Sources/Models/Folder.m b/Vienna/Sources/Models/Folder.m
@@ -739,7 +739,10 @@ -(void)resetArticleStatuses
                 for (id object in self.cachedGuids) {
                     Article * theArticle = [self.cachedArticles objectForKey:object];
                     if (theArticle != nil) {
-                        [articles addObject:theArticle];
+                        // deleted articles are not removed from cache any more
+                        if (!theArticle.isDeleted) {
+                            [articles addObject:theArticle];
+                        }
                     } else {
                         // some problem
                         NSLog(@"Bug retrieving from cache in folder %li : after %lu insertions of %lu, guid %@",(long)self.itemId, (unsigned long)articles.count,(unsigned long)self.cachedGuids.count,object);