Changeset 2108

Timestamp:

Jun 17, 2007, 12:26:52 AM (15 years ago)

Author:

livings124

Message:

get the basics of file creation working, some better error checking, and combine the name and location fields

Location:

branches/file_selection/macosx

Files:

• Controller.m (modified) (1 diff)
• CreatorWindowController.h (modified) (2 diffs)
• CreatorWindowController.m (modified) (8 diffs)
• English.lproj/Creator.nib/classes.nib (modified) (1 diff)
• English.lproj/Creator.nib/info.nib (modified) (1 diff)
• English.lproj/Creator.nib/keyedobjects.nib (modified) (previous)

branches/file_selection/macosx/Controller.m

@@ -934 +934 @@
 - (void) createFile: (id) sender
 {
-    [CreatorWindowController createTorrentFile];
+    [CreatorWindowController createTorrentFile: fLib];
 }
 

branches/file_selection/macosx/CreatorWindowController.h

@@ -24 +24 @@
 
 #import <Cocoa/Cocoa.h>
+#import "transmission.h"
 #import "makemeta.h"
 
@@ -29 +30 @@
 {
     IBOutlet NSImageView * fIcon, * fLocationIcon;
-    IBOutlet NSTextField * fNameField, * fStatusField, * fPiecesField, * fLocationField,
-                * fTrackerField, * fTorrentNameField;
+    IBOutlet NSTextField * fNameField, * fStatusField, * fPiecesField, * fTrackerField, * fLocationField;
     IBOutlet NSTextView * fCommentView;
     IBOutlet NSButton * fPrivateCheck;
     
-    meta_info_builder_t * fInfo;
+    IBOutlet NSWindow * fProgressWindow;
+    IBOutlet NSProgressIndicator * fProgressIndicator;
+    
+    tr_metainfo_builder_t * fInfo;
     NSString * fPath, * fLocation;
 }
 
-+ (void) createTorrentFile;
++ (void) createTorrentFile: (tr_handle_t *) handle;
+
+- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle path: (NSString *) path;
 
 - (void) setLocation: (id) sender;

branches/file_selection/macosx/CreatorWindowController.m

@@ -28 +28 @@
 #define DEFAULT_SAVE_LOCATION @"~/Desktop/"
 
-#warning rename?
 @interface CreatorWindowController (Private)
 
 + (NSString *) chooseFile;
-- (void) setPath: (NSString *) path;
-- (void) locationSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
+- (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
 
 @end
@@ -39 +37 @@
 @implementation CreatorWindowController
 
-+ (void) createTorrentFile
++ (void) createTorrentFile: (tr_handle_t *) handle
 {
     //get file/folder for torrent
@@ -46 +44 @@
         return;
     
-    CreatorWindowController * creator = [[self alloc] initWithWindowNibName: @"Creator"];
-    [creator setPath: path];
+    CreatorWindowController * creator = [[self alloc] initWithWindowNibName: @"Creator" handle: handle path: path];
     [creator showWindow: nil];
 }
 
+- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle path: (NSString *) path
+{
+    if ((self = [super initWithWindowNibName: name]))
+    {
+        fPath = [path retain];
+        fInfo = tr_metaInfoBuilderCreate(handle, [fPath UTF8String]);
+        if (fInfo->fileCount == 0)
+        {
+            NSAlert * alert = [[[NSAlert alloc] init] autorelease];
+            [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> no files -> button")];
+            [alert setMessageText: NSLocalizedString(@"This folder contains no files.",
+                                                    "Create torrent -> no files -> title")];
+            [alert setInformativeText: NSLocalizedString(@"There must be at least one file in a folder to create a torrent file.",
+                                                        "Create torrent -> no files -> warning")];
+            [alert setAlertStyle: NSWarningAlertStyle];
+            
+            [alert runModal];
+            
+            [self release];
+            return nil;
+        }
+    }
+    return self;
+}
+
 - (void) awakeFromNib
 {
-    fInfo = tr_metaInfoBuilderCreate([fPath UTF8String]);
-    
-    #warning if count == 0, end
-    
     NSString * name = [fPath lastPathComponent];
     
@@ -75 +93 @@
     {
         NSString * fileString;
-    
         int count = fInfo->fileCount;
         if (count != 1)
@@ -88 +105 @@
                                     fInfo->pieceCount, [NSString stringForFileSize: fInfo->pieceSize]]];
     
-    fLocation = [[DEFAULT_SAVE_LOCATION stringByExpandingTildeInPath] retain];
-    [fLocationIcon setImage: [[NSWorkspace sharedWorkspace] iconForFile: fLocation]];
+    fLocation = [[[DEFAULT_SAVE_LOCATION stringByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]]
+                                            stringByExpandingTildeInPath] retain];
+    [fLocationIcon setImage: [[NSWorkspace sharedWorkspace] iconForFile: [fLocation stringByDeletingLastPathComponent]]];
     [fLocationField setStringValue: [fLocation stringByAbbreviatingWithTildeInPath]];
     [fLocationField setToolTip: fLocation];
-    
-    [fTorrentNameField setStringValue: [name stringByAppendingPathExtension: @"torrent"]];
 }
 
