Changeset 5960

Timestamp:

May 28, 2008, 11:57:25 PM (14 years ago)

Author:

livings124

Message:

allow creation of torrents with no announce address

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• macosx/Controller.m (modified) (1 diff)
• macosx/CreatorWindowController.h (modified) (3 diffs)
• macosx/CreatorWindowController.m (modified) (8 diffs)
• macosx/Defaults.plist (modified) (1 diff)
• macosx/English.lproj/Creator.xib (modified) (10 diffs)
• macosx/PrefsController.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -455 +455 @@
                 4DE5CCB80981D27700BE280E /* ResumeAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeAll.png; path = macosx/Images/ResumeAll.png; sourceTree = "<group>"; };
                 4DE5CCB90981D27700BE280E /* PauseAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseAll.png; path = macosx/Images/PauseAll.png; sourceTree = "<group>"; };
-                4DE5CCCA0981D9BE00BE280E /* Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Defaults.plist; path = macosx/Defaults.plist; sourceTree = "<group>"; };
+                4DE5CCCA0981D9BE00BE280E /* Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = Defaults.plist; path = macosx/Defaults.plist; sourceTree = "<group>"; };
                 4DF0C5A90899190500DD8943 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = Controller.m; path = macosx/Controller.m; sourceTree = "<group>"; };
                 4DF0C5AA0899190500DD8943 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Controller.h; path = macosx/Controller.h; sourceTree = "<group>"; };

trunk/macosx/Controller.m

@@ -1207 +1207 @@
     while ((torrent = [enumerator nextObject]))
     {
+        #warning redo, since now can be removed through rpc
         //expand the group, since either the whole group is being removed, it is already expanded, or not showing groups
         [fTableView removeCollapsedGroup: [torrent groupValue]];

trunk/macosx/CreatorWindowController.h

@@ -32 +32 @@
     IBOutlet NSTextField * fNameField, * fStatusField, * fPiecesField, * fTrackerField, * fLocationField;
     IBOutlet NSTextView * fCommentView;
-    IBOutlet NSButton *fCreateButton, * fPrivateCheck, * fOpenCheck;
+    IBOutlet NSButton * fPrivateCheck, * fOpenCheck;
     
     IBOutlet NSView * fProgressView;
@@ -38 +38 @@
     
     tr_metainfo_builder * fInfo;
-    NSString * fPath, * fLocation;
+    NSString * fPath, * fLocation, * fTracker;
     BOOL fOpenTorrent;
     
@@ -52 +52 @@
 - (id) initWithHandle: (tr_handle *) handle path: (NSString *) path;
 
+- (void) toggleOpenCheck: (id) sender;
+
 - (void) setLocation: (id) sender;
 - (void) create: (id) sender;

trunk/macosx/CreatorWindowController.m

@@ -30 +30 @@
 
 + (NSString *) chooseFile;
-- (void) updateEnableCreateButtonForTrackerField;
+- (void) updateEnableOpenCheckForTrackerField;
 - (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
+
+- (void) createReal;
 - (void) checkProgress;
 - (void) failureSheetClosed: (NSAlert *) alert returnCode: (int) code contextInfo: (void *) info;
@@ -151 +153 @@
     if ((tracker = [fDefaults stringForKey: @"CreatorTracker"]))
         [fTrackerField setStringValue: tracker];
-    [self updateEnableCreateButtonForTrackerField];
     
     if ([fDefaults objectForKey: @"CreatorPrivate"])
         [fPrivateCheck setState: [fDefaults boolForKey: @"CreatorPrivate"] ? NSOnState : NSOffState];
     
-    if ([fDefaults objectForKey: @"CreatorOpen"])
-        [fOpenCheck setState: [fDefaults boolForKey: @"CreatorOpen"] ? NSOnState : NSOffState];
+    fOpenTorrent = [fDefaults boolForKey: @"CreatorOpen"];
+    [self updateEnableOpenCheckForTrackerField];
 }
 
@@ -165 +166 @@
     [fLocation release];
     
+    [fTracker release];
+    
     if (fInfo)
         tr_metaInfoBuilderFree(fInfo);
@@ -172 +175 @@
     
     [super dealloc];
+}
+
+- (void) toggleOpenCheck: (id) sender
+{
+    fOpenTorrent = [fOpenCheck state] == NSOnState;
+}
+
+- (void) controlTextDidChange: (NSNotification *) notification
+{
+    if ([notification object] == fTrackerField)
+        [self updateEnableOpenCheckForTrackerField];
 }
 
@@ -190 +204 @@
 }
 
-- (void) controlTextDidChange: (NSNotification *) notification
-{
-    if ([notification object] == fTrackerField)
-        [self updateEnableCreateButtonForTrackerField];
-}
-
 - (void) create: (id) sender
 {
-    NSString * trackerString = [fTrackerField stringValue];
-    if ([trackerString rangeOfString: @"://"].location == NSNotFound)
-        trackerString = [@"http://" stringByAppendingString: trackerString];
-    
-    //parse tracker string
-    if (!tr_httpIsValidURL([trackerString UTF8String]))
-    {
-        NSAlert * alert = [[[NSAlert alloc] init] autorelease];
-        [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> warning -> button")];
-        [alert setInformativeText: NSLocalizedString(@"Change the tracker address to create the torrent file.",
-                                                    "Create torrent -> warning -> info")];
-        [alert setAlertStyle: NSWarningAlertStyle];
-        
-        //check common reasons for failure
-        NSString * prefix = [trackerString substringToIndex: [trackerString rangeOfString: @"://"].location];
-        if ([prefix caseInsensitiveCompare: @"http"] != NSOrderedSame && [prefix caseInsensitiveCompare: @"https"] != NSOrderedSame)
-            [alert setMessageText: NSLocalizedString(@"The tracker address must begin with \"http://\" or \"https://\".",
-                                                    "Create torrent -> warning -> message")];
-        else
-            [alert setMessageText: NSLocalizedString(@"The tracker address is invalid.", "Create torrent -> warning -> message")];
-        
-        [alert beginSheetModalForWindow: [self window] modalDelegate: self didEndSelector: nil contextInfo: nil];
-        return;
+    /*if ([[fTrackerField stringValue] isEqualToString: @""] && [fDefaults boolForKey: @"WarningCreatorBlankAddress"])
+    {
+    }
+    else*/
+        [self createReal];
+}
+
+- (void) cancelCreateWindow: (id) sender
+{
+    [[self window] close];
+}
+
+- (void) windowWillClose: (NSNotification *) notification
+{
+    [self release];
+}
+
+- (void) cancelCreateProgress: (id) sender
+{
+    fInfo->abortFlag = 1;
+    [fTimer fire];
+}
+
+@end
+
+@implementation CreatorWindowController (Private)
+
++ (NSString *) chooseFile
+{
+    NSOpenPanel * panel = [NSOpenPanel openPanel];
+    
+    [panel setTitle: NSLocalizedString(@"Create Torrent File", "Create torrent -> select file")];
+    [panel setPrompt: NSLocalizedString(@"Select", "Create torrent -> select file")];
+    [panel setAllowsMultipleSelection: NO];
+    [panel setCanChooseFiles: YES];
+    [panel setCanChooseDirectories: YES];
+    [panel setCanCreateDirectories: NO];
+
+    [panel setMessage: NSLocalizedString(@"Select a file or folder for the torrent file.", "Create torrent -> select file")];
+    
+    BOOL success = [panel runModal] == NSOKButton;
+    return success ? [[panel filenames] objectAtIndex: 0] : nil;
+}
+
+- (void) updateEnableOpenCheckForTrackerField
+{
+    BOOL hasTracker = ![[fTrackerField stringValue] isEqualToString: @""];
+    [fOpenCheck setEnabled: hasTracker];
+    [fOpenCheck setState: (fOpenTorrent && hasTracker) ? NSOnState : NSOffState];
+}
+
+- (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (void *) info
+{
+    if (code == NSOKButton)
+    {
+        [fLocation release];
+        fLocation = [[panel filename] retain];
+        
+        [fLocationField setStringValue: [fLocation stringByAbbreviatingWithTildeInPath]];
+        [fLocationField setToolTip: fLocation];
+    }
+}
+
+- (void) createReal
+{
+    [fTracker release]; //incase a previous create was aborted
+    fTracker = [[fTrackerField stringValue] retain];
+    
+    //parse non-empty tracker strings
+    if (![fTracker isEqualToString: @""])
+    {
+        if ([fTracker rangeOfString: @"://"].location == NSNotFound)
+        {
+            NSString * fullTracker = [@"http://" stringByAppendingString: fTracker];
+            [fTracker release];
+            fTracker = [fullTracker retain];
+        }
+        
+        if (!tr_httpIsValidURL([fTracker UTF8String]))
+        {
+            NSAlert * alert = [[[NSAlert alloc] init] autorelease];
+            [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> warning -> button")];
+            [alert setInformativeText: NSLocalizedString(@"Change the tracker address to create the torrent file.",
+                                                        "Create torrent -> warning -> info")];
+            [alert setAlertStyle: NSWarningAlertStyle];
+            
+            //check common reasons for failure
+            NSString * prefix = [fTracker substringToIndex: [fTracker rangeOfString: @"://"].location];
+            if ([prefix caseInsensitiveCompare: @"http"] != NSOrderedSame && [prefix caseInsensitiveCompare: @"https"] != NSOrderedSame)
+                [alert setMessageText: NSLocalizedString(@"The tracker address must begin with \"http://\" or \"https://\".",
+                                                        "Create torrent -> warning -> message")];
+            else
+                [alert setMessageText: NSLocalizedString(@"The tracker address is invalid.", "Create torrent -> warning -> message")];
+            
+            [alert beginSheetModalForWindow: [self window] modalDelegate: self didEndSelector: nil contextInfo: nil];
+            return;
+        }
     }
     
@@ -244 +326 @@
     }
     
-    fOpenTorrent = [fOpenCheck state] == NSOnState;
-    
     //store values
-    [fDefaults setObject: trackerString forKey: @"CreatorTracker"];
+    [fDefaults setObject: fTracker forKey: @"CreatorTracker"];
     [fDefaults setBool: [fPrivateCheck state] == NSOnState forKey: @"CreatorPrivate"];
     [fDefaults setBool: fOpenTorrent forKey: @"CreatorOpen"];
@@ -253 +333 @@
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil];
-    tr_makeMetaInfo(fInfo, [fLocation UTF8String], [trackerString UTF8String], [[fCommentView string] UTF8String],
+    tr_makeMetaInfo(fInfo, [fLocation UTF8String], [fTracker UTF8String], [[fCommentView string] UTF8String],
                     [fPrivateCheck state] == NSOnState);
     
     fTimer = [NSTimer scheduledTimerWithTimeInterval: 0.1 target: self selector: @selector(checkProgress)
-                        userInfo: nil repeats: YES];
-}
-
-- (void) cancelCreateWindow: (id) sender
-{
-    [[self window] close];
-}
-
-- (void) windowWillClose: (NSNotification *) notification
-{
-    [self release];
-}
-
-- (void) cancelCreateProgress: (id) sender
-{
-    fInfo->abortFlag = 1;
-    [fTimer fire];
-}
-
-@end
-
-@implementation CreatorWindowController (Private)
-
-+ (NSString *) chooseFile
-{
-    NSOpenPanel * panel = [NSOpenPanel openPanel];
-    
-    [panel setTitle: NSLocalizedString(@"Create Torrent File", "Create torrent -> select file")];
-    [panel setPrompt: NSLocalizedString(@"Select", "Create torrent -> select file")];
-    [panel setAllowsMultipleSelection: NO];
-    [panel setCanChooseFiles: YES];
-    [panel setCanChooseDirectories: YES];
-    [panel setCanCreateDirectories: NO];
-
-    [panel setMessage: NSLocalizedString(@"Select a file or folder for the torrent file.", "Create torrent -> select file")];
-    
-    BOOL success = [panel runModal] == NSOKButton;
-    return success ? [[panel filenames] objectAtIndex: 0] : nil;
-}
-
-- (void) updateEnableCreateButtonForTrackerField
-{
-    NSString * string = [fTrackerField stringValue];
-    BOOL enable = YES;
-    if ([string isEqualToString: @""])
-        enable = NO;
-    else
-    {
-        NSRange prefixRange = [string rangeOfString: @"://"];
-        if (prefixRange.location != NSNotFound && [string length] == NSMaxRange(prefixRange))
-            enable = NO;
-    }
-    
-    [fCreateButton setEnabled: enable];
-}
-
-- (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (void *) info
-{
-    if (code == NSOKButton)
-    {
-        [fLocation release];
-        fLocation = [[panel filename] retain];
-        
-        [fLocationField setStringValue: [fLocation stringByAbbreviatingWithTildeInPath]];
-        [fLocationField setToolTip: fLocation];
-    }
+                userInfo: nil repeats: YES];
 }
 
@@ -336 +351 @@
         {
             case TR_MAKEMETA_OK:
-                if (fOpenTorrent)
+                if (fOpenTorrent && ![fTracker isEqualToString: @""])
                 {
                     NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: fLocation, @"File",

trunk/macosx/Defaults.plist

@@ -153 +153 @@
         <key>WarningDuplicate</key>
         <true/>
+        <key>WarningCreatorBlankAddress</key>
+        <true/>
         <key>WarningFolderDataSameName</key>
         <true/>

trunk/macosx/English.lproj/Creator.xib

@@ -3 +3 @@
         <data>
                 <int key="IBDocument.SystemTarget">1050</int>
-                <string key="IBDocument.SystemVersion">9C7010</string>
-                <string key="IBDocument.InterfaceBuilderVersion">652</string>
-                <string key="IBDocument.AppKitVersion">949.26</string>
+                <string key="IBDocument.SystemVersion">9D34</string>
+                <string key="IBDocument.InterfaceBuilderVersion">667</string>
+                <string key="IBDocument.AppKitVersion">949.33</string>
                 <string key="IBDocument.HIToolboxVersion">352.00</string>
                 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
@@ -493 +493 @@
                                                         <bool key="NSEnabled">YES</bool>
                                                         <object class="NSButtonCell" key="NSCell" id="671503663">
-                                                                <int key="NSCellFlags">604110336</int>
+                                                                <int key="NSCellFlags">67239424</int>
                                                                 <int key="NSCellFlags2">134217728</int>
                                                                 <string key="NSContents">Create</string>
@@ -783 +783 @@
                                 </object>
                                 <object class="IBConnectionRecord">
-                                        <object class="IBOutletConnection" key="connection">
-                                                <string key="label">fCreateButton</string>
-                                                <reference key="source" ref="578092914"/>
-                                                <reference key="destination" ref="697506694"/>
-                                        </object>
-                                        <int key="connectionID">87</int>
+                                        <object class="IBActionConnection" key="connection">
+                                                <string key="label">toggleOpenCheck:</string>
+                                                <reference key="source" ref="578092914"/>
+                                                <reference key="destination" ref="631380462"/>
+                                        </object>
+                                        <int key="connectionID">88</int>
                                 </object>
                         </object>
@@ -1309 +1309 @@
                         </object>
                         <nil key="sourceID"/>
-                        <int key="maxID">87</int>
+                        <int key="maxID">88</int>
                 </object>
                 <object class="IBClassDescriber" key="IBDocument.Classes">
@@ -1325 +1325 @@
                                                         <string>create:</string>
                                                         <string>setLocation:</string>
+                                                        <string>toggleOpenCheck:</string>
                                                 </object>
                                                 <object class="NSMutableArray" key="dict.values">
@@ -1332 +1333 @@
                                                         <string>id</string>
                                                         <string>id</string>
+                                                        <string>id</string>
                                                 </object>
                                         </object>
@@ -1339 +1341 @@
                                                         <bool key="EncodedWithXMLCoder">YES</bool>
                                                         <string>fCommentView</string>
-                                                        <string>fCreateButton</string>
                                                         <string>fIconView</string>
                                                         <string>fLocationField</string>
@@ -1354 +1355 @@
                                                         <bool key="EncodedWithXMLCoder">YES</bool>
                                                         <string>NSTextView</string>
-                                                        <string>NSButton</string>
                                                         <string>NSImageView</string>
                                                         <string>NSTextField</string>
@@ -1382 +1382 @@
                                 <object class="IBPartialClassDescription">
                                         <string key="className">FirstResponder</string>
+                                        <string key="superclassName">NSObject</string>
                                         <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                 <string key="majorKey">IBUserSource</string>
@@ -1399 +1400 @@
                                                 <string key="majorKey">IBProjectSource</string>
                                                 <string key="minorKey">macosx/NSMenuAdditions.h</string>
-                                        </object>
-                                </object>
-                                <object class="IBPartialClassDescription">
-                                        <string key="className">NSObject</string>
-                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                                <string key="majorKey">IBProjectSource</string>
-                                                <string key="minorKey">macosx/IPCController.h</string>
                                         </object>
                                 </object>

trunk/macosx/PrefsController.m

@@ -507 +507 @@
     [fDefaults setBool: YES forKey: @"WarningFolderDataSameName"];
     [fDefaults setBool: YES forKey: @"WarningResetStats"];
+    [fDefaults setBool: YES forKey: @"WarningCreatorBlankAddress"];
 }