Changeset 1868 for trunk/libtransmission/torrent.c

Timestamp:

May 11, 2007, 6:56:59 PM (15 years ago)

Author:

livings124

Message:

separate code for determining if there is a download with same name and location

File:

• trunk/libtransmission/torrent.c (modified) (2 diffs)

trunk/libtransmission/torrent.c

@@ -239 +239 @@
 }
 
-void tr_torrentStart( tr_torrent_t * tor )
-{
-    char name[32];
+int tr_torrentDuplicateDownload( tr_torrent_t * tor )
+{
     tr_torrent_t * current, * next;
     
-    if( tor->status & ( TR_STATUS_STOPPING | TR_STATUS_STOPPED ) )
-    {
-        /* Join the thread first */
-        torrentReallyStop( tor );
-    }
-    
-    /* Don't start if a torrent with the same name and destination is already active */
+    /* Check if a torrent with the same name and destination is already active */
     for( current = tor->handle->torrentList; current; current = current->next )
     {
@@ -257 +250 @@
             && !strcmp( tor->info.name, current->info.name ) )
         {
-            tor->error = TR_ERROR_IO_DUP_NAME;
-            snprintf( tor->errorString, sizeof( tor->errorString ),
-                          "%s", tr_errorString( TR_ERROR_IO_DUP_NAME ) );
-            return;
-        }
+            return 1;
+        }
+    }
+    return 0;
+}
+
+void tr_torrentStart( tr_torrent_t * tor )
+{
+    char name[32];
+    
+    if( tor->status & ( TR_STATUS_STOPPING | TR_STATUS_STOPPED ) )
+    {
+        /* Join the thread first */
+        torrentReallyStop( tor );
+    }
+    
+    /* Don't start if a torrent with the same name and destination is already active */
+    if( tr_torrentDuplicateDownload( tor ) )
+    {
+        tor->error = TR_ERROR_IO_DUP_DOWNLOAD;
+        snprintf( tor->errorString, sizeof( tor->errorString ),
+                    "%s", tr_errorString( TR_ERROR_IO_DUP_DOWNLOAD ) );
+        return;
     }