Changeset 2316

Timestamp:

Jul 10, 2007, 3:12:46 AM (16 years ago)

Author:

charles

Message:

splitting dnd and priorities apart, and moving the file storage for those fields into fastresume

Location:

trunk

Files:

• gtk/actions.c (modified) (1 diff)
• gtk/torrent-inspector.c (modified) (16 diffs)
• gtk/ui.h (modified) (1 diff)
• libtransmission/completion.c (modified) (3 diffs)
• libtransmission/fastresume.c (modified) (4 diffs)
• libtransmission/peerutils.h (modified) (1 diff)
• libtransmission/torrent.c (modified) (6 diffs)
• libtransmission/transmission.h (modified) (4 diffs)

trunk/gtk/actions.c

@@ -40 +40 @@
   { "priority-high", NULL, N_("_High"), NULL, NULL, TR_PRI_HIGH },
   { "priority-normal", NULL, N_("_Normal"), NULL, NULL, TR_PRI_NORMAL },
-  { "priority-low", NULL, N_("_Low"), NULL, NULL, TR_PRI_LOW },
-  { "priority-dnd", NULL, N_("_Don't Get"), NULL, NULL, TR_PRI_DND  }
+  { "priority-low", NULL, N_("_Low"), NULL, NULL, TR_PRI_LOW }
 };
 

trunk/gtk/torrent-inspector.c

@@ -943 +943 @@
   FC_SIZE,
   FC_PRIORITY,
+  FC_ENABLED,
   N_FILE_COLS
 };
@@ -962 +963 @@
         case TR_PRI_NORMAL: return _("Normal");
         case TR_PRI_LOW:    return _("Low");
-        case TR_PRI_DND:    return _("Don't Get");
         default:            return "BUG!";
     }
@@ -972 +972 @@
     if( !strcmp( str, _( "High" ) ) ) return TR_PRI_HIGH;
     if( !strcmp( str, _( "Low" ) ) ) return TR_PRI_LOW;
-    if( !strcmp( str, _( "Don't Get" ) ) ) return TR_PRI_DND;;
     return TR_PRI_NORMAL;
 }
@@ -989 +988 @@
     const char   * stock;
     int            priority = 0;
+    gboolean       enabled = TRUE;
 
     model  = GTK_TREE_MODEL( store );
@@ -1026 +1026 @@
     }
 
-    if (index != -1)
+    if (index != -1) {
         priority = tr_torrentGetFilePriority( tor, index );
+        enabled  = tr_torrentGetFileDL( tor, index );
+    }
 
     escaped = g_markup_escape_text (file, -1); 
-    gtk_tree_store_set( store, &iter, FC_INDEX, index, FC_LABEL, escaped,
-                        FC_KEY, mykey, FC_STOCK, stock,
-                        FC_PRIORITY, priorityToString(priority),
-                        FC_SIZE, size, -1 );
+    gtk_tree_store_set( store, &iter, FC_INDEX, index,
+                                      FC_LABEL, escaped,
+                                      FC_KEY, mykey,
+                                      FC_STOCK, stock,
+                                      FC_PRIORITY, priorityToString(priority),
+                                      FC_ENABLED, enabled,
+                                      FC_SIZE, size, -1 );
   done:
     g_free( escaped );
@@ -1141 +1146 @@
   gtk_list_store_append (store, &iter);
   gtk_list_store_set (store, &iter, 0, _("Low"), 1, TR_PRI_LOW, -1);
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, _("Don't Get"), 1, TR_PRI_DND, -1);
   return GTK_TREE_MODEL (store);
 }
@@ -1156 +1159 @@
     action_sensitize ( "priority-normal", has_selection );
     action_sensitize ( "priority-low", has_selection );
-    action_sensitize ( "priority-dnd", has_selection );
 
     if( has_selection )
@@ -1167 +1169 @@
             case TR_PRI_HIGH:   key = "priority-high";   break;
             case TR_PRI_LOW:    key = "priority-low";    break;
-            case TR_PRI_DND:    key = "priority-dnd";    break;
             default:            key = "priority-normal"; break;
         }
@@ -1173 +1174 @@
         g_free( pch );
     }