@@ -110 +126 @@
 - (void) setLocation: (id) sender
 {
-    NSOpenPanel * panel = [NSOpenPanel openPanel];
+    NSSavePanel * panel = [NSSavePanel savePanel];
 
     [panel setPrompt: @"Select"];
-    [panel setAllowsMultipleSelection: NO];
-    [panel setCanChooseFiles: NO];
-    [panel setCanChooseDirectories: YES];
-    [panel setCanCreateDirectories: YES];
-
-    [panel beginSheetForDirectory: nil file: nil types: nil modalForWindow: [self window] modalDelegate: self
+    [panel setRequiredFileType: @"torrent"];
+    [panel setCanSelectHiddenExtension: YES];
+
+    [panel beginSheetForDirectory: nil file: [fLocation lastPathComponent] modalForWindow: [self window] modalDelegate: self
             didEndSelector: @selector(locationSheetClosed:returnCode:contextInfo:) contextInfo: nil];
 }
@@ -145 +159 @@
         trackerString = [@"http://" stringByAppendingString: trackerString];
     
-    NSString * torrentName = [fTorrentNameField stringValue];
-    if ([[torrentName pathExtension] caseInsensitiveCompare: @"torrent"] != NSOrderedSame)
-    {
-        NSAlert * alert = [[[NSAlert alloc] init] autorelease];
-        [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> torrent extension warning -> button")];
-        [alert setMessageText: NSLocalizedString(@"Torrents must end in \".torrent\".",
-                                                "Create torrent -> torrent extension warning -> title")];
-        [alert setInformativeText: NSLocalizedString(@"Add this file extension to create the torrent.",
-                                                    "Create torrent -> torrent extension warning -> warning")];
-        [alert setAlertStyle: NSWarningAlertStyle];
-        
-        [alert beginSheetModalForWindow: [self window] modalDelegate: self didEndSelector: nil contextInfo: nil];
-        return;
-    }
+    //[NSApp beginSheet: fProgressWindow modalForWindow: [self window] modalDelegate: self didEndSelector: nil contextInfo: nil];
     
     #warning fix
-    tr_makeMetaInfo(fInfo, NULL, self, [[fLocation stringByAppendingPathComponent: torrentName] UTF8String],
-            [trackerString UTF8String], [[fCommentView string] UTF8String], [fPrivateCheck state] == NSOnState);
-    
-    #warning add to T
-
-    [[self window] close];
+    tr_makeMetaInfo(fInfo, [fLocation UTF8String], [trackerString UTF8String], [[fCommentView string] UTF8String],
+                    [fPrivateCheck state] == NSOnState);
+    
+    #warning move to "check" method
+    /*#warning add to T
+
+    [[self window] close];*/
 }
 
@@ -199 +201 @@
 }
 
-- (void) setPath: (NSString *) path
-{
-    fPath = [path retain];
-}
-
-- (void) locationSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info
+- (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (void *) info
 {
     if (code == NSOKButton)
     {
         [fLocation release];
-        fLocation = [[[openPanel filenames] objectAtIndex: 0] retain];
+        fLocation = [[panel filename] retain];
         
-        [fLocationIcon setImage: [[NSWorkspace sharedWorkspace] iconForFile: fLocation]];
+        [fLocationIcon setImage: [[NSWorkspace sharedWorkspace] iconForFile: [fLocation stringByDeletingLastPathComponent]]];
         [fLocationField setStringValue: [fLocation stringByAbbreviatingWithTildeInPath]];
         [fLocationField setToolTip: fLocation];

branches/file_selection/macosx/English.lproj/Creator.nib/classes.nib

@@ -13 +13 @@
                 fPiecesField = NSTextField; 
                 fPrivateCheck = NSButton; 
+                fProgressIndicator = NSProgressIndicator; 
+                fProgressWindow = NSWindow; 
                 fStatusField = NSTextField; 
-                fTorrentNameField = NSTextField; 
                 fTrackerField = NSTextField; 
             }; 

branches/file_selection/macosx/English.lproj/Creator.nib/info.nib

@@ -9 +9 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>45</integer>
                 <integer>5</integer>
         </array>