// // BrowserViewController.m // Perforce // // Created by Adam Czubernat on 07.06.2013. // Copyright (c) 2013 Perforce Software, Inc. All rights reserved. // #import "BrowserViewController.h" #import "P4FileItem.h" #import "P4DepotItem.h" #import "P4ChangelistItem.h" #import "P4UnreadItem.h" #import "P4SearchItem.h" #import "SubmitPanelController.h" @interface BrowserViewController () { __unsafe_unretained P4Item *lastSelectedItem; NSString *searchQuery; NSString *searchDirectory; // Search __weak IBOutlet NSBox *searchBar; __weak IBOutlet NSTextField *searchLabel; __weak IBOutlet NSButton *searchOptionsButton; __weak IBOutlet NSButton *searchAllFilesButton; __weak IBOutlet NSButton *searchWorkspaceButton; __weak IBOutlet NSButton *searchDirectoryButton; __weak IBOutlet NSPopUpButton *searchFilterPopUp; __weak IBOutlet NSPopUpButton *searchTagsPopUp; } - (void)loadRootPath:(NSString *)path; - (void)filteredTagsNotification:(NSNotification *)notification; - (void)setSearchQuery:(NSString *)query; - (void)reloadSearchBar; // Search bar actions - (IBAction)searchOptionsPressed:(id)sender; - (IBAction)searchAllFilesPressed:(id)sender; - (IBAction)searchWorkspacePressed:(id)sender; - (IBAction)searchDirectoryPressed:(id)sender; - (IBAction)searchFilterPopUpAction:(id)sender; - (IBAction)searchFilterTagsAction:(id)sender; @end @implementation BrowserViewController @synthesize delegate; @synthesize searchBar; - (id)init { return self = [self initWithNibName:NSStringFromClass([self class]) bundle:nil]; } - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; [[rootItem class] removeObserver:self]; } - (void)loadView { [super loadView]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(filteredTagsNotification:) name:P4WorkspaceDefaultsTagFilterNotification object:nil]; NSNib *nib = [[NSNib alloc] initWithNibNamed:@"BrowserSearchBar" bundle:nil]; [nib instantiateNibWithOwner:self topLevelObjects:NULL]; // Imitate click to hide more options [self searchOptionsPressed:searchOptionsButton]; } #pragma mark - Private - (void)loadRootPath:(NSString *)path { Class class; P4Item *item = nil; NSString *query = nil; if ([path hasPrefix:@"//"]) { if (![rootItem isKindOfClass:class = [P4DepotItem class]]) item = [[class alloc] init]; } else if ([path hasPrefix:@"/"]) { if (![rootItem isKindOfClass:class = [P4FileItem class]]) item = [[class alloc] init]; } else if ([path hasPrefix:@"unread://"]) { if (![rootItem isKindOfClass:class = [P4UnreadItem class]]) item = [[class alloc] init]; } else if ([path hasPrefix:@"changelist://nondeleted"]) { if (![rootItem.path hasPrefix:@"changelist://nondeleted"]) item = [[P4ChangelistItem alloc] init]; [(P4ChangelistItem *)item setType:@"nondeleted"]; [(P4ChangelistItem *)item setPredicate: [NSPredicate predicateWithFormat:@"status != 'move/delete' && status != 'delete'"]]; } else if ([path hasPrefix:@"changelist://deleted"]) { if (![rootItem.path hasPrefix:@"changelist://deleted"]) item = [[P4ChangelistItem alloc] init]; [(P4ChangelistItem *)item setType:@"deleted"]; [(P4ChangelistItem *)item setPredicate: [NSPredicate predicateWithFormat:@"status == 'move/delete' || status == 'delete'"]]; } else if ([path hasPrefix:@"search://"]) { if (![rootItem isKindOfClass:class = [P4SearchItem class]]) item = [[class alloc] init]; query = [path stringByRemovingPrefix:@"search://"]; } if (searchQuery || query) [self setSearchQuery:query]; if (item) { [[rootItem class] removeObserver:self]; [[item class] addObserver:self]; rootItem = item; } } - (void)filteredTagsNotification:(NSNotification *)notification { filteredTags = [[P4WorkspaceDefaults sharedInstance] filteredTags]; [self refresh]; } - (void)setSearchQuery:(NSString *)query { searchQuery = query; if (!query) searchDirectory = nil; else if (!searchDirectory && workingItem != rootItem) searchDirectory = workingItem.remotePath; if (query) { P4SearchItem *item = (id)rootItem; if (![item isKindOfClass:[P4SearchItem class]]) { item = [[P4SearchItem alloc] init]; [item setSearchQuery:query]; } else if (query) { [item setSearchQuery:query]; [item reload]; } [self setRootItem:item]; [self reloadSearchBar]; } if ([delegate respondsToSelector:@selector(browserView:didChangeSearchQuery:)]) [delegate browserView:self didChangeSearchQuery:query]; } - (void)reloadSearchBar { P4SearchItem *item = (id)rootItem; // Label searchLabel.stringValue = [NSString stringWithFormat:@"\"%@\"", searchQuery]; // Buttons searchAllFilesButton.state = !item.searchWorkspaceOnly; searchWorkspaceButton.state = item.searchWorkspaceOnly; [searchDirectoryButton setState:item.searchDirectory != nil]; [searchDirectoryButton setHidden:!searchDirectory]; [searchDirectoryButton setTitle:[NSString stringWithFormat:@"\"%@\"", [searchDirectory lastPathComponent]]]; [searchDirectoryButton sizeToFit]; // Filter NSPopUpButton *popup = searchFilterPopUp; NSMutableArray *terms = [NSMutableArray array]; if (([popup itemAtIndex:1].state = item.searchFilenames)) [terms addObject:[popup itemAtIndex:1].title]; if (([popup itemAtIndex:2].state = item.searchContents)) [terms addObject:[popup itemAtIndex:2].title]; if (([popup itemAtIndex:3].state = item.searchTags)) [terms addObject:[popup itemAtIndex:3].title]; [popup itemAtIndex:0].title = [terms componentsJoinedByString:@", "]; // Tags filter popup = searchTagsPopUp; [popup removeAllItems]; [popup addItemWithTitle:@"-"]; [[popup itemAtIndex:0] setHidden:YES]; NSArray *searchTags = [item searchResultTags]; NSArray *searchFilteredTags = [item searchFilteredTags]; [popup addItemsWithTitles:searchFilteredTags]; [popup addItemsWithTitles:searchTags]; for (NSString *tag in searchFilteredTags) [[popup itemWithTitle:tag] setState:NSOnState]; if (searchFilteredTags.count) [popup itemAtIndex:0].title = [searchFilteredTags componentsJoinedByString:@", "]; else if (!searchTags.count) [popup itemAtIndex:0].title = @"< No Tags >"; } #pragma mark - Actions - (IBAction)searchOptionsPressed:(NSButton *)sender { CGRect frame = searchBar.frame; frame.size.height = sender.state ? 92.0f : 30.0f; searchBar.frame = frame; } - (IBAction)searchAllFilesPressed:(NSButton *)sender { if (!sender.state && (sender.state = NSOnState)) return; P4SearchItem *item = (id)rootItem; item.searchWorkspaceOnly = NO; [self setSearchQuery:searchQuery]; } - (IBAction)searchWorkspacePressed:(NSButton *)sender { if (!sender.state && (sender.state = NSOnState)) return; P4SearchItem *item = (id)rootItem; item.searchWorkspaceOnly = YES; [self setSearchQuery:searchQuery]; } - (IBAction)searchDirectoryPressed:(NSButton *)sender { P4SearchItem *item = (id)rootItem; item.searchDirectory = sender.state ? searchDirectory : nil; [self setSearchQuery:searchQuery]; } - (IBAction)searchFilterPopUpAction:(NSPopUpButton *)sender { P4SearchItem *item = (id)rootItem; NSInteger index = [sender indexOfSelectedItem]; if (index == 1) item.searchFilenames = !item.searchFilenames; else if (index == 2) item.searchContents = !item.searchContents; else if (index == 3) item.searchTags = !item.searchTags; [self setSearchQuery:searchQuery]; } - (IBAction)searchFilterTagsAction:(id)sender { P4SearchItem *item = (id)rootItem; NSString *tag = [sender titleOfSelectedItem]; NSMutableArray *tags; tags = [NSMutableArray arrayWithArray:[item searchFilteredTags]]; if ([tags containsObject:tag]) [tags removeObject:tag]; else [tags addObject:tag]; [item setSearchFilteredTags:tags]; [self setSearchQuery:searchQuery]; } #pragma mark - Public - (P4Item *)rootItem { return rootItem; } - (P4Item *)workingItem { return workingItem; } - (void)setRootItem:(P4Item *)item { filteredTags = [[P4WorkspaceDefaults sharedInstance] filteredTags]; [[rootItem class] removeObserver:self]; rootItem = item; [self setWorkingItem:item]; [[rootItem class] addObserver:self]; if ([item isKindOfClass:[P4SearchItem class]]) { if (!searchQuery) { searchQuery = ((P4SearchItem *)item).searchQuery; searchDirectory = ((P4SearchItem *)item).searchDirectory; } [self reloadSearchBar]; } } - (void)setWorkingItem:(P4Item *)item { if (workingItem == item) return; workingItem = item; PSLogStore(@"Working Item", @"%@", workingItem); if (isLoading) return; if ([delegate respondsToSelector:@selector(browserView:didChangeWorkingItem:)]) [delegate browserView:self didChangeWorkingItem:workingItem]; } - (void)setSelectedItems:(NSArray *)selectedItems { P4Item *item = selectedItems.count ? [selectedItems objectAtIndex:0] : nil; P4Item *parent = [item parent]; BOOL directory = [item isDirectory]; // Set current working item [self setWorkingItem:(directory ? item : parent) ?: rootItem]; if (!directory) { NSIndexSet *indexes = [parent.children indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) { return [selectedItems indexOfObjectIdenticalTo:obj] != NSNotFound; }]; [self setSelectedIndexes:indexes]; } } - (void)setSelectedIndexes:(NSIndexSet *)indexes PS_ABSTRACT_METHOD - (void)loadPath:(NSString *)path { [self loadRootPath:path]; P4Item *cachedItem = [rootItem cachedItemForPath:path]; if (rootItem == cachedItem) [self setRootItem:rootItem]; else if (cachedItem) [self setSelectedItems:@[ cachedItem ]]; else { isLoading = YES; [self willLoadPath:path]; if (![path hasSuffix:@"/"]) path = [path stringByDeletingPath]; path = [path directoryPath]; [rootItem loadPath:path]; } } - (void)search:(NSString *)query { PSLog(@"Searching \"%@\"", query); [self setSearchQuery:query]; } - (void)reload { // Retain current working item information NSString *path = workingItem.path; P4SearchItem *searchItem = [rootItem isKindOfClass:[P4SearchItem class]] ? (id)rootItem : nil; // Reload root isReloading = YES; rootItem = nil; workingItem = nil; [self loadRootPath:path]; // Retrieve search information if (searchItem) { P4SearchItem *item = (id)rootItem; item.searchDirectory = searchItem.searchDirectory; item.searchWorkspaceOnly = searchItem.searchWorkspaceOnly; item.searchFilenames = searchItem.searchFilenames; item.searchContents = searchItem.searchContents; item.searchTags = searchItem.searchTags; item.searchFilteredTags = searchItem.searchFilteredTags; [self reloadSearchBar]; } // Load working path isLoading = YES; [self willLoadPath:path]; [rootItem loadPath:path]; } - (void)refresh PS_ABSTRACT_METHOD - (NSArray *)selectedItems PS_ABSTRACT_METHOD - (void)willLoadPath:(NSString *)path PS_ABSTRACT_METHOD - (void)showVersions:(P4Item *)item PS_ABSTRACT_METHOD - (void)editItemName:(P4Item *)item PS_ABSTRACT_METHOD - (void)selectionChanged:(P4Item *)item { if (lastSelectedItem == item) return; lastSelectedItem = item; if ([delegate respondsToSelector:@selector(browserView:didChangeSelectedItem:)]) [delegate browserView:self didChangeSelectedItem:lastSelectedItem]; } - (void)renameItem:(P4Item *)item name:(NSString *)newName { if ([item.name isEqualToString:newName]) return; [item performAction:@selector(rename:) object:newName delegate:[self.view.window windowController]]; } - (BOOL)insertFiles:(NSArray *)paths intoItem:(P4Item *)item copy:(BOOL)copy { if (![item isDirectory] || ![item isEditable]) return NO; if (!copy) { // Check if moving into the same directory NSString *itemPath = [item.localPath stringByRemovingSuffix:@"/"]; for (NSString *path in paths) { if ([[path stringByDeletingLastPathComponent] isEqualToString:itemPath]) return NO; } } // Insert files SEL selector = copy ? @selector(copyFiles:) : @selector(moveFiles:); [item performAction:selector object:paths delegate:[self.view.window windowController]]; return YES; } - (BOOL)hasFilteredTagsForItem:(P4Item *)item { for (NSString *tag in filteredTags) if ([item hasTag:tag]) return YES; return NO; } - (void)failWithError:(NSError *)error { if (isLoading) { // Don't show alert for session expiration if (error.code == P4ErrorSessionExpired) return; NSAlert *alert = [NSAlert alertWithError:error]; [alert setMessageText:@"\nLoading failed"]; [alert setInformativeText:error.localizedDescription]; [alert setIcon:[[NSImage alloc] init]]; [alert beginSheetModalForWindow:self.view.window modalDelegate:nil didEndSelector:nil contextInfo:NULL]; } } #pragma mark - Keyboard support - (void)moveToBeginningOfDocument:(id)sender { P4Item *parent = workingItem.parent; if (parent) [self loadPath:parent.path]; else [self.nextResponder doCommandBySelector:_cmd]; } - (void)moveToEndOfDocument:(id)sender { NSArray *selection = [self selectedItems]; if (selection.count == 1) { P4Item *item = [selection lastObject]; if ([item isDirectory]) { [self loadPath:[item path]]; return; } } [self.nextResponder doCommandBySelector:_cmd]; } #pragma mark - P4Item delegate - (void)itemDidLoad:(P4Item *)item { if ([item isKindOfClass:[P4SearchItem class]]) { PSLog(@"Search results : %ld", item.children.count); [self reloadSearchBar]; } } - (void)itemDidInvalidate:(id)item PS_ABSTRACT_METHOD - (void)item:(id)item didFailWithError:(NSError *)error PS_ABSTRACT_METHOD @end
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#4 | 16507 | perforce_software | Move to main branch. | ||
#3 | 13625 | alan_petersen |
UPDATE: - updated p4api to p4api-2015.1.1054991 - included in OpenSSL 1.0.2a ssl and crypto libraries The benefit of these are that Piper now supports connecting to 15.1 servers, and also supports ssl: connections. Woo hoo! |
||
#2 | 12961 | alan_petersen |
Piper 2.0 Mega Update New Features/Functionality - Added help menu redirecting to URL. - Added readonly property for creating new workspaces. - Added html hyperlinks for Copy link functionality. - Added functionality for managing Finder Favorite items in sidebar. - Redesigned the way mapping is stored in Piper. - First version of syncing finder sidebar items with workspace mapping. - Small sorting improvements. - Creating Projects directory inside users home folder. - Adding Projects folder to finder sidebar item. - Creating and removing symbolic links accordingly to mapped folders. - Preventing duplicate names in symbolic links. - Refreshing symbolic links on mapping change inside application. - Storing workspace and server details in p4 configuration for other applications to use. - Added contextual menu items for Finder integration. - Added services menu for Adobe Illustrator integration. - Keyboard shortcuts for Illustrator integration. - Code refactoring and fixes for mapping issues. - Added Finder functionality to edit all files in folder. - Added user friendly message when editing a file using Finder outside the workspace. - Implemented hidden automatic login when opening application using Finder integration. - Logging to file in ~/Library/Logs - Unified workspace and all files views to show both local and depot files and folders. - Removed my workspace view references and logic. - Editing unmapped files on server. - First version of adding file to unmapped folders. - Showing opened by and edit actions in column details for all depot files. - Improved mappings functionality. - Enabled same feature options for mapped and unmapped folders and files. - Redesigned from scratch mapping and unmapping procedures for adding and removing files. - Implemented cleaning workspace using new mapping functionality. Removed debug overlay coloring. - Automated workspace creation - Improvements in editing files already mapped to workspace. - Implemented deleting remote files. - Implemented first version of move operation for remote files. - Removing last workspace information when disconnecting from workspace using app menu. - Implemented editing and submitting using symbolic links in project folder. New finder menu service for symbolic links Show in Piper which acts like share link functionality. - New icons for files and folders not tracked in the filesystem. - Improvements in showing file using share link. - Switched to new way of retrieving files in order to show user changes. - Redesigned and implemented new functionality for chaining operations with mapping. - Improvements and redesign of Edit/add actions to use new chaining logic . Fixed issue with file edit. - Improvements in window showing when using services. - Simplified file loading so the local files appears only when remote are also loaded. - Improved deleting of untracked files to avoid mapping and marking for delete. - Enabling simple copy paste and moving of remote and local files. - Added abort for exception handling in order to force crashing application on critical failures - Added custom exception handling for catching runtime errors to log and crash instead of continuing in unstable state. - Changed file copying to use mark for add . - Simplified and fixed responding file representations to mapping changes. Bug Fixes - Fixed crash when synchronizing. - Fixed sync issue when downloading directory without file size information. - Fixed issue with unread list crashing when file is not existing on disk. - Fixed incorrect sync progress calculation. - Removed relative path issues. - Fixed many of case-sensitivity problems. - Fixed deprecated methods and related issues in OS X 10.10. - Fixed folder rename not updating in column view. Revised and fixed many potential problems from implicit casting. - Fixed missing sync button on fast sync completion. - Refreshing mapping on synchronization. Fixed symbolic links not appearing until app is restarted. - Fixed latest crashing of autosync. - Fixed loading indicator issues. - Fixed and redesigned submit dialog to work correctly with Submit All Files option in Finder. - Fixed multiple error messages on network outage. Redesigned showing errors in main window. - Fixed opening random locations when using Finder integration. - Fixed issue when panel was detached from parent window. - Fixed bug when creating new workspace wouldn't store default settings. - Fixed memory issues with network operations. - Fixes in relogging mappings and file listing. - Improvements in editing unmapped files. - Fixed crash when adding file outside workspace. - Fixed breadcrumbs control issue. - Fixed issue with double parent folders when opening unmapped files. - Fixed crashes on sync after mapping new files. - Fixed issue with editing file using Finder -- Merging code and additional fixes in add button functionality. - Fixed unsync not working - Fixed submit panel issue not selecting files with different name case. - Fixed missing revert and sync to workspace actions in some cases. - Fixed issue with Submit and Edit finder actions. Improvements in stability of finder integration. - Fixed issue with unsubmitted folders breaking status of files inside. - Fixed issue with added files not showing correct icon and status. - Fixed bug with file edit resulting in a new directory named exactly like a file. - Fixed issue with reloading of subpath resulting in untracked folders. - Fixed mapping issue when result was always view mapping not relative. - Fixed submit panel showing more than once. - Fixed illustrator services not working. - Fixed userdefaults preferences problem with workspace name being null. - Fixed userdefaults keypath problem of dot-containing workspace names. - Forcing recreating of browser to possibly prevent pre-10.10 errors with automatic workspace selection. - Fixed adding file to depot not presenting correct icon. - Fixed issues with reverting a file that was marked for add. - Presenting error when trying to submit untracked files. - Fixed issue when submit files service crashed when using unmapped files. - Fixed file representation disappearing when removing file. - Fixed issue with symlinks resolving working on 10.10 only. Issue related to workspace selection not showing. - Fixed error panel method calls unavailable in Mac OS versions before 10.10. Issue related to hanging error panels. - Fixed removing a local file resulting in action progress freezing. - Fixed open file not working after edit. - Fixing crash when mapping changed. Issue related to moving local file to unmapped folder and other similar cases. |
||
#1 | 11252 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/mac/Perforce/Classes/ViewControllers/BrowserViewController.m | |||||
#1 | 10744 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/Perforce/Classes/ViewControllers/BrowserViewController.m | |||||
#1 | 8919 | Matt Attaway | Initial add of Piper, a lightweight Perforce client for artists and designers. |