// // SyncPanelController.m // Perforce // // Created by Adam Czubernat on 15.07.2013. // Copyright (c) 2013 Perforce Software, Inc. All rights reserved. // #import "SyncPanelController.h" #import "P4Workspace.h" #import "ErrorPanelController.h" @interface SyncPanelController () { BOOL indeterminate; __weak IBOutlet NSView *indeterminateView; __weak IBOutlet NSView *progressView; __weak IBOutlet NSView *successView; __weak IBOutlet NSProgressIndicator *indeterminateIndicator; __weak IBOutlet NSProgressIndicator *progressIndicator; __weak IBOutlet NSTextField *progressLabel; __weak IBOutlet NSImageView *progressSyncImage; __weak IBOutlet NSTextField *successLabel; } - (void)synchronize; - (void)showIndeterminate; - (void)showProgress; - (void)updateProgress; - (void)syncStartedNotification:(NSNotification *)notification; - (void)syncFinishedNotification:(NSNotification *)notification; - (void)syncProgressNotification:(NSNotification *)notification; - (IBAction)cancelButtonPressed:(id)sender; - (IBAction)hideButtonPressed:(id)sender; @end @implementation SyncPanelController - (void)windowDidLoad { [super windowDidLoad]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncStartedNotification:) name:P4SyncStartedNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncFinishedNotification:) name:P4SyncFinishedNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncProgressNotification:) name:P4SyncProgressNotification object:nil]; // Check if not already synchronizing if (![[P4Workspace sharedInstance] isSynchronizing]) [self synchronize]; // Check if progress is determined if ([P4Workspace sharedInstance].syncOperation.total) [self showProgress]; else [self showIndeterminate]; } - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; } #pragma mark - Private - (void)synchronize { PSLog(@"Manual sync"); [[P4Workspace sharedInstance] syncWorkspace:nil response:nil]; } - (void)showIndeterminate { indeterminate = YES; [indeterminateIndicator startAnimation:nil]; [self setPresentedView:indeterminateView]; } - (void)showProgress { indeterminate = NO; [indeterminateIndicator stopAnimation:nil]; [self setPresentedView:progressView animated:YES]; [self updateProgress]; // Animate image progressSyncImage.wantsLayer = YES; CAKeyframeAnimation *anim = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"]; CAMediaTimingFunction *timing = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; anim.duration = 1.5f; anim.repeatCount = HUGE_VALF; anim.values = @[ @(0.0f), @(-M_PI) ]; anim.keyTimes = @[ @(0.0f), @(0.9f) ]; anim.timingFunctions = @[ timing, timing ]; anim.removedOnCompletion = NO; [progressSyncImage.layer addAnimation:anim forKey:@"rotation"]; } - (void)updateProgress { P4Operation *operation = [[P4Workspace sharedInstance] syncOperation]; if (!operation.total) { progressLabel.stringValue = @"Loading..."; return; } CGFloat progress = operation.progress; progressIndicator.doubleValue = progress * 100.0f; NSTimeInterval time = PSTimeInterval(operation.timestamp); NSTimeInterval eta = time / progress - time; progressLabel.stringValue = [NSString stringWithFormat: @"%.1f%% (%.2f of %.2f MB) – %@ remaining", progress * 100.0f, operation.completed/1024/1024.0f, operation.total/1024/1024.0f, [NSString stringWithTimeInterval:eta]]; } - (void)syncStartedNotification:(NSNotification *)notification { } - (void)syncFinishedNotification:(NSNotification *)notification { [progressSyncImage.layer removeAllAnimations]; [indeterminateIndicator stopAnimation:nil]; P4Operation *operation = notification.object; NSArray *upToDate = [operation errorsWithCode:P4ErrorFileUpToDate]; [operation ignoreErrors:upToDate]; if (operation.errors) { [self dismiss]; if (![operation errorsWithCode:P4ErrorSessionExpired]) { ErrorPanelController *alert = [[ErrorPanelController alloc] init]; [alert setTitle:@"\nSynchronization failed"]; [alert setMessage:operation.error.localizedDescription]; [alert presentWithMainWindow]; } } else { if (upToDate) successLabel.stringValue = @"Files are up-to-date"; [self setPresentedView:successView animated:YES]; [self dismissAfter:2.0f]; } } - (void)syncProgressNotification:(NSNotification *)notification { if (indeterminate) [self showProgress]; // Switch to progress [self updateProgress]; } #pragma mark - Actions - (IBAction)cancelButtonPressed:(id)sender { PSLog(@"Sync Cancel pressed"); [[P4Workspace sharedInstance].syncOperation cancel]; } - (IBAction)hideButtonPressed:(id)sender { [self dismiss]; } @end
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#2 | 18548 | Robert Cowham | Merge from Main. | ||
#1 | 16507 | perforce_software | Move to main branch. | ||
//guest/perforce_software/piper/mac/R2.0/Perforce/Classes/WindowControllers/SyncPanelController.m | |||||
#1 | 12962 | alan_petersen |
Populate -o //guest/perforce_software/piper/mac/main/... //guest/perforce_software/piper/mac/R2.0/.... |
||
//guest/perforce_software/piper/mac/main/Perforce/Classes/WindowControllers/SyncPanelController.m | |||||
#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/WindowControllers/SyncPanelController.m | |||||
#1 | 10744 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/Perforce/Classes/WindowControllers/SyncPanelController.m | |||||
#1 | 8919 | Matt Attaway | Initial add of Piper, a lightweight Perforce client for artists and designers. |