Changeset 5014

Timestamp:

Feb 13, 2008, 2:24:12 AM (14 years ago)

Author:

charles

Message:

add tr_ctor{Set,Get}DeleteSource?()

Location:

trunk/libtransmission

Files:

• fastresume.c (modified) (1 diff)
• torrent-ctor.c (modified) (9 diffs)
• transmission.h (modified) (3 diffs)

trunk/libtransmission/fastresume.c

@@ -662 +662 @@
     if( fields & TR_FR_RUN ) {
         uint8_t isPaused;
-        if( !tr_ctorGetIsPaused( ctor, mode, &isPaused ) ) {
+        if( !tr_ctorGetPaused( ctor, mode, &isPaused ) ) {
             tor->isRunning = !isPaused;
             ret |= TR_FR_RUN;

trunk/libtransmission/torrent-ctor.c

@@ -35 +35 @@
     const tr_handle * handle;
     unsigned int saveInOurTorrentsDir : 1;
+    unsigned int doDelete : 1;
 
     unsigned int isSet_metainfo : 1;
+    unsigned int isSet_delete : 1;
     benc_val_t metainfo;
+    char * sourceFile;
 
     struct optional_args optionalArgs[2];
@@ -47 +50 @@
 
 static void
+setSourceFile( tr_ctor * ctor, const char * sourceFile )
+{
+    tr_free( ctor->sourceFile );
+    ctor->sourceFile = tr_strdup( sourceFile );
+}
+
+static void
 clearMetainfo( tr_ctor * ctor )
 {
@@ -53 +63 @@
         tr_bencFree( &ctor->metainfo );
     }
+
+    setSourceFile( ctor, NULL );
 }
 
@@ -65 +77 @@
     ctor->isSet_metainfo = !err;
     return err;
+}
+
+const char*
+tr_ctorGetSourceFile( const tr_ctor * ctor )
+{
+    return ctor->sourceFile;
 }
 
@@ -82 +100 @@
         err = 1;
     }
+
+    setSourceFile( ctor, filename );
 
     /* if no `name' field was set, then set it from the filename */
@@ -129 +149 @@
 
 void
+tr_ctorSetDeleteSource( tr_ctor  * ctor,
+                        uint8_t    deleteSource )
+{
+    ctor->doDelete = deleteSource ? 1 : 0;
+    ctor->isSet_delete = 1;
+}
+
+int
+tr_ctorGetDeleteSource( const tr_ctor  * ctor,
+                        uint8_t        * setme )
+{
+    int err = 0;
+
+    if( !ctor->isSet_delete )
+        err = 1;
+    else if( setme )
+        *setme = ctor->doDelete ? 1 : 0;
+
+    return err;
+}
+
+/***
+****
+***/
+
+void
 tr_ctorSetSave( tr_ctor  * ctor,
                 int        saveInOurTorrentsDir )
@@ -179 +225 @@
     const struct optional_args * args = &ctor->optionalArgs[mode];
 
-    if( args->isSet_connected )
+    if( !args->isSet_connected )
+        err = 1;
+    else if( setmeCount )
         *setmeCount = args->maxConnectedPeers;
-    else
-        err = 1;
-
-    return err;
-}
-
-int
-tr_ctorGetIsPaused( const tr_ctor  * ctor,
-                    tr_ctorMode      mode,
-                    uint8_t        * setmeIsPaused )
+
+    return err;
+}
+
+int
+tr_ctorGetPaused( const tr_ctor  * ctor,
+                  tr_ctorMode      mode,
+                  uint8_t        * setmeIsPaused )
 {
     int err = 0;
     const struct optional_args * args = &ctor->optionalArgs[mode];
 
-    if( args->isSet_paused )
+    if( !args->isSet_paused )
+        err = 1;
+    else if( setmeIsPaused )
         *setmeIsPaused = args->isPaused ? 1 : 0;
-    else
-        err = 1;
 
     return err;
@@ -211 +257 @@
     const struct optional_args * args = &ctor->optionalArgs[mode];
 
-    if( args->isSet_destination )
+    if( !args->isSet_destination )
+        err = 1;
+    else if( setmeDestination )
         *setmeDestination = args->destination;
-    else
-        err = 1;
 
     return err;
@@ -225 +271 @@
     int err = 0;
 
-    if( ctor->isSet_metainfo )
+    if( !ctor->isSet_metainfo )
+        err = 1;
+    else if( setme )
         *setme = &ctor->metainfo;
-    else
-        err = 1;
 
     return err;

trunk/libtransmission/transmission.h

@@ -355 +355 @@
                                          int     saveMetadataInOurTorrentsDir );
 
+void     tr_ctorSetDeleteSource       ( tr_ctor        * ctor,
+                                         uint8_t          doDelete );
+
 int      tr_ctorSetMetainfo            ( tr_ctor        * ctor,
                                          const uint8_t  * metainfo,
@@ -381 +384 @@
                                          uint16_t       * setmeCount );
 
-int      tr_ctorGetIsPaused            ( const tr_ctor  * ctor,
+int      tr_ctorGetPaused              ( const tr_ctor  * ctor,
                                          tr_ctorMode      mode,
                                          uint8_t        * setmeIsPaused );
@@ -393 +396 @@
 
 int      tr_ctorGetSave                ( const tr_ctor  * ctor );
+ 
+int      tr_ctorGetDeleteSource        ( const tr_ctor  * ctor,
+                                         uint8_t        * setmeDoDelete );
+
+/* returns NULL if tr_ctorSetMetainfoFromFile() wasn't used */
+const char* tr_ctorGetSourceFile       ( const tr_ctor  * ctor );
+
 
 typedef struct tr_info tr_info;