Skip to content

Commit

Permalink
Remove openURLs and modifiedURLs properties from file browser
Browse files Browse the repository at this point in the history
  • Loading branch information
sorbits committed May 17, 2021
1 parent 5d10c1f commit fd9d4f0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 43 deletions.
3 changes: 0 additions & 3 deletions Frameworks/FileBrowser/src/FileBrowserViewController.h
Expand Up @@ -20,9 +20,6 @@
@property (nonatomic, readonly) NSOutlineView* outlineView;
@property (nonatomic, readonly) id sessionState;

@property (nonatomic) NSArray<NSURL*>* openURLs;
@property (nonatomic) NSArray<NSURL*>* modifiedURLs;

- (void)setupViewWithState:(id)state;
- (std::map<std::string, std::string>)variables;

Expand Down
41 changes: 1 addition & 40 deletions Frameworks/FileBrowser/src/FileBrowserViewController.mm
Expand Up @@ -1651,40 +1651,6 @@ - (void)updateDisambiguationSuffixInParent:(FileItem*)item
}
}

- (void)setModifiedURLs:(NSArray<NSURL*>*)newModifiedURLs
{
_modifiedURLs = newModifiedURLs;

if(!self.fileItem)
return;

NSMutableArray<FileItem*>* stack = [NSMutableArray arrayWithObject:self.fileItem];
while(FileItem* item = stack.firstObject)
{
[stack removeObjectAtIndex:0];
item.modified = [_modifiedURLs containsObject:item.URL];
if(item.children)
[stack addObjectsFromArray:item.children];
}
}

- (void)setOpenURLs:(NSArray<NSURL*>*)newOpenURLs
{
_openURLs = newOpenURLs;

if(!self.fileItem)
return;

NSMutableArray<FileItem*>* stack = [NSMutableArray arrayWithObject:self.fileItem];
while(FileItem* item = stack.firstObject)
{
[stack removeObjectAtIndex:0];
item.open = [_openURLs containsObject:item.URL];
if(item.children)
[stack addObjectsFromArray:item.children];
}
}

// ===========================
// = Loading/Expanding Items =
// ===========================
Expand Down Expand Up @@ -1832,12 +1798,7 @@ - (void)didReceiveURLs:(NSArray<NSURL*>*)urls forItemWithURL:(NSURL*)url expandC
}

for(NSURL* url in urls)
{
FileItem* newItem = [FileItem fileItemWithURL:url];
newItem.open = [_openURLs containsObject:url];
newItem.modified = [_modifiedURLs containsObject:url];
[children addObject:newItem];
}
[children addObject:[FileItem fileItemWithURL:url]];

item.children = [children copy];
[self rearrangeChildrenInParent:item];
Expand Down

0 comments on commit fd9d4f0

Please sign in to comment.