Changeset 1576

Timestamp:

Mar 22, 2007, 6:07:22 PM (15 years ago)

Author:

joshe

Message:

Optionally return the info hash after attempting to load a duplicate torrent.

Location:

trunk

Files:

• beos/TRWindow.cpp (modified) (1 diff)
• cli/transmissioncli.c (modified) (1 diff)
• gtk/tr_torrent.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (6 diffs)
• libtransmission/transmission.h (modified) (3 diffs)
• macosx/Controller.m (modified) (2 diffs)
• macosx/Torrent.m (modified) (1 diff)

trunk/beos/TRWindow.cpp

@@ -161 +161 @@
                         // Try adding the torrent to the engine.
                         int error;
-                        tr_torrent_t *nTorrent = tr_torrentInit(engine, path.Path(), 0, &error);
+                        tr_torrent_t *nTorrent = tr_torrentInit(engine, path.Path(), NULL, 0, &error);
                         if (nTorrent != NULL && Lock()) { // Success. Add the TRTorrent item.
                                 transfers->AddItem(new TRTransfer(path.Path(), node, nTorrent));

trunk/cli/transmissioncli.c

@@ -127 +127 @@
 
     /* Open and parse torrent file */
-    if( !( tor = tr_torrentInit( h, torrentPath, 0, &error ) ) )
+    if( !( tor = tr_torrentInit( h, torrentPath, NULL, 0, &error ) ) )
     {
         printf( "Failed opening torrent file `%s'\n", torrentPath );

trunk/gtk/tr_torrent.c

@@ -279 +279 @@
     handle = tr_torrentInitSaved(back, torrent, 0, &errcode);
   else
-    handle = tr_torrentInit(back, torrent, trflags, &errcode);
+    handle = tr_torrentInit(back, torrent, NULL, trflags, &errcode);
 
   if(NULL == handle) {

trunk/libtransmission/torrent.c

@@ -30 +30 @@
  **********************************************************************/
 static tr_torrent_t * torrentRealInit( tr_handle_t *, tr_torrent_t * tor,
-                                       int flags, int * error );
+                                       uint8_t *, int flags, int * error );
 static void torrentReallyStop( tr_torrent_t * );
 static void downloadLoop( void * );
@@ -55 +55 @@
 
 tr_torrent_t * tr_torrentInit( tr_handle_t * h, const char * path,
-                               int flags, int * error )
+                               uint8_t * hash, int flags, int * error )
 {
     tr_torrent_t  * tor = calloc( sizeof( tr_torrent_t ), 1 );
@@ -68 +68 @@
     }
 
-    return torrentRealInit( h, tor, flags, error );
+    return torrentRealInit( h, tor, hash, flags, error );
 }
 
@@ -84 +84 @@
     }
 
-    return torrentRealInit( h, tor, ( TR_FLAG_SAVE | flags ), error );
+    return torrentRealInit( h, tor, NULL, ( TR_FLAG_SAVE | flags ), error );
 }
 
@@ -94 +94 @@
  **********************************************************************/
 static tr_torrent_t * torrentRealInit( tr_handle_t * h, tr_torrent_t * tor,
-                                       int flags, int * error )
+                                       uint8_t * hash, int flags, int * error )
 {
     tr_torrent_t  * tor_tmp;
@@ -111 +111 @@
                      SHA_DIGEST_LENGTH ) )
         {
+            if( NULL != hash )
+            {
+                memcpy( hash, tor->info.hash, SHA_DIGEST_LENGTH );
+            }
             *error = TR_EDUPLICATE;
             tr_metainfoFree( &tor->info );

trunk/libtransmission/transmission.h

@@ -194 +194 @@
  * tr_torrentInit
  ***********************************************************************
- * Opens and parses torrent file at 'path'. If the file exists and is a
- * valid torrent file, returns an handle and adds it to the list of
+ * Opens and parses torrent file at 'path'. If the file exists and is
+ * a valid torrent file, returns an handle and adds it to the list of
  * torrents (but doesn't start it). Returns NULL and sets *error
- * otherwise.  If the TR_FLAG_SAVE flag is passed then a copy of the
- * torrent file will be saved.
+ * otherwise. If hash is not NULL and the torrent is already loaded
+ * then it's 20-byte hash will be copied in. If the TR_FLAG_SAVE flag
+ * is passed then a copy of the torrent file will be saved.
  **********************************************************************/
 #define TR_EINVALID     1
@@ -205 +206 @@
 #define TR_EOTHER       666
 tr_torrent_t * tr_torrentInit( tr_handle_t *, const char * path,
-                               int flags, int * error );
+                               uint8_t * hash, int flags, int * error );
 
 /***********************************************************************
@@ -211 +212 @@
  ***********************************************************************
  * Opens and parses a torrent file as with tr_torrentInit, only taking
- * the hash string of a saved torrent file instead of a filename.  There
+ * the hash string of a saved torrent file instead of a filename. There
  * are currently no valid flags for this function.
  **********************************************************************/

trunk/macosx/Controller.m

@@ -703 +703 @@
     
         torrentPath = [[files objectAtIndex: 0] retain];
-        tempTor = tr_torrentInit(fLib, [torrentPath UTF8String], 0, &error);
+        tempTor = tr_torrentInit(fLib, [torrentPath UTF8String], NULL, 0, &error);
         
         [files removeObjectAtIndex: 0];
@@ -1818 +1818 @@
     while ((file = [enumerator nextObject]))
     {
-        tr_torrent_t * tempTor = tr_torrentInit(fLib, [file UTF8String], 0, &error);
+        tr_torrent_t * tempTor = tr_torrentInit(fLib, [file UTF8String], NULL, 0, &error);
         
         if (tempTor)

trunk/macosx/Torrent.m

@@ -1221 +1221 @@
     
     if (!fHandle && path)
-        fHandle = tr_torrentInit(fLib, [path UTF8String], TR_FLAG_SAVE, & error);
+        fHandle = tr_torrentInit(fLib, [path UTF8String], NULL, TR_FLAG_SAVE, & error);
 
     if (!fHandle)