+}
+
+static void
+set_files_enabled( GtkTreeStore     * store,
+                   GtkTreeIter      * iter,
+                   tr_torrent_t     * tor,
+                   gboolean           enabled )
+{
+    int index;
+    GtkTreeIter child;
+
+    gtk_tree_model_get( GTK_TREE_MODEL(store), iter, FC_INDEX, &index, -1  );
+    if (index >= 0)
+      tr_torrentSetFileDL( tor, index, !enabled );
+    gtk_tree_store_set( store, iter, FC_ENABLED, enabled, -1 );
+
+    if( gtk_tree_model_iter_children( GTK_TREE_MODEL(store), &child, iter ) ) do
+      set_files_enabled( store, &child, tor, enabled );
+    while( gtk_tree_model_iter_next( GTK_TREE_MODEL(store), &child ) );
 }
 
@@ -1252 +1272 @@
 }
 
+static void
+enabled_toggled (GtkCellRendererToggle  * cell UNUSED,
+                 const gchar            * path_str,
+                 gpointer                 data_gpointer)
+{
+  FileData * data = (FileData*) data_gpointer;
+  GtkTreePath * path = gtk_tree_path_new_from_string( path_str );
+  GtkTreeModel * model = data->model;
+  GtkTreeIter iter;
+  gboolean enabled;
+
+  gtk_tree_model_get_iter( model, &iter, path );
+  gtk_tree_model_get( model, &iter, FC_ENABLED, &enabled, -1 );
+  enabled = !enabled;
+  set_files_enabled( GTK_TREE_STORE(model),
+                     &iter,
+                     tr_torrent_handle( data->gtor ),
+                     enabled );
+
+  gtk_tree_path_free( path );
+}
+
 GtkWidget *
 file_page_new ( TrTorrent * gtor )
@@ -1263 +1305 @@
     GtkWidget           * view, * scroll;
     GtkCellRenderer     * rend;
+    GtkCellRenderer     * priority_rend;
     GtkTreeViewColumn   * col;
     GtkTreeSelection    * sel;
@@ -1268 +1311 @@
 
     store = gtk_tree_store_new ( N_FILE_COLS,
-                                 G_TYPE_STRING,  /* stock */
-                                 G_TYPE_STRING,  /* label */
-                                 G_TYPE_INT,     /* prog [0..100] */
-                                 G_TYPE_STRING,  /* key */
-                                 G_TYPE_INT,     /* index */
-                                 G_TYPE_UINT64,  /* size */
-                                 G_TYPE_STRING); /* priority */
+                                 G_TYPE_STRING,    /* stock */
+                                 G_TYPE_STRING,    /* label */
+                                 G_TYPE_INT,       /* prog [0..100] */
+                                 G_TYPE_STRING,    /* key */
+                                 G_TYPE_INT,       /* index */
+                                 G_TYPE_UINT64,    /* size */
+                                 G_TYPE_STRING,    /* priority */
+                                 G_TYPE_BOOLEAN ); /* dl enabled */
 
     /* set up the model */
@@ -1323 +1367 @@
     fileSelectionChangedCB( sel, NULL );
 
-
     /* add priority column */
     model = priority_model_new ();
@@ -1329 +1372 @@
     gtk_tree_view_column_set_sort_column_id( col, FC_PRIORITY );
     gtk_tree_view_column_set_title (col, _("Priority"));
-    rend = gtk_cell_renderer_combo_new ();
+    rend = priority_rend = gtk_cell_renderer_combo_new ();
     gtk_tree_view_column_pack_start (col, rend, TRUE);
     g_object_set (G_OBJECT(rend), "model", model,
@@ -1340 +1383 @@
     gtk_tree_view_append_column( GTK_TREE_VIEW( view ), col );
 
+    /* download enabled column */
+    col = gtk_tree_view_column_new ();
+    gtk_tree_view_column_set_sort_column_id( col, FC_ENABLED );
+    rend = gtk_cell_renderer_toggle_new  ();
+    col = gtk_tree_view_column_new_with_attributes (_("Enabled"),
+                                                    rend,
+                                                    "active", FC_ENABLED,
+                                                    NULL);
+    gtk_tree_view_append_column( GTK_TREE_VIEW( view ), col );
+
     /* create the scrolled window and stick the view in it */
     scroll = gtk_scrolled_window_new( NULL, NULL );
@@ -1357 +1410 @@
     data->selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
     g_object_set_data_full (G_OBJECT(ret), "file-data", data, g_free);
-    g_signal_connect (G_OBJECT(rend), "edited", G_CALLBACK(priority_changed_cb), data);
+    g_signal_connect (G_OBJECT(priority_rend), "edited", G_CALLBACK(priority_changed_cb), data);
+    g_signal_connect( rend, "toggled", G_CALLBACK(enabled_toggled), data );
     return ret;
 }

