Changeset 2109

Timestamp:

Jun 17, 2007, 2:59:57 AM (15 years ago)

Author:

charles

Message:

Get progress updates working in makemeta.c. More polishing on the gtk+ client's "create torrent" dialog

Location:

branches/file_selection

Files:

• gtk/hig.c (modified) (1 diff)
• gtk/hig.h (modified) (1 diff)
• gtk/make-meta-ui.c (modified) (6 diffs)
• libtransmission/inout.c (modified) (1 diff)
• libtransmission/inout.h (modified) (1 diff)
• libtransmission/makemeta.c (modified) (10 diffs)

branches/file_selection/gtk/hig.c

@@ -167 +167 @@
   gtk_table_attach_defaults (GTK_TABLE(table), w, 0, 4, *row, *row+1);
 }
+
+void
+hig_message_dialog_set_text (GtkMessageDialog * dialog,
+                             const char       * primary,
+                             const char       * secondary)
+{
+#if GTK_CHECK_VERSION(2,6,0)
+  gtk_message_dialog_set_markup (dialog, primary);
+  gtk_message_dialog_format_secondary_text (dialog, "%s", secondary);
+#else
+  char * pch = g_strdup_printf ("<b>%s</b>\n \n%s", primary, secondary);
+  gtk_message_dialog_set_markup (dialog, pch);
+  g_free (pch);
+#endif
+}
+

branches/file_selection/gtk/hig.h

@@ -93 +93 @@
                      int         * row);
 
+void
+hig_message_dialog_set_text (GtkMessageDialog * dialog,
+                             const char       * primary,
+                             const char       * secondary);
+
+
 /**
 ***

branches/file_selection/gtk/make-meta-ui.c

@@ -40 +40 @@
     GtkWidget * announce_entry;
     GtkWidget * comment_entry;
+    GtkWidget * progressbar;
     GtkWidget * private_check;
+    GtkWidget * dialog;
+    GtkWidget * progress_dialog;
     tr_metainfo_builder_t * builder;
     tr_handle_t * handle;
@@ -56 +59 @@
 refresh_cb ( gpointer user_data )
 {
+    double fraction;
     MakeMetaUI * ui = (MakeMetaUI *) user_data;
 
-    g_message ("refresh");
+    fraction = (double)ui->builder->pieceIndex / ui->builder->pieceCount;
+    gtk_progress_bar_set_fraction( GTK_PROGRESS_BAR( ui->progressbar ), fraction );
+
+    if( ui->builder->isDone )
+    {
+        GtkWidget * w;
+
+        if( ui->builder->failed )
+        {
+            w = gtk_message_dialog_new (GTK_WINDOW(ui->progress_dialog),
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        GTK_MESSAGE_ERROR,
+                                        GTK_BUTTONS_CLOSE,
+                                        _("Torrent creation failed.")); /* FIXME: tell why */
+            gtk_dialog_run( GTK_DIALOG( w ) );
+            gtk_widget_destroy( ui->progress_dialog );
+        }
+        else
+        {
+            w = gtk_message_dialog_new_with_markup (
+                GTK_WINDOW(ui->progress_dialog),
+                GTK_DIALOG_DESTROY_WITH_PARENT,
+                GTK_MESSAGE_INFO,
+                GTK_BUTTONS_CLOSE,
+                NULL);
+            hig_message_dialog_set_text (GTK_MESSAGE_DIALOG(w),
+                _("<b>Torrent Created!</b>"),
+                ui->builder->outputFile);
+            gtk_dialog_run( GTK_DIALOG( w ) );
+            gtk_widget_destroy( ui->dialog );
+        }
+    }
 
     return !ui->builder->isDone;
