Changeset 6244

Timestamp:

Jun 22, 2008, 1:31:50 AM (14 years ago)

Author:

livings124

Message:

don't allow quick look of folders that don't exist

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (3 diffs)
• InfoWindowController.m (modified) (4 diffs)
• Torrent.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -261 +261 @@
 - (NSArray *) quickLookURLs;
 - (BOOL) canQuickLook;
+- (BOOL) canQuickLookTorrent: (Torrent *) torrent;
 - (NSRect) quickLookFrameWithURL: (NSURL*) url;
 - (void) toggleQuickLook: (id) sender;

trunk/macosx/Controller.m

@@ -474 +474 @@
     [self updateUI];
     fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_UI_SECONDS target: self
-        selector: @selector(updateUI) userInfo: nil repeats: YES];
+                selector: @selector(updateUI) userInfo: nil repeats: YES];
     [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSModalPanelRunLoopMode];
     [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSEventTrackingRunLoopMode];
@@ -4104 +4104 @@
     
     while ((torrent = [enumerator nextObject]))
-    {
-        if ([torrent isFolder] || [torrent isComplete])
+        if ([self canQuickLookTorrent: torrent])
             [urlArray addObject: [NSURL fileURLWithPath: [torrent dataLocation]]];
-    }
     
     return urlArray;
@@ -4119 +4117 @@
     
     while ((torrent = [enumerator nextObject]))
-    {
-        if ([torrent isFolder] || [torrent isComplete])
+        if ([self canQuickLookTorrent: torrent])
             return YES;
-    }
     
     return NO;
+}
+
+- (BOOL) canQuickLookTorrent: (Torrent *) torrent
+{
+    if (![[NSFileManager defaultManager] fileExistsAtPath: [torrent dataLocation]])
+        return NO;
+    
+    return [torrent isFolder] || [torrent isComplete];
 }
 

trunk/macosx/InfoWindowController.m

@@ -72 +72 @@
 
 - (NSView *) tabViewForTag: (int) tag;
+- (void) setWebSeedTableHidden: (BOOL) hide animate: (BOOL) animate;
 - (NSArray *) peerSortDescriptors;
-- (void) setWebSeedTableHidden: (BOOL) hide animate: (BOOL) animate;
+
+- (BOOL) canQuickLookFile: (FileListNode *) item;
 
 - (void) addTrackers;
@@ -1089 +1091 @@
     {
         FileListNode * item = [fileOutlineView itemAtRow: i];
-        if ([item isFolder] || [torrent fileProgress: [[item indexes] firstIndex]] == 1.0)
+        if ([self canQuickLookFile: item])
             [urlArray addObject: [NSURL fileURLWithPath: [folder stringByAppendingPathComponent: [item fullPath]]]];
     }
@@ -1104 +1106 @@
     int i;
     for (i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
-    {
-        FileListNode * item = [fileOutlineView itemAtRow: i];
-        if ([item isFolder] || [torrent fileProgress: [[item indexes] firstIndex]] == 1.0)
+        if ([self canQuickLookFile: [fileOutlineView itemAtRow: i]])
             return YES;
-    }
     
     return NO;
@@ -1601 +1600 @@
 }
 
+- (BOOL) canQuickLookFile: (FileListNode *) item
+{
+    Torrent * torrent = [fTorrents objectAtIndex: 0];
+    
+    if (![[NSFileManager defaultManager] fileExistsAtPath: [[torrent downloadFolder] stringByAppendingPathComponent: [item fullPath]]])
+        return NO;
+    
+    return [item isFolder] || [torrent fileProgress: [[item indexes] firstIndex]] == 1.0;
+}
+
 - (void) addTrackers
 {

trunk/macosx/Torrent.m

@@ -258 +258 @@
 }
 
-#warning when queue and seeding options are folded into libt, no need to call this on all torrents - use tr_torrentGetStatus
 - (void) update
 {