Dragging/dropping onto TableView only adds the file to the array, doe…

…sn't do any processing then. Moved file-renaming functions to AppCon for now
dbr · May 18, 2009 · b4b5b07 · b4b5b07
1 parent a449b15
commit b4b5b07
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 54 deletions.
diff --git a/AppCon.m b/AppCon.m
@@ -9,6 +9,53 @@ -(void)awakeFromNib
     self.theFiles = [NSMutableArray array];
 }
 
+-(NSString*)getNewFileName:(NSString*)old_filename
+{
+    tvdb_api_wrapper *api = [[tvdb_api_wrapper alloc] init];
+    [api autorelease];
+
+    // Parse name, get: series_filename, seasno, epno
+    NSMutableDictionary *parsed_name = [api parseName:old_filename];
+    if(!parsed_name) return nil; // Invalid filename
+
+    NSMutableDictionary *seriesinfo = [api getSeriesId:[parsed_name objectForKey:@"file_seriesname"]];
+    DebugLog(@"Got series %@ with ID %@",
+             [seriesinfo objectForKey:@"name"],
+             [seriesinfo objectForKey:@"sid"]);
+
+    NSString *epname = [api getEpNameForSid:
+                        [NSNumber numberWithLong:[[seriesinfo objectForKey:@"sid"] doubleValue]]
+                                     seasno:[parsed_name objectForKey:@"seasno"]
+                                       epno:[parsed_name objectForKey:@"epno"]];
+    NSString *extention = [parsed_name objectForKey:@"ext"];
+
+    NSString *new_filename;
+
+    if(epname){
+        DebugLog(@"Got episode name: %@", epname);
+        new_filename = [NSString stringWithFormat:@"%@ - [%02dx%02d] - %@.%@",
+                        [seriesinfo objectForKey:@"name"],
+                        [[parsed_name objectForKey:@"seasno"] intValue],
+                        [[parsed_name objectForKey:@"epno"] intValue],
+                        epname,
+                        extention
+                        ];
+    }
+    else
+    {
+        new_filename = [NSString stringWithFormat:@"%@ - [%02dx%02d].%@",
+                        [parsed_name objectForKey:@"file_seriesname"],
+                        [[parsed_name objectForKey:@"seasno"] intValue],
+                        [[parsed_name objectForKey:@"epno"] intValue],
+                        epname,
+                        extention
+                        ];
+
+    }
+
+    return new_filename;
+}
+
 -(IBAction)renameFilesAction:(id)sender{
     [busy setHidden:NO];
     [busy startAnimation:self];

diff --git a/TableListCon.m b/TableListCon.m
@@ -27,65 +27,15 @@ - (NSDragOperation)tableView:(NSTableView*)tv
     return dragOp;
 }
 
-- (void)addFileToList:(NSString*)path
+- (void)addFileToList:(NSString*)old_filepath
 {
-    NSString *old_filename = [[path pathComponents] lastObject];
-
-    tvdb_api_wrapper *api = [[tvdb_api_wrapper alloc] init];
-    [api autorelease];
-
-    // Parse name, get: series_filename, seasno, epno
-    NSMutableDictionary *parsed_name = [api parseName:old_filename];
-    if(!parsed_name) return; // Invalid filename
-
-    NSMutableDictionary *seriesinfo = [api getSeriesId:[parsed_name objectForKey:@"file_seriesname"]];
-    DebugLog(@"Got series %@ with ID %@",
-             [seriesinfo objectForKey:@"name"],
-             [seriesinfo objectForKey:@"sid"]);
-
-    NSString *epname = [api getEpNameForSid:
-                        [NSNumber numberWithLong:[[seriesinfo objectForKey:@"sid"] doubleValue]]
-                                     seasno:[parsed_name objectForKey:@"seasno"]
-                                       epno:[parsed_name objectForKey:@"epno"]];
-    NSString *extention = [parsed_name objectForKey:@"ext"];
-
-    NSString *new_filename;
-
-    if(epname){
-        DebugLog(@"Got episode name: %@", epname);
-        new_filename = [NSString stringWithFormat:@"%@ - [%02dx%02d] - %@.%@",
-                        [seriesinfo objectForKey:@"name"],
-                        [[parsed_name objectForKey:@"seasno"] intValue],
-                        [[parsed_name objectForKey:@"epno"] intValue],
-                        epname,
-                        extention
-                        ];
-    }
-    else
-    {
-        new_filename = [NSString stringWithFormat:@"%@ - [%02dx%02d].%@",
-                        [parsed_name objectForKey:@"file_seriesname"],
-                        [[parsed_name objectForKey:@"seasno"] intValue],
-                        [[parsed_name objectForKey:@"epno"] intValue],
-                        epname,
-                        extention
-                        ];
-
-    }
-
-    NSString *displaystr = [NSString stringWithFormat:@"Old: %@\nNew: %@",
-                            old_filename,
-                            new_filename
-    ];
+    NSString *old_filename = [[old_filepath pathComponents] lastObject];
 
     // Generate dict of new file
     NSDictionary *cfile = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                           displaystr, @"displaystr",
-                           [NSNumber numberWithBool:YES], @"rename",
-                           path, @"path",
                            old_filename, @"old_filename",
-                           new_filename, @"new_filename",
-                           parsed_name, @"parsed_name",
+                           old_filepath, @"old_filepath",
+                           [NSNumber numberWithBool:YES], @"rename",
                            nil];
 
     // Add it to the tableView's array controller