Changeset 1051

Timestamp:

Nov 3, 2006, 4:01:45 PM (16 years ago)

Author:

livings124

Message:

incomplete folder for downloading torrents

Location:

trunk/macosx

Files:

• Defaults.plist (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/classes.nib (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• PrefsController.h (modified) (2 diffs)
• PrefsController.m (modified) (3 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (7 diffs)

trunk/macosx/Defaults.plist

@@ -45 +45 @@
         <key>History</key>
         <array/>
+        <key>IncompleteDownloadFolder</key>
+        <string>~/Desktop</string>
         <key>InfoTab</key>
         <string>Info</string>
@@ -105 +107 @@
         <key>UseAdvancedBar</key>
         <false/>
+        <key>UseIncompleteDownloadFolder</key>
+        <false/>
 </dict>
 </plist>

trunk/macosx/English.lproj/PrefsWindow.nib/classes.nib

@@ -10 +10 @@
                 helpForNetwork = id; 
                 importFolderSheetShow = id; 
+                incompleteFolderSheetShow = id; 
                 setAutoImport = id; 
                 setAutoSize = id; 
@@ -32 +33 @@
                 fGeneralView = NSView; 
                 fImportFolderPopUp = NSPopUpButton; 
+                fIncompleteFolderPopUp = NSPopUpButton; 
                 fNatCheck = NSButton; 
                 fNatStatusField = NSTextField; 

trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

@@ -4 +4 @@
 <dict>
         <key>IBDocumentLocation</key>
-        <string>18 87 356 240 0 0 1152 842 </string>
+        <string>19 87 356 240 0 0 1152 842 </string>
         <key>IBEditorPositions</key>
         <dict>
                 <key>153</key>
-                <string>123 483 563 267 0 0 1152 842 </string>
+                <string>294 445 563 267 0 0 1152 842 </string>
                 <key>28</key>
                 <string>294 434 563 290 0 0 1152 842 </string>
                 <key>41</key>
-                <string>294 420 563 317 0 0 1152 842 </string>
+                <string>108 420 563 342 0 0 1152 842 </string>
                 <key>66</key>
                 <string>294 507 563 144 0 0 1152 842 </string>
@@ -24 +24 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>153</integer>
+                <integer>41</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/PrefsController.h

@@ -37 +37 @@
     IBOutlet NSView         * fGeneralView, * fTransfersView, * fBandwidthView, * fNetworkView;
     
-    IBOutlet NSPopUpButton  * fFolderPopUp, * fImportFolderPopUp,
+    IBOutlet NSPopUpButton  * fFolderPopUp, * fIncompleteFolderPopUp, * fImportFolderPopUp,
                             * fDownloadSoundPopUp, * fSeedingSoundPopUp;
     
@@ -69 +69 @@
 - (void) setCopyTorrents: (id) sender;
 
-- (void) setDownloadLocation:   (id) sender;
-- (void) folderSheetShow:       (id) sender;
+- (void) setDownloadLocation:       (id) sender;
+- (void) folderSheetShow:           (id) sender;
+- (void) incompleteFolderSheetShow: (id) sender;
 
 - (void) setPort:   (id) sender;

trunk/macosx/PrefsController.m

@@ -45 +45 @@
 
 - (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
+- (void) incompleteFolderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
 - (void) importFolderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
 
@@ -397 +398 @@
 }
 
+- (void) incompleteFolderSheetShow: (id) sender
+{
+    NSOpenPanel * panel = [NSOpenPanel openPanel];
+
+    [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 didEndSelector:
+        @selector(incompleteFolderSheetClosed:returnCode:contextInfo:) contextInfo: nil];
+}
+
 - (void) setAutoImport: (id) sender
 {
@@ -509 +525 @@
 }
 
+- (void) incompleteFolderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info
+{
+    if (code == NSOKButton)
+        [fDefaults setObject: [[openPanel filenames] objectAtIndex: 0] forKey: @"IncompleteDownloadFolder"];
+    [fIncompleteFolderPopUp selectItemAtIndex: 0];
+}
+
 - (void) importFolderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info
 {

trunk/macosx/Torrent.h

@@ -39 +39 @@
     BOOL         fResumeOnWake;
     NSDate       * fDate;
+    
+    BOOL        fUseIncompleteFolder;
+    NSString    * fDownloadFolder, * fIncompleteFolder;
     
     BOOL        fPrivateTorrent, fPublicTorrent;

trunk/macosx/Torrent.m

@@ -66 +66 @@
     if (self)
     {
+        fUseIncompleteFolder = [fDefaults boolForKey: @"UseIncompleteDownloadFolder"];
+        fIncompleteFolder = [[fDefaults stringForKey: @"IncompleteDownloadFolder"] copy];
+        
         if (!fPublicTorrent)
             [self trashFile: path];
@@ -86 +89 @@
     if (self)
     {
+        //download folders
         NSString * downloadFolder;
         if (!(downloadFolder = [history objectForKey: @"DownloadFolder"]))
             downloadFolder = [[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath];
+        
+        NSNumber * useIncompleteFolder;
+        if ((useIncompleteFolder = [history objectForKey: @"UseIncompleteFolder"]))
+        {
+            if ((fUseIncompleteFolder = [useIncompleteFolder boolValue]))
+            {
+                NSString * incompleteFolder;
+                if (incompleteFolder = [history objectForKey: @"IncompleteFolder"])
+                    fIncompleteFolder = [incompleteFolder copy];
+                else
+                    fIncompleteFolder = [[[fDefaults stringForKey: @"IncompleteDownloadFolder"]
+                                            stringByExpandingTildeInPath] copy];
+            }
+        }
+        else
+            fUseIncompleteFolder = NO;
+        
         [self setDownloadFolder: downloadFolder];
 
@@ -106 +127 @@
                     [NSNumber numberWithBool: fPrivateTorrent], @"PrivateCopy",
                     [NSNumber numberWithBool: fPublicTorrent], @"PublicCopy",
-                    [self downloadFolder], @"DownloadFolder",
+                    fDownloadFolder, @"DownloadFolder",
+                    [NSNumber numberWithBool: fUseIncompleteFolder], @"UseIncompleteFolder",
                     [self isActive] ? @"NO" : @"YES", @"Paused",
                     [self date], @"Date",
@@ -113 +135 @@
                     [NSNumber numberWithBool: fWaitToStart], @"WaitToStart",
                     [self orderValue], @"OrderValue", nil];
-            
+    
+    if (fUseIncompleteFolder)
+        [history setObject: fIncompleteFolder forKey: @"IncompleteFolder"];
+    
     if (fPrivateTorrent)
         [history setObject: [self hashString] forKey: @"TorrentHash"];
@@ -128 +153 @@
     {
         tr_torrentClose(fLib, fHandle);
+        
+        if (fDownloadFolder)
+            [fDownloadFolder release];
+        if (fIncompleteFolder)
+            [fIncompleteFolder release];
         
         if (fPublicTorrentLocation)
@@ -152 +182 @@
 - (void) setDownloadFolder: (NSString *) path
 {
-    tr_torrentSetFolder(fHandle, [path UTF8String]);
+    fDownloadFolder = [path copy];
+    
+    if (!fUseIncompleteFolder || [[NSFileManager defaultManager] fileExistsAtPath:
+                                    [path stringByAppendingPathComponent: [self name]]])
+        tr_torrentSetFolder(fHandle, [path UTF8String]);
+    else
+        tr_torrentSetFolder(fHandle, [fIncompleteFolder UTF8String]);
 }
 
@@ -176 +212 @@
     //notification when downloading finished
     if ([self justFinished])
+    {
+        //move file from incomplete folder to download folder
+        if (fUseIncompleteFolder && ![[self downloadFolder] isEqualToString: fDownloadFolder])
+        {
+            tr_torrentStop(fHandle);
+            if ([[NSFileManager defaultManager] movePath: [[self downloadFolder] stringByAppendingPathComponent: [self name]]
+                                    toPath: [fDownloadFolder stringByAppendingPathComponent: [self name]] handler: nil])
+                tr_torrentSetFolder(fHandle, [fDownloadFolder UTF8String]);
+            tr_torrentStart(fHandle);
+        }
+        
         [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self];
+    }
     
     //check to stop for ratio