@@ -67 +102 @@
 {
     MakeMetaUI * ui = (MakeMetaUI*) user_data;
-    GtkWidget *w, *l, *p;
+    GtkWidget *w, *p, *fr;
     char *tmp, *name;
 
@@ -78 +113 @@
     w = gtk_dialog_new_with_buttons( _("Making Torrent..."), 
                                      GTK_WINDOW(d),
-                                     GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                      NULL );
     g_signal_connect( w, "response", G_CALLBACK(cancel_cb), ui );
+    ui->progress_dialog = w;
+
 
     tmp = g_path_get_basename (ui->builder->top);
-    name = g_strdup_printf ( "%s.torrent", tmp );
-    l = gtk_label_new( name );
-    gtk_box_pack_start_defaults ( GTK_BOX(GTK_DIALOG(w)->vbox), l );
-    p = gtk_progress_bar_new ();
-    gtk_box_pack_start_defaults ( GTK_BOX(GTK_DIALOG(w)->vbox), p );
+    name = g_strdup_printf( "%s.torrent", tmp );
+    p = ui->progressbar = gtk_progress_bar_new ();
+    gtk_progress_bar_set_text( GTK_PROGRESS_BAR(p), name );
+    fr = gtk_frame_new (NULL);
+    gtk_frame_set_shadow_type (GTK_FRAME(fr), GTK_SHADOW_NONE);
+    gtk_container_set_border_width( GTK_CONTAINER(fr), 20 );
+    gtk_container_add (GTK_CONTAINER(fr), p);
+    gtk_box_pack_start_defaults( GTK_BOX(GTK_DIALOG(w)->vbox), fr );
     gtk_widget_show_all ( w );
     g_free( name );
@@ -99 +139 @@
                      gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( ui->private_check ) ) );
 
-    g_timeout_add ( 1000, refresh_cb, ui );
+    g_timeout_add ( 200, refresh_cb, ui );
 }
 
@@ -168 +208 @@
     g_signal_connect( d, "response", G_CALLBACK(response_cb), ui );
     g_object_set_data_full( G_OBJECT(d), "ui", ui, g_free );
+    ui->dialog = d;
 
     t = hig_workarea_create ();

branches/file_selection/libtransmission/inout.c

@@ -191 +191 @@
 ****/
 