trunk/gtk/ui.h

@@ -59 +59 @@
 "      <menuitem action='priority-normal'/>\n"
 "      <menuitem action='priority-low'/>\n"
-"      <menuitem action='priority-dnd'/>\n"
 "    </menu>\n"
 "  </popup>\n"

trunk/libtransmission/completion.c

@@ -296 +296 @@
         if( tr_cpPieceIsComplete( cp, i ) )
             continue;
-        if( info->pieces[i].priority != TR_PRI_DND)
+        if( !info->pieces[i].dnd )
             return TR_CP_INCOMPLETE;
         ret = TR_CP_DONE;
@@ -344 +344 @@
 
     for( i=0; i<info->pieceCount; ++i )
-        if( !tr_cpPieceIsComplete( cp, i ) && info->pieces[i].priority != TR_PRI_DND )
+        if( !tr_cpPieceIsComplete( cp, i ) && !info->pieces[i].dnd )
             b += ( tr_cpCountBlocks( cp, i ) - cp->completeBlocks[ i ] );
 
@@ -350 +350 @@
 
     i = tor->blockCount - 1;
-    if( !tr_cpBlockIsComplete( cp, tor->blockCount-1 )
-                  && info->pieces[info->pieceCount-1].priority != TR_PRI_DND )
+    if( !tr_cpBlockIsComplete( cp, tor->blockCount-1 ) && !info->pieces[info->pieceCount-1].dnd )
         b -= (tor->blockSize - (tor->info.totalSize % tor->blockSize));
 

trunk/libtransmission/fastresume.c

@@ -61 +61 @@
  */
 #define FR_ID_PROGRESS          0x05
+/* dnd and priority 
+ * char * number of files: l,n,h for low, normal, high priority
+ * uint8_t * number of files: nonzero if dnd flag is set
+ */
+#define FR_ID_PRIORITY          0x06
 
 /* macros for the length of various pieces of the progress data */
@@ -168 +173 @@
     }
 
+
+    /* Write the priorities and DND flags */
+    if( TRUE )
+    {
+        int i;
+        const int n = tor->info.fileCount;
+        char * buf = tr_new0( char, n*2 );
+        char * walk = buf;
+
+        /* priorities */
+        for( i=0; i<n; ++i ) {
+            char ch;
+            const int priority = tor->info.files[i].priority;
+            switch( priority ) {
+               case TR_PRI_LOW:   ch = 'l'; break; /* low */
+               case TR_PRI_HIGH:  ch = 'h'; break; /* high */
+               default:           ch = 'n'; break; /* normal */
+            };
+            *walk++ = ch;
+        }
+
+        /* dnd flags */
+        for( i=0; i<n; ++i )
+            *walk++ = tor->info.files[i].dnd ? '\1' : '\0';
+
+        /* write it */
+        assert( walk - buf == 2*n );
+        fastResumeWriteData( FR_ID_PRIORITY, buf, 1, walk-buf, file );
+
+        /* cleanup */
+        tr_free( buf );
+    }
+
+
     /* Write download and upload totals */
     total = tor->downloadedCur + tor->downloadedPrev;
@@ -189 +228 @@
 
     tr_dbg( "Resume file '%s' written", path );
+}
+
+static int
+fastResumeLoadPriorities( tr_torrent_t * tor,
+                          FILE         * file )
+{
+    const size_t n = tor->info.fileCount;
+    const size_t len = 2 * n;
+    char * buf = tr_new0( char, len );
+    char * walk = buf;
+    size_t i;
+
+    if( len != fread( buf, 1, len, file ) ) {
+        tr_inf( "Couldn't read from resume file" );
+        free( buf );
+        return TR_ERROR_IO_OTHER;
+    }
+
+    /* set file priorities */
+    for( i=0; i<n; ++i ) {
+       tr_priority_t priority;
+       const char ch = *walk++;
+       switch( ch ) {
+           case 'l': priority = TR_PRI_LOW; break;
+           case 'h': priority = TR_PRI_HIGH; break;
+           default:  priority = TR_PRI_NORMAL; break;
+       }
+       tor->info.files[i].priority = priority;
+    }
+
+    /* set the dnd flags */
+    for( i=0; i<n; ++i )
+        tor->info.files[i].dnd = *walk++ != 0;
+
+    free( buf );
+    return TR_OK;
 }
 
