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

Filter out redundant sort index calculations

Browse Source
This commit is contained in:
relikd
2019-07-08 23:48:38 +02:00
parent 1b96e79925
commit 666ecd154f
2 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
baRSS/Info.plist
View File

@@ -32,7 +32,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>8018</string> <string>8048</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string> <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>LSUIElement</key> <key>LSUIElement</key>

48
baRSS/Preferences/Feeds Tab/SettingsFeeds.m
View File

@@ -254,7 +254,7 @@ static NSString *dragNodeType = @"baRSS-feed-drag";
[self beginCoreDataChange]; [self beginCoreDataChange];
NSArray<NSTreeNode*> *parentNodes = [self.dataStore.selectedNodes valueForKeyPath:@"parentNode"]; NSArray<NSTreeNode*> *parentNodes = [self.dataStore.selectedNodes valueForKeyPath:@"parentNode"];
[self.dataStore remove:sender]; [self.dataStore remove:sender];
for (NSTreeNode *parent in parentNodes) { for (NSTreeNode *parent in [self filterOutRedundant:parentNodes]) {
[self restoreOrderingAndIndexPathStr:parent]; [self restoreOrderingAndIndexPathStr:parent];
} }
[self endCoreDataChangeShouldUndo:NO]; [self endCoreDataChangeShouldUndo:NO];
@@ -356,15 +356,13 @@ static NSString *dragNodeType = @"baRSS-feed-drag";
NSUInteger idx = (NSUInteger)index; NSUInteger idx = (NSUInteger)index;
if (index == -1) // drag items on folder or root drop if (index == -1) // drag items on folder or root drop
idx = destParent.childNodes.count; idx = destParent.childNodes.count;
NSIndexPath *dest = [destParent indexPath];
NSArray<NSTreeNode*> *previousParents = [self.currentlyDraggedNodes valueForKeyPath:@"parentNode"]; NSArray<NSTreeNode*> *previousParents = [self.currentlyDraggedNodes valueForKeyPath:@"parentNode"];
[self.dataStore moveNodes:self.currentlyDraggedNodes toIndexPath:[dest indexPathByAddingIndex:idx]]; [self.dataStore moveNodes:self.currentlyDraggedNodes toIndexPath:[destParent.indexPath indexPathByAddingIndex:idx]];
for (NSTreeNode *node in previousParents) { for (NSTreeNode *node in [self filterOutRedundant:[previousParents arrayByAddingObject:destParent]]) {
[self restoreOrderingAndIndexPathStr:node]; [self restoreOrderingAndIndexPathStr:node];
} }
[self restoreOrderingAndIndexPathStr:destParent];
return YES; return YES;
} }
@@ -461,26 +459,8 @@ static NSString *dragNodeType = @"baRSS-feed-drag";
/// Copy human readable description of selected nodes to clipboard. /// Copy human readable description of selected nodes to clipboard.
- (void)copy:(id)sender { - (void)copy:(id)sender {
NSMutableString *str = [[NSMutableString alloc] init]; NSMutableString *str = [[NSMutableString alloc] init];
NSUInteger count = self.dataStore.selectedNodes.count; for (NSTreeNode *node in [self filterOutRedundant:self.dataStore.selectedNodes]) {
NSMutableArray<NSTreeNode*> *groups = [NSMutableArray arrayWithCapacity:count]; [self traverseChildren:node appendString:str prefix:@""];
// filter out nodes that are already present in some selected parent node
for (NSTreeNode *node in self.dataStore.selectedNodes) {
BOOL skipItem = NO;
for (NSTreeNode *stored in groups) {
NSIndexPath *p = node.indexPath;
while (p.length > stored.indexPath.length)
p = [p indexPathByRemovingLastIndex];
if ([p isEqualTo:stored.indexPath]) {
skipItem = YES;
break;
}
}
if (!skipItem) {
[self traverseChildren:node appendString:str prefix:@""];
if (node.childNodes.count > 0)
[groups addObject:node];
}
} }
[[NSPasteboard generalPasteboard] clearContents]; [[NSPasteboard generalPasteboard] clearContents];
[[NSPasteboard generalPasteboard] setString:str forType:NSPasteboardTypeString]; [[NSPasteboard generalPasteboard] setString:str forType:NSPasteboardTypeString];
@@ -500,4 +480,22 @@ static NSString *dragNodeType = @"baRSS-feed-drag";
} }
} }
/// Remove redundant nodes that are already present in some selected parent node
- (NSArray<NSTreeNode*>*)filterOutRedundant:(NSArray<NSTreeNode*>*)nodes {
NSMutableArray<NSTreeNode*> *result = [NSMutableArray arrayWithCapacity:nodes.count];
for (NSTreeNode *current in nodes) {
BOOL skip = NO;
for (NSTreeNode *stored in result) {
NSIndexPath *p = current.indexPath;
while (p.length > stored.indexPath.length)
p = [p indexPathByRemovingLastIndex];
if ([p isEqualTo:stored.indexPath]) {
skip = YES; break;
}
}
if (skip == NO) [result addObject:current];
}
return result;
}
@end @end