Changeset 3816

Timestamp:

Nov 13, 2007, 12:56:58 AM (15 years ago)

Author:

livings124

Message:

when dragging a file on the window, check if it has the .torrent extension; smaller changes

Location:

trunk

Files:

• appcast.xml (modified) (2 diffs)
• macosx/BadgeView.m (modified) (1 diff)
• macosx/Controller.m (modified) (5 diffs)
• macosx/DragOverlayWindow.m (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/appcast.xml

@@ -7 +7 @@
     <language>en</language>
     <pubDate>Tue, 23 Oct 2007 23:20:00 -0400</pubDate>
-    <lastBuildDate>Tue, 12 Nov 2007 16:22:00 -0400</lastBuildDate>
+    <lastBuildDate>Mon, 12 Nov 2007 16:22:00 -0400</lastBuildDate>
 
         <item>
@@ -23 +23 @@
 
 <h4>TRANSMISSION 0.72 AND EARLIER: COMPLETE YOUR DOWNLOADS BEFORE UPGRADING OR YOU WILL LOSE DATA!</h4>]]></description>
-      <pubDate>Tue, 12 Nov 2007 16:22:00 -0400</pubDate>
+      <pubDate>Mon, 12 Nov 2007 16:22:00 -0400</pubDate>
       <enclosure sparkle:version="3811" sparkle:shortVersionString="0.93" url="http://mirrors.m0k.org/transmission/files/Transmission-0.93.dmg" length="2142946" type="application/octet-stream"/>
     </item>

trunk/macosx/BadgeView.m

@@ -73 +73 @@
         if (uploadRateString || downloadRateString)
         {
-            NSRect badgeRect;
+            NSRect badgeRect = NSZeroRect;
             badgeRect.size = [[NSImage imageNamed: @"UploadBadge"] size];
-            badgeRect.origin = NSZeroPoint;
             
             //ignore shadow of badge when placing string

trunk/macosx/Controller.m

@@ -2199 +2199 @@
         
         //determine where to move them
-        int i, decrease = 0;
+        int i;
         for (i = [indexes firstIndex]; i < newRow && i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
             newRow--;
@@ -2268 +2268 @@
         while ((file = [enumerator nextObject]))
         {
-            canAdd = tr_torrentParse(fLib, [file UTF8String], NULL, NULL);
-            if (canAdd == TR_OK)
+            if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
             {
-                if (!fOverlayWindow)
-                    fOverlayWindow = [[DragOverlayWindow alloc] initWithLib: fLib forWindow: fWindow];
-                [fOverlayWindow setTorrents: files];
-                
-                return NSDragOperationCopy;
+                switch (canAdd = tr_torrentParse(fLib, [file UTF8String], NULL, NULL))
+                {
+                    case TR_OK:
+                        if (!fOverlayWindow)
+                            fOverlayWindow = [[DragOverlayWindow alloc] initWithLib: fLib forWindow: fWindow];
+                        [fOverlayWindow setTorrents: files];
+                        
+                        return NSDragOperationCopy;
+                    
+                    case TR_EDUPLICATE:
+                        torrent = YES;
+                }
             }
-            else if (canAdd == TR_EDUPLICATE)
-                torrent = YES;
-            else;
         }
         
@@ -2305 +2308 @@
 }
 
+#warning when dragging a torrent file that already exists, it gives a weird result
 - (void) draggingExited: (id <NSDraggingInfo>) info
 {
@@ -2321 +2325 @@
         BOOL torrent = NO, accept = YES;
         
-        #warning replace ifs with switch
         //create an array of files that can be opened
         NSMutableArray * filesToOpen = [[NSMutableArray alloc] init];
@@ -2330 +2333 @@
         while ((file = [enumerator nextObject]))
         {
-            canAdd = tr_torrentParse(fLib, [file UTF8String], NULL, NULL);
-            if (canAdd == TR_OK)
+            if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
             {
-                [filesToOpen addObject: file];
-                torrent = YES;
+                switch(tr_torrentParse(fLib, [file UTF8String], NULL, NULL))
+                {
+                    case TR_OK:
+                        [filesToOpen addObject: file];
+                        torrent = YES;
+                        break;
+                        
+                    case TR_EDUPLICATE:
+                        torrent = YES;
+                }
             }
-            else if (canAdd == TR_EDUPLICATE)
-                torrent = YES;
-            else;
         }
         

trunk/macosx/DragOverlayWindow.m

@@ -86 +86 @@
     while ((file = [enumerator nextObject]))
     {
-        if (tr_torrentParse(fLib, [file UTF8String], NULL, &info) == TR_OK)
+        if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame
+            && tr_torrentParse(fLib, [file UTF8String], NULL, &info) == TR_OK)
         {
             count++;

trunk/macosx/Torrent.m

@@ -750 +750 @@
 - (float) notAvailableDesired
 {
-    //NSLog(@"not available %f", (float)(fStat->desiredSize - fStat->desiredAvailable) / [self size]);
     return (float)(fStat->desiredSize - fStat->desiredAvailable) / [self size];
 }