Changeset 1119

Timestamp:

Nov 23, 2006, 1:38:18 AM (16 years ago)

Author:

livings124

Message:

add support in libT and the mac interface for displaying comment, creator, and date created

Location:

trunk

Files:

• libtransmission/metainfo.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Controller.h (modified) (1 diff)
• macosx/English.lproj/InfoWindow.nib/classes.nib (modified) (1 diff)
• macosx/English.lproj/InfoWindow.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/InfoWindowController.h (modified) (1 diff)
• macosx/InfoWindowController.m (modified) (6 diffs)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/libtransmission/metainfo.c

@@ -191 +191 @@
     }
     snprintf( inf->trackerAnnounce, MAX_PATH_LENGTH, "%s", s2 );
+    
+    /* Comment info */
+    if( ( val = tr_bencDictFind( &meta, "comment" ) ) )
+    {
+        strcatUTF8( inf->comment, val->val.s.s );
+    }
+    
+    /* Creator info */
+    if( ( val = tr_bencDictFind( &meta, "created by" ) ) )
+    {
+        strcatUTF8( inf->creator, val->val.s.s );
+    }
+    
+    /* Date created */
+    if( ( val = tr_bencDictFind( &meta, "creation date" ) ) )
+    {
+        inf->dateCreated = val->val.i;
+    }
 
     /* Piece length */

trunk/libtransmission/transmission.h

@@ -319 +319 @@
     int         trackerPort;
     char        trackerAnnounce[MAX_PATH_LENGTH];
+    
+    /* Torrent info */
+    char        comment[MAX_PATH_LENGTH];
+    char        creator[MAX_PATH_LENGTH];
+    int         dateCreated;
 
     /* Pieces info */

trunk/macosx/Controller.h

@@ -95 +95 @@
     
     NSMutableArray                  * fAutoImportedNames;
-        NSMutableDictionary                             * fPendingTorrentDownloads;
+    NSMutableDictionary             * fPendingTorrentDownloads;
 }
 

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

@@ -20 +20 @@
             OUTLETS = {
                 fAnnounceField = NSTextField; 
+                fCommentField = NSTextField; 
                 fConnectedPeersField = NSTextField; 
+                fCreatorField = NSTextField; 
                 fDataLocationField = NSTextField; 
+                fDateCreatedField = NSTextField; 
                 fDateStartedField = NSTextField; 
                 fDownloadedTotalField = NSTextField; 

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

@@ -4 +4 @@
 <dict>
         <key>IBDocumentLocation</key>
-        <string>69 61 356 240 0 0 1152 842 </string>
+        <string>58 51 356 240 0 0 1024 746 </string>
         <key>IBEditorPositions</key>
         <dict>

trunk/macosx/InfoWindowController.h

@@ -39 +39 @@
     IBOutlet NSTextField * fNameField, * fSizeField, * fTrackerField,
                         * fAnnounceField, * fPieceSizeField, * fPiecesField,
-                        * fHashField,
+                        * fHashField, * fCommentField,
                         * fTorrentLocationField, * fDataLocationField,
-                        * fDateStartedField, * fStateField,
+                        * fDateStartedField,
+                        * fCreatorField, * fDateCreatedField,
+                        * fStateField,
                         * fDownloadedValidField, * fDownloadedTotalField, * fUploadedTotalField,
                         * fRatioField, * fSwarmSpeedField; 

trunk/macosx/InfoWindowController.m

@@ -40 +40 @@
 
 //15 spacing at the bottom of each tab
-#define TAB_INFO_HEIGHT 182.0
+#define TAB_INFO_HEIGHT 255.0
 #define TAB_ACTIVITY_HEIGHT 109.0
 #define TAB_PEERS_HEIGHT 260.0
@@ -158 +158 @@
         [fHashField setStringValue: @""];
         [fHashField setToolTip: nil];
+        [fCommentField setStringValue: @""];
+        [fCommentField setToolTip: @""];
+        
+        [fCreatorField setStringValue: @""];
+        [fDateCreatedField setStringValue: @""];
         
         [fTorrentLocationField setStringValue: @""];
@@ -172 +177 @@
         [fAnnounceField setSelectable: NO];
         [fHashField setSelectable: NO];
+        [fCommentField setSelectable: NO];
+        [fCreatorField setSelectable: NO];
         [fTorrentLocationField setSelectable: NO];
         [fDataLocationField setSelectable: NO];
@@ -203 +210 @@
         NSString * tracker = [torrent tracker],
                 * announce = [torrent announce],
-                * hashString = [torrent hashString];
+                * hashString = [torrent hashString],
+                * commentString = [torrent comment];
         [fTrackerField setStringValue: tracker];
         [fTrackerField setToolTip: tracker];
@@ -212 +220 @@
         [fHashField setStringValue: hashString];
         [fHashField setToolTip: hashString];
+        [fCommentField setStringValue: commentString];
+        [fCommentField setToolTip: commentString];
+        
+        [fCreatorField setStringValue: [torrent creator]];
+        [fDateCreatedField setObjectValue: [torrent dateCreated]];
         
         BOOL publicTorrent = [torrent publicTorrent];
@@ -232 +245 @@
         [fAnnounceField setSelectable: YES];
         [fHashField setSelectable: YES];
+        [fCommentField setSelectable: YES];
+        [fCreatorField setSelectable: YES];
         [fTorrentLocationField setSelectable: YES];
         [fDataLocationField setSelectable: YES];

trunk/macosx/Torrent.h

@@ -108 +108 @@
 - (NSString *) tracker;
 - (NSString *) announce;
+
+- (NSString *) comment;
+- (NSString *) creator;
+- (NSDate *)   dateCreated;
+
 - (int)        pieceSize;
 - (int)        pieceCount;

trunk/macosx/Torrent.m

@@ -713 +713 @@
 }
 
+- (NSString *) comment
+{
+    return [NSString stringWithUTF8String: fInfo->comment];
+}
+
+- (NSString *) creator
+{
+    return [NSString stringWithUTF8String: fInfo->creator];
+}
+
+- (NSDate *) dateCreated
+{
+    int date = fInfo->dateCreated;
+    return date > 0 ? [NSDate dateWithTimeIntervalSince1970: fInfo->dateCreated] : nil;
+}
+
 - (int) pieceSize
 {