relikd/baRSS
1
0
Fork 0
Code Issues Pull Requests Releases Activity

The wicked ghost must vanish! Items emerge from the dead.

Browse Source
This commit is contained in:
relikd
2019-09-19 15:45:15 +02:00
parent 9dbd761fe0
commit 6da852f2c9
4 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
baRSS/Core Data/Feed+Ext.m
View File

@@ -90,52 +90,36 @@
}
/**
Append new articles and increment their sortIndex. Update unread counter on the way.
Append new articles and increment @c sortIndex and unread count.
New articles are in ascending order without any gaps in between.
@note
New articles should be in ascending order without any gaps in between.
If new article is disjunct from the article before, assume a deleted article re-appeared and mark it as read.
@param localSet Use result set @c localSet of method call @c deleteArticles:withRemoteSet:.
@param remoteSet Readonly copy of @c RSParsedFeed.articles.
@param localSet Use result set of @c deleteArticles:withRemoteSet:
*/
- (NSUInteger)insertArticles:(NSMutableSet<FeedArticle*>*)localSet withRemoteSet:(NSArray<RSParsedArticle*>*)remoteSet {
int32_t currentIndex = [[localSet valueForKeyPath:@"@min.sortIndex"] intValue];
NSMutableArray<FeedArticle*>* newlyInserted = [NSMutableArray arrayWithCapacity:remoteSet.count];
NSUInteger c = 0;
for (RSParsedArticle *article in [remoteSet reverseObjectEnumerator]) {
// reverse enumeration ensures correct article order
FeedArticle *storedArticle = [self findRemoteArticle:article inLocalSet:localSet];
if (storedArticle) {
// TODO: stop bullshitting with ghost articles
[localSet removeObject:storedArticle];
// If we encounter an already existing item, assume newly inserted are "ghost" items and mark read.
if (newlyInserted.count > 0) {
for (FeedArticle *ghostItem in newlyInserted) {
ghostItem.unread = NO;
}
[newlyInserted removeAllObjects];
}
// Ensures consecutive block of incrementing numbers on sortIndex
if (storedArticle.sortIndex != currentIndex) {
storedArticle.sortIndex = currentIndex;
}
// Reverse enumeration ensures correct article order
FeedArticle *stored = [self findRemoteArticle:article inLocalSet:localSet];
if (stored) {
[localSet removeObject:stored];
if (stored.sortIndex != currentIndex)
stored.sortIndex = currentIndex; // Ensures block of ascending indices
} else {
FeedArticle *newArticle = [FeedArticle newArticle:article inContext:self.managedObjectContext];
newArticle.sortIndex = currentIndex;
[self addArticlesObject:newArticle];
[newlyInserted addObject:newArticle];
c += 1;
}
currentIndex += 1;
}
return newlyInserted.count; // all ghost items are removed already
return c;
}
/**
Delete all articles from core data, that aren't present anymore.
@param localSet Input a copy of @c self.articles. Output the same set minus deleted articles.
@param remoteSet Readonly copy of @c RSParsedFeed.articles.
@param localSet Input a copy of @c self.articles . Output same set minus deleted articles.
*/
- (NSUInteger)deleteArticles:(NSMutableSet<FeedArticle*>*)localSet withRemoteSet:(NSArray<RSParsedArticle*>*)remoteSet {
NSUInteger c = 0;

2
baRSS/Info.plist
View File

@@ -70,7 +70,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>13435</string>
<string>13460</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.news</string>
<key>LSMinimumSystemVersion</key>

5
baRSS/NSCategories/NSURL+Ext.m
View File

@@ -57,7 +57,10 @@
/// Delete file or folder at URL. If item does not exist, this method does nothing.
- (void)remove {
BOOL success = [[NSFileManager defaultManager] removeItemAtURL:self error:nil];
#ifdef DEBUG
BOOL success =
#endif
[[NSFileManager defaultManager] removeItemAtURL:self error:nil];
#ifdef DEBUG
if (success) printf("DEL %s\n", self.absoluteString.UTF8String);
#endif