Changeset 5066

Timestamp:

Feb 19, 2008, 5:03:56 AM (14 years ago)

Author:

charles

Message:

(gtk) #544: remove fast-resume cache when appropriate

Location:

trunk

Files:

• gtk/tr_core.c (modified) (1 diff)
• gtk/tr_torrent.c (modified) (3 diffs)
• gtk/tr_torrent.h (modified) (1 diff)
• libtransmission/fastresume.c (modified) (1 diff)
• libtransmission/fastresume.h (modified) (1 diff)
• libtransmission/torrent.c (modified) (4 diffs)
• libtransmission/torrent.h (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)

trunk/gtk/tr_core.c

@@ -609 +609 @@
 
     /* delete the torrent */
-    tr_torrentRemoveSaved( tr_torrent_handle( gtor ) );
+    tr_torrent_set_delete_flag( gtor, TRUE );
     g_object_unref( G_OBJECT( gtor ) );
 }

trunk/gtk/tr_torrent.c

@@ -40 +40 @@
 {
    tr_torrent * handle;
+   gboolean do_delete;
    gboolean seeding_cap_enabled;
    gdouble seeding_cap; /* ratio to stop seeding at */
@@ -77 +78 @@
     {
         if( self->priv->handle )
-            tr_torrentClose( self->priv->handle );
+        {
+            if( self->priv->do_delete )
+                tr_torrentDelete( self->priv->handle );
+            else
+                tr_torrentClose( self->priv->handle );
+        }
+
         self->priv = NULL;
     }
@@ -289 +296 @@
 
 void
+tr_torrent_set_delete_flag( TrTorrent * gtor, gboolean do_delete )
+{
+    if( !isDisposed( gtor ) )
+        gtor->priv->do_delete = do_delete;
+}
+
+void
 tr_torrent_delete_files( TrTorrent * gtor )
 {

trunk/gtk/tr_torrent.h

@@ -93 +93 @@
 tr_torrent_new_ctor( tr_handle * handle, tr_ctor * ctor, char ** err );
 
+void
+tr_torrent_set_delete_flag( TrTorrent *, gboolean );
+
 #endif

trunk/libtransmission/fastresume.c

@@ -710 +710 @@
     return ret;
 }
+
+void
+tr_fastResumeRemove( const tr_torrent * tor )
+{
+    char path[MAX_PATH_LENGTH];
+    const char * cacheDir = tr_getCacheDirectory ();
+    const char * hash = tor->info.hashString;
+
+    if( tor->handle->tag )
+    {
+        char base[1024];
+        snprintf( base, sizeof(base), "%s-%s", hash, tor->handle->tag );
+        tr_buildPath( path, sizeof(path), cacheDir, base, NULL );
+        unlink( path );
+    }
+    else
+    {
+        tr_buildPath( path, sizeof(path), cacheDir, hash, NULL );
+        unlink( path );
+    }
+}

trunk/libtransmission/fastresume.h

@@ -49 +49 @@
                             const tr_ctor       * ctor );
 
+void tr_fastResumeRemove( const tr_torrent * tor );
+
 #endif

trunk/libtransmission/torrent.c

@@ -827 +827 @@
 }
 
-void tr_torrentRemoveSaved( tr_torrent * tor )
+void
+tr_torrentRemoveSaved( tr_torrent * tor )
 {
     tr_metainfoRemoveSaved( tor->info.hashString, tor->handle->tag );
+
+    tr_fastResumeRemove( tor );
 }
 
@@ -1004 +1007 @@
     tr_globalLock( tor->handle );
 
-    saveFastResumeNow( tor );
+    if( !tor->isDeleting )
+        saveFastResumeNow( tor );
     tor->isRunning = 0;
     tr_runInEventThread( tor->handle, stopTorrent, tor );
@@ -1018 +1022 @@
     tor->isRunning = 0;
     stopTorrent( tor );
+    if( tor->isDeleting )
+        tr_torrentRemoveSaved( tor );
     freeTorrent( tor );
 }
@@ -1035 +1041 @@
     }
 }
+
+void
+tr_torrentDelete( tr_torrent * tor )
+{
+    tor->isDeleting = 1;
+    tr_torrentClose( tor );
+}
+
 
 /**

trunk/libtransmission/torrent.h

@@ -154 +154 @@
     unsigned int               statCur : 1;
     unsigned int               isRunning : 1;
+    unsigned int               isDeleting : 1;
 
     uint16_t                   maxConnectedPeers;

trunk/libtransmission/transmission.h

@@ -588 +588 @@
  */
 void tr_torrentClose( tr_torrent * );
+
+/**
+ * Like tr_torrentClose() but also deletes
+ * the fastresume file and our copy of the
+ * torrent file
+ */
+void tr_torrentDelete( tr_torrent * );
 
 /***********************************************************************