-int
+static int
 tr_ioRecalculateHash ( tr_torrent_t  * tor,
                        int             pieceIndex,

branches/file_selection/libtransmission/inout.h

@@ -61 +61 @@
 void      tr_ioClose       ( tr_io_t * );
 
-/**
- * Recalculate the hash value straight from disk.
- * If your piece is incomplete, you'll get a meaningless hash back. 
- */
-int tr_ioRecalculateHash( tr_torrent_t  * tor,
-                          int             pieceIndex,
-                          uint8_t       * setme_buf );
-
-
 #endif

branches/file_selection/libtransmission/makemeta.c

@@ -181 +181 @@
     
     ret->pieceSize = bestPieceSize( ret->totalSize );
-    ret->pieceCount = MAX( 1, ret->totalSize / ret->pieceSize );
+    ret->pieceCount = ret->totalSize / ret->pieceSize;
     if( ret->totalSize % ret->pieceSize )
         ++ret->pieceCount;
@@ -207 +207 @@
 
 static uint8_t*
-getHashInfo ( const tr_metainfo_builder_t  * builder,
-              int                        * setmeCount )
-{
-    size_t i;
-    tr_torrent_t t;
-    uint8_t *ret, *walk;
-    const size_t topLen = strlen(builder->top) + 1; /* +1 for '/' */
-
-    /* build a mock tr_torrent_t that we can feed to tr_ioRecalculateHash() */  
-    memset( &t, 0, sizeof( tr_torrent_t ) );
-    tr_lockInit ( &t.lock );
-    t.destination = (char*) builder->top;
-    t.info.fileCount = builder->fileCount;
-    t.info.files = calloc( t.info.fileCount, sizeof( tr_file_t ) );
-    t.info.totalSize = builder->totalSize;
-    t.info.pieceSize = builder->pieceSize;
-    t.info.pieceCount = builder->pieceCount;
-    for( i=0; i<builder->fileCount; ++i ) {
-        tr_file_t * file = &t.info.files[i];
-        file->length = builder->fileLengths[i];
-        strlcpy( file->name, builder->files[i]+topLen, sizeof(file->name) );
-    }
-    t.info.pieces = calloc( t.info.pieceCount, sizeof( tr_piece_t ) );
-    tr_torrentInitFilePieces( &t );
-    ret = (uint8_t*) malloc ( SHA_DIGEST_LENGTH * t.info.pieceCount );
-    walk = ret;
-
-    /* FIXME: check the abort flag */
-    for( i=0; i<(size_t)t.info.pieceCount; ++i ) {
-        tr_ioRecalculateHash( &t, i, walk );
+getHashInfo ( tr_metainfo_builder_t * b )
+{
+    size_t off = 0;
+    size_t fileIndex = 0;
+    uint8_t *ret = (uint8_t*) malloc ( SHA_DIGEST_LENGTH * b->pieceCount );
+    uint8_t *walk = ret;
+    uint8_t *buf = malloc( b->pieceSize );
+    size_t totalRemain;
+
+    b->pieceIndex = 0;
+    totalRemain = b->totalSize;
+    while ( totalRemain )
+    {
+        uint8_t *bufptr = buf;
+        const size_t thisPieceSize = MIN( b->pieceSize, totalRemain );
+        size_t pieceRemain = thisPieceSize;
+
+        assert( b->pieceIndex < b->pieceCount );
+
+        while( pieceRemain )
+        {
+            FILE * fp = fopen( b->files[fileIndex], "rb" );
+            const size_t n_this_pass = MIN( (b->fileLengths[fileIndex] - off), pieceRemain );
+            if( off )
+                fseek( fp, off, SEEK_SET );
+            fread( bufptr, 1, n_this_pass, fp );
+            bufptr += n_this_pass;
+            off += n_this_pass;
+            pieceRemain -= n_this_pass;
+            fclose( fp );
+
+            if( off == b->fileLengths[fileIndex] ) {
+                off = 0;
+                ++fileIndex;
+            }
+        }
+
+        assert( bufptr-buf == (int)thisPieceSize );
+        assert( pieceRemain == 0 );
+        SHA1( buf, thisPieceSize, walk );
         walk += SHA_DIGEST_LENGTH;
-    }
-    assert( walk-ret == SHA_DIGEST_LENGTH*t.info.pieceCount );
-
-    *setmeCount = t.info.pieceCount;
-    tr_lockClose ( &t.lock );
-    free( t.info.pieces );
-    free( t.info.files );
+
+        if( b->abortFlag ) {
+            b->failed = 1;
+            break;
+        }
+
+        totalRemain -= thisPieceSize;
+        ++b->pieceIndex;
+    }
+    assert( walk-ret == (int)(SHA_DIGEST_LENGTH*b->pieceCount) );
+    assert( totalRemain == 0 );
+
+    free( buf );
     return ret;
 }
@@ -278 +294 @@
         memcpy( buf, prev, pch-prev );
         buf[pch-prev] = '\0';
-        fprintf ( stderr, "adding [%s] to the list of paths\n", buf );
+        /*fprintf ( stderr, "adding [%s] to the list of paths\n", buf );*/
 
         sub = tr_bencListAdd( uninitialized_path );
@@ -311 +327 @@
 
 static void
-makeInfoDict ( benc_val_t                 * dict,
-               const tr_metainfo_builder_t  * builder )
+makeInfoDict ( benc_val_t             * dict,
+               tr_metainfo_builder_t  * builder )
 {
     uint8_t * pch;
-    int pieceCount = 0;
     benc_val_t * val;
     char base[MAX_PATH_LENGTH];
@@ -328 +343 @@
     tr_bencInitInt( val, builder->pieceSize );
 
-    pch = getHashInfo( builder, &pieceCount );
+    pch = getHashInfo( builder );
     val = tr_bencDictAdd( dict, "pieces" );
-    tr_bencInitStr( val, pch, SHA_DIGEST_LENGTH * pieceCount, 0 );
+    tr_bencInitStr( val, pch, SHA_DIGEST_LENGTH * builder->pieceCount, 0 );
 
     if ( builder->isSingleFile )
@@ -352 +367 @@
     int n = 5;
     benc_val_t top, *val;
+fprintf( stderr, "builder %p in realMakeMetaInfo\n", builder );
 
     tr_bencInit ( &top, TYPE_DICT );
@@ -378 +394 @@
         tr_bencDictReserve( val, 666 );
         makeInfoDict( val, builder );
-
-    /* debugging... */
-    tr_bencPrint( &top );
 
     /* save the file */
@@ -445 +458 @@
           break;
 
+fprintf( stderr, "worker thread got builder %p\n", builder);
         tr_realMakeMetaInfo ( builder );
     }
 
+fprintf( stderr, "worker thread exiting\n" );
     workerIsRunning = 0;
 }
@@ -470 +485 @@
     }
 
+fprintf( stderr, "enqueuing a builder %p\n", builder);
     /* enqueue the builder */
     lock = getQueueLock ( builder->handle );
@@ -477 +493 @@
     if( !workerIsRunning ) {
         workerIsRunning = 1;
+fprintf( stderr, "making new worker thread\n" );
         tr_threadCreate( &workerThread, workerFunc, builder->handle, "makeMeta" );
     }