Changeset 1273

Timestamp:

06/07/10 17:57:39 (2 years ago)

Author:

gbooker

Message:

Now a mark menu item moves files to their auto sort path

Location:

trunk/SapphireFrappliance

Files:

• Browser/SapphireMarkMenu.m (modified) (4 diffs)
• MetaData/SapphireMObjects/SapphireFileMetaData.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (2 diffs)

trunk/SapphireFrappliance/Browser/SapphireMarkMenu.m

@@ -73 +73 @@
         COMMAND_CHANGE_ARTWORK,
         //File Only Commands
+        COMMAND_MOVE_TO_AUTO_SORT,
         COMMAND_MARK_TO_JOIN,
         COMMAND_MARK_AND_JOIN,
@@ -292 +293 @@
                         nil];
                 
+                NSString *autoSortPath = [fileMeta autoSortPath];
+                if(autoSortPath != nil && [[[fileMeta path] stringByDeletingLastPathComponent] caseInsensitiveCompare:autoSortPath] != NSOrderedSame)
+                {
+                        [marks insertObject:
+                            [NSDictionary dictionaryWithObjectsAndKeys:
+                                    BRLocalizedString(@"Move to Auto Sort Path", @"Moving a file to auto sort path menu title"), MARK_NAME,
+                                        [NSString stringWithFormat:BRLocalizedString(@"Move to \"%@\"", @"Moving a file to auto sort path description; parameter is new path"), autoSortPath], MARK_DESCRIPTION,
+                                        [NSNumber numberWithInt:COMMAND_MOVE_TO_AUTO_SORT], MARK_COMMAND,
+                                        nil]
+                                atIndex:1];
+                }
                 NSString *prettyName = [fileMeta prettyName];
                 if(prettyName != nil && [[fileMeta fileName] caseInsensitiveCompare:prettyName] != NSOrderedSame)
@@ -778 +790 @@
                         }
                                 break;
+                        case COMMAND_MOVE_TO_AUTO_SORT:
+                        {
+                                NSInvocation *invoke = [NSInvocation invocationWithMethodSignature:[self methodSignatureForSelector:@selector(pasteInDir:)]];
+                                [invoke setSelector:@selector(moveToAutoSortName:)];
+                                [invoke setTarget:self];
+                                [invoke setArgument:&fileMeta atIndex:2];
+                                
+                                SapphireWaitDisplay *wait = [[SapphireWaitDisplay alloc] initWithScene:[self scene] title:[NSString stringWithFormat:BRLocalizedString(@"Moving %@", @"parameter is file/dir that is being moved"), [[fileMeta path] lastPathComponent]] invocation:invoke];
+                                
+                                replaceController = [wait autorelease];
+                        }
+                                break;
                         case COMMAND_CUT_PATH:
                                 [movingPath release];
@@ -806 +830 @@
         else
                 [[self stack] popController];
+}
+
+- (BRControl *)moveToAutoSortName:(SapphireFileMetaData *)fileMeta
+{
+        NSString *error = [fileMeta moveToAutoSortName];
+        if(error != nil)
+                return [[[SapphireErrorDisplayController alloc] initWithScene:[self scene] error:BRLocalizedString(@"Error", @"Short message indicating error condition") longError:error] autorelease];
+        return nil;
 }
 

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.h

@@ -201 +201 @@
 
 /*!
+ * @brief Get the file's auto-sort path
+ *
+ * @return The file's auto sort path, nil if none exists
+ */
+- (NSString *)autoSortPath;
+
+/*!
+ * @brief Move to auto-sort path
+ *
+ * @return Move error, if one occurs
+ */
+- (NSString *)moveToAutoSortName;
+
+/*!
  * @brief Return the filename, minus the path extension
  */

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

@@ -18 +18 @@
 #import "NSArray-Extensions.h"
 #import "NSString-Extensions.h"
+#import "NSFileManager-Extensions.h"
 
 #import <QTKit/QTKit.h>
@@ -937 +938 @@
 }
 
+- (NSString *)autoSortPath
+{
+        SapphireEpisode *episode = self.tvEpisode;
+        return [episode.season autoSortPath];
+}
+
+- (NSString *)moveToAutoSortName
+{
+        NSString *error = nil;
+        if(![[self fileName] isEqualToString:[self prettyName]])
+                error = [self renameToPrettyName];
+        
+        if(error != nil)
+                return error;
+        
+        NSString *autoSortSeasonPath = [self autoSortPath];
+        if(autoSortSeasonPath == nil)
+                return nil;
+        
+        NSString *autoSortShowPath = [autoSortSeasonPath stringByDeletingLastPathComponent];
+        
+        NSFileManager *fm = [NSFileManager defaultManager];
+        if(![fm isDirectory:autoSortShowPath])
+                return [NSString stringWithFormat:BRLocalizedString(@"Auto sort path %@ is not a directory", @"Error indicating auto sort path isn't a directory"), autoSortShowPath];
+        
+        if(![fm constructPath:autoSortSeasonPath])
+                return [NSString stringWithFormat:BRLocalizedString(@"Cannot create directory at path %@", @"Error indicating auto sort path can't be created"), autoSortSeasonPath];
+        
+        SapphireDirectoryMetaData *dirMeta = [SapphireDirectoryMetaData createDirectoryWithPath:autoSortSeasonPath inContext:[self managedObjectContext]];
+        return [self moveToDir:dirMeta];
+}
+
 - (NSString *)fileName
 {