@@ -326 +401 @@
                 if( (uint32_t)FR_PROGRESS_LEN( tor ) == len )
                 {
-                    if( fastResumeLoadProgress( tor, uncheckedPieces, file ) )
+                    ret = fastResumeLoadProgress( tor, uncheckedPieces, file );
+
+                    if( ret && ( feof(file) || ferror(file) ) )
                     {
-                        if( feof( file ) || ferror( file ) )
-                        {
-                            fclose( file );
-                            return 1;
-                        }
+                        fclose( file );
+                        return 1;
                     }
-                    else
+
+                    continue;
+                }
+                break;
+
+            case FR_ID_PRIORITY:
+
+                /* read priority data */
+                if( len == (uint32_t)(2 * tor->info.fileCount) )
+                {
+                    ret = fastResumeLoadPriorities( tor, file );
+
+                    if( ret && ( feof(file) || ferror(file) ) )
                     {
-                        ret = 0;
+                        fclose( file );
+                        return 1;
                     }
+
                     continue;
                 }

trunk/libtransmission/peerutils.h

@@ -170 +170 @@
         return 0;
 
-    if( tor->info.pieces[piece].priority == TR_PRI_DND ) /* we don't want it */
+    if( tor->info.pieces[piece].dnd ) /* we don't want it */
         return 0;
 

trunk/libtransmission/torrent.c

@@ -23 +23 @@
  *****************************************************************************/
 
+#include "transmission.h"
+#include "fastresume.h"
 #include "trcompat.h" /* for strlcpy */
-#include "transmission.h"
 #include "metainfo.h"
 #include "net.h" /* tr_netNtop */
@@ -130 +131 @@
 {
     int i;
-    tr_priority_t priority = TR_PRI_DND;
+    tr_priority_t priority = TR_PRI_NORMAL;
 
     for( i=0; i<tor->info.fileCount; ++i )
@@ -1110 +1111 @@
 ***/
 
+static void
+tr_torrentSetFilePriorityImpl( tr_torrent_t   * tor,
+                               int              fileIndex,
+                               tr_priority_t    priority,
+                               int              doSave )
+{
+    int i;
+    tr_file_t * file;
+
+    tr_torrentWriterLock( tor );
+
+    assert( tor != NULL );
+    assert( 0<=fileIndex && fileIndex<tor->info.fileCount );
+    assert( priority==TR_PRI_LOW || priority==TR_PRI_NORMAL || priority==TR_PRI_HIGH );
+
+    file = &tor->info.files[fileIndex];
+    file->priority = priority;
+    for( i=file->firstPiece; i<=file->lastPiece; ++i )
+      tor->info.pieces[i].priority = calculatePiecePriority( tor, i );
+
+    tr_dbg ( "Setting file #%d (pieces %d-%d) priority to %d (%s)",
+             fileIndex, file->firstPiece, file->lastPiece,
+             priority, tor->info.files[fileIndex].name );
+
+    if( doSave )
+        fastResumeSave( tor );
+
+    tr_torrentWriterUnlock( tor );
+}
+
 void
 tr_torrentSetFilePriority( tr_torrent_t   * tor,
@@ -1115 +1146 @@
                            tr_priority_t    priority )
 {
+    tr_torrentSetFilePriorityImpl( tor, fileIndex, priority, TRUE );
+}
+
+void
+tr_torrentSetFilePriorities( tr_torrent_t         * tor,
+                             const tr_priority_t  * filePriorities )
+{
     int i;
-    tr_file_t * file;
-
-    tr_torrentWriterLock( tor );
-
-    assert( tor != NULL );
-    assert( 0<=fileIndex && fileIndex<tor->info.fileCount );
-    assert( priority==TR_PRI_LOW || priority==TR_PRI_NORMAL
-         || priority==TR_PRI_HIGH || priority==TR_PRI_DND );
-
-    file = &tor->info.files[fileIndex];
-    file->priority = priority;
-    for( i=file->firstPiece; i<=file->lastPiece; ++i )
-      tor->info.pieces[i].priority = calculatePiecePriority( tor, i );
-
-    tr_dbg ( "Setting file #%d (pieces %d-%d) priority to %d (%s)",
-             fileIndex, file->firstPiece, file->lastPiece,
-             priority, tor->info.files[fileIndex].name );
-
-    tr_torrentWriterUnlock( tor );
+    for( i=0; i<tor->info.pieceCount; ++i )
+        tr_torrentSetFilePriorityImpl( tor, i, filePriorities[i], FALSE );
+    fastResumeSave( tor );
 }
 
@@ -1152 +1174 @@
 
 
-void
-tr_torrentSetFilePriorities( tr_torrent_t         * tor,
-                             const tr_priority_t  * filePriorities )
-{
-    int i;
-    for( i=0; i<tor->info.pieceCount; ++i )
-      tr_torrentSetFilePriority( tor, i, filePriorities[i] );
-}
-
 tr_priority_t*
 tr_torrentGetFilePriorities( const tr_torrent_t * tor )
@@ -1175 +1188 @@
     return p;
 }
