Changeset 14290

Timestamp:

Jun 8, 2014, 10:16:01 PM (8 years ago)

Author:

jordan

Message:

(trunk) replace the tr_metainfo_builder.isSingleFile and tr_info.isMultifile fields an 'isFolder' bool in both structs.

This makes the variable naming more uniform. It also clarifies the information we're really trying to convey -- previously, isSingleFile was false whenever the torrent held a directory tree, even if there was only a single file in the tree.

Sync the Mac OS X client's use to match the libtransmission variable names.

Location:

trunk

Files:

• libtransmission/makemeta.c (modified) (3 diffs)
• libtransmission/makemeta.h (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Controller.m (modified) (1 diff)
• macosx/CreatorWindowController.m (modified) (1 diff)
• macosx/DragOverlayWindow.m (modified) (1 diff)
• macosx/QuickLookPlugin/GeneratePreviewForURL.m (modified) (3 diffs)
• macosx/Torrent.m (modified) (1 diff)

trunk/libtransmission/makemeta.c

@@ -127 +127 @@
     struct stat sb;
     stat (topFile, &sb);
-    ret->isSingleFile = !S_ISDIR (sb.st_mode);
+    ret->isFolder = S_ISDIR (sb.st_mode);
   }
 
@@ -335 +335 @@
   tr_variantDictReserve (dict, 5);
 
-  if (builder->isSingleFile)
-    {
-      tr_variantDictAddInt (dict, TR_KEY_length, builder->files[0].size);
-    }
-  else /* root node is a directory */
+  if (builder->isFolder) /* root node is a directory */
     {
       uint32_t  i;
@@ -351 +347 @@
           getFileInfo (builder->top, &builder->files[i], length, pathVal);
         }
+    }
+  else
+    {
+      tr_variantDictAddInt (dict, TR_KEY_length, builder->files[0].size);
     }
 

trunk/libtransmission/makemeta.h

@@ -46 +46 @@
     uint32_t                    pieceSize;
     uint32_t                    pieceCount;
-    bool                        isSingleFile;
+    bool                        isFolder;
 
     /**

trunk/libtransmission/transmission.h

@@ -1837 +1837 @@
     /* Flags */
     bool               isPrivate;
-    bool               isMultifile;
+    bool               isFolder;
 };
 

trunk/macosx/Controller.m

@@ -954 +954 @@
         //determine to show the options window
         const BOOL showWindow = type == ADD_SHOW_OPTIONS || ([fDefaults boolForKey: @"DownloadAsk"]
-                                    && (info.isMultifile || ![fDefaults boolForKey: @"DownloadAskMulti"])
+                                    && (info.isFolder || ![fDefaults boolForKey: @"DownloadAskMulti"])
                                     && (type != ADD_AUTO || ![fDefaults boolForKey: @"DownloadAskManual"]));
         tr_metainfoFree(&info);

trunk/macosx/CreatorWindowController.m

@@ -151 +151 @@
     [fNameField setToolTip: [fPath path]];
     
-    const BOOL multifile = !fInfo->isSingleFile;
+    const BOOL multifile = fInfo->isFolder;
     
     NSImage * icon = [[NSWorkspace sharedWorkspace] iconForFileType: multifile

trunk/macosx/DragOverlayWindow.m

@@ -111 +111 @@
                 {
                     name = [NSString stringWithUTF8String: info.name];
-                    folder = info.isMultifile;
+                    folder = info.isFolder;
                 }
             }

trunk/macosx/QuickLookPlugin/GeneratePreviewForURL.m

@@ -61 +61 @@
     
     NSString * name = [NSString stringWithUTF8String: inf.name];
-    NSString * fileTypeString = inf.isMultifile ? NSFileTypeForHFSTypeCode(kGenericFolderIcon) : [name pathExtension];
+    NSString * fileTypeString = inf.isFolder ? NSFileTypeForHFSTypeCode(kGenericFolderIcon) : [name pathExtension];
     
     const NSUInteger width = 32;
@@ -67 +67 @@
     
     NSString * fileSizeString = [NSString stringForFileSize: inf.totalSize];
-    if (inf.isMultifile)
+    if (inf.isFolder)
     {
         NSString * fileCountString;
@@ -133 +133 @@
     }
     
-    if (inf.isMultifile)
+    if (inf.isFolder)
     {
         NSMutableString * listSection = [NSMutableString string];

trunk/macosx/Torrent.m

@@ -643 +643 @@
 - (BOOL) isFolder
 {
-    return fInfo->isMultifile;
+    return fInfo->isFolder;
 }