+
+int
+tr_torrentGetFileDL( const tr_torrent_t * tor,
+                     int                  file )
+{
+    int do_download;
+    tr_torrentReaderLock( tor );
+
+    assert( 0<=file && file<tor->info.fileCount );
+    do_download = !tor->info.files[file].dnd;
+
+    tr_torrentReaderUnlock( tor );
+    return do_download != 0;
+}
+
+void
+tr_torrentSetFileDL( tr_torrent_t  * tor,
+                     int             file,
+                     int             do_download )
+{
+    tr_torrentWriterLock( tor );
+
+    assert( 0<=file && file<tor->info.fileCount );
+    tor->info.files[file].dnd = !do_download;
+    fastResumeSave( tor );
+
+    tr_torrentWriterUnlock( tor );
+}

trunk/libtransmission/transmission.h

@@ -207 +207 @@
 enum
 {
-    TR_PRI_DND    = -2, /* Do Not Download */
     TR_PRI_LOW    = -1,
     TR_PRI_NORMAL =  0, /* since NORMAL is 0, memset initializes nicely */
@@ -216 +215 @@
 
 /* priorities should be an array of tor->info.fileCount bytes,
- * each holding a value of TR_PRI_NORMAL, _HIGH, _LOW, or _DND. */
+ * each holding a value of TR_PRI_NORMAL, _HIGH, or _LOW */
 void tr_torrentSetFilePriorities ( tr_torrent_t *, const tr_priority_t * priorities );
 
 /* single-file form of tr_torrentPrioritizeFiles.
- * priority must be one of TR_PRI_NORMAL, _HIGH, _LOW, or _DND */
+ * priority must be one of TR_PRI_NORMAL, _HIGH, or _LOW */
 void tr_torrentSetFilePriority( tr_torrent_t *, int file, tr_priority_t priority );
 
 /* returns a malloc()ed array of tor->info.fileCount items,
- * each holding a value of TR_PRI_NORMAL, _HIGH, _LOW, or _DND.
+ * each holding a value of TR_PRI_NORMAL, _HIGH, or _LOW.
    free the array when done. */
 tr_priority_t* tr_torrentGetFilePriorities( const tr_torrent_t * );
 
 /* single-file form of tr_torrentGetFilePriorities.
- * returns one of TR_PRI_NORMAL, _HIGH, _LOW, or _DND */
+ * returns one of TR_PRI_NORMAL, _HIGH, or _LOW. */
 tr_priority_t tr_torrentGetFilePriority( const tr_torrent_t *, int file );
 
-/* returns the priority for the specified piece,
- * as ranked by the number of files of various priorities in that piece.
- * a zero priority means DND */
-tr_priority_t tr_torrentGetPiecePriority( const tr_torrent_t *, int pieceIndex );
+/* returns true if the file's `download' flag is set */
+int tr_torrentGetFileDL( const tr_torrent_t *, int file );
+
+/* set the specified file's `download' flag */
+void tr_torrentSetFileDL( tr_torrent_t *, int file, int do_download );
+
 
 /***********************************************************************
@@ -468 +469 @@
     uint64_t length;                /* Length of the file, in bytes */
     char     name[MAX_PATH_LENGTH]; /* Path to the file */
-    int8_t   priority;              /* TR_PRI_HIGH, _NORMAL, _LOW, or _DND */
+    int8_t   priority;              /* TR_PRI_HIGH, _NORMAL, or _LOW */
+    int8_t   dnd;                   /* nonzero if the file shouldn't be downloaded */
     int      firstPiece;            /* We need pieces [firstPiece... */
     int      lastPiece;             /* ...lastPiece] to dl this file */
@@ -478 +480 @@
 {
     uint8_t  hash[SHA_DIGEST_LENGTH];  /* pieces hash */
-    int8_t   priority;                 /* TR_PRI_HIGH, _NORMAL, _LOW, or _DND */
+    int8_t   priority;                 /* TR_PRI_HIGH, _NORMAL, or _LOW */
+    int8_t   dnd;                      /*  nonzero if the piece shouldn't be downloaded */
 }
 tr_piece_t;