Changeset 2103

Timestamp:

Jun 16, 2007, 9:25:58 PM (15 years ago)

Author:

charles

Message:

another work-in-progress commit to touch base with BMW. The backend interfaces should be good, but the progress func doesn't get called as it should (yet)

Location:

branches/file_selection

Files:

• cli/transmissioncli.c (modified) (3 diffs)
• gtk/make-meta-ui.c (modified) (2 diffs)
• libtransmission/makemeta.c (modified) (7 diffs)
• libtransmission/makemeta.h (modified) (1 diff)

branches/file_selection/cli/transmissioncli.c

@@ -36 +36 @@
 #endif
 
+/* macro to shut up "unused parameter" warnings */
+#ifdef __GNUC__
+#define UNUSED                  __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
 const char * USAGE =
 "Usage: %s [options] file.torrent [options]\n\n"
@@ -86 +93 @@
 #define LINEWIDTH 80
 
+static void
+progress_func( const meta_info_builder_t * builder     UNUSED,
+               size_t                      pieceIndex,
+               size_t                      pieceCount,
+               int                       * abortFlag   UNUSED,
+               void                      * userData    UNUSED )
+{
+    double percent = (double)pieceIndex / pieceCount;
+    printf( "%d%% done (on block %lu of %lu)\n",
+            (int)(100.0*percent + 0.5),
+            pieceIndex, pieceCount );
+}
+
+
 int main( int argc, char ** argv )
 {
@@ -136 +157 @@
     {
         meta_info_builder_t* builder = tr_metaInfoBuilderCreate( sourceFile );
-        int ret = tr_makeMetaInfo( builder, NULL, announce, comment, isPrivate );
+        int ret = tr_makeMetaInfo( builder,
+                                   progress_func, NULL,
+                                   NULL, announce, comment, isPrivate );
         tr_metaInfoBuilderFree( builder );
         return ret;

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

@@ -45 +45 @@
 
 static void
-response_cb( GtkDialog* d, int response, gpointer user_data UNUSED )
-{
-    if( response == GTK_RESPONSE_ACCEPT )
+cancel_cb( GtkDialog *d UNUSED, int response UNUSED, gpointer cancel_flag )
+{
+    *(int*)cancel_flag = TRUE;
+}
+
+static void
+progress_cb( const meta_info_builder_t  * builder    UNUSED,
+             size_t                       pieceIndex,
+             size_t                       pieceCount,
+             int                        * abortFlag,
+             void                       * user_data  UNUSED)
+{
+    g_message ("%lu of %lu", pieceIndex, pieceCount);
+
+    *abortFlag = *(gboolean*)user_data;
+}
+
+static void
+response_cb( GtkDialog* d, int response, gpointer user_data )
+{
+    int ret;
+    gboolean cancelFlag = FALSE;
+    MakeMetaUI * ui = (MakeMetaUI*) user_data;
+    GtkWidget *w, *l, *p;
+    char *tmp, *name;
+
+    if( response != GTK_RESPONSE_ACCEPT )
     {
-        g_message( "go for it!");
-    }
-
-    gtk_widget_destroy( GTK_WIDGET( d ) );
+        gtk_widget_destroy( GTK_WIDGET( d ) );
+        return;
+    }
+
+    w = gtk_dialog_new_with_buttons( _("Making Torrent..."), 
+                                     GTK_WINDOW(d),
+                                     GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                     NULL );
+    g_signal_connect( w, "response", G_CALLBACK(cancel_cb), &cancelFlag );
+
+    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), l );
+    gtk_widget_show_all ( w );
+    g_free( name );
+    g_free( tmp );
+
+    ret = tr_makeMetaInfo( ui->builder,
+                           progress_cb, &cancelFlag,
+                           NULL, 
+                           gtk_entry_get_text( GTK_ENTRY( ui->announce_entry ) ),
+                           gtk_entry_get_text( GTK_ENTRY( ui->comment_entry ) ),
+                           gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( ui->private_check ) ) );
+    if( !ret )
+      gtk_widget_destroy( GTK_WIDGET( d ) );
 }
 
@@ -118 +167 @@
                                      GTK_STOCK_NEW, GTK_RESPONSE_ACCEPT,
                                      NULL );
-    g_signal_connect( d, "response", G_CALLBACK(response_cb), NULL );
+    g_signal_connect( d, "response", G_CALLBACK(response_cb), ui );
     g_object_set_data_full( G_OBJECT(d), "ui", ui, g_free );
 

branches/file_selection/libtransmission/makemeta.c

@@ -159 +159 @@
         base = basename( basebuf );
         files = getFiles( dir, base, NULL );
-        assert( files != NULL  );
     }
 
@@ -203 +202 @@
 static uint8_t*
 getHashInfo ( const meta_info_builder_t  * builder,
+              makemeta_progress_func       progress_func,
+              void                       * progress_func_user_data,
               int                        * setmeCount )
 {
     size_t i;
+    int abort = 0;;
     tr_torrent_t t;
     uint8_t *ret, *walk;
@@ -228 +230 @@
     ret = (uint8_t*) malloc ( SHA_DIGEST_LENGTH * t.info.pieceCount );
     walk = ret;
+
+    /* FIXME: call the periodically while getting the SHA1 sums.
+       this will take a little tweaking to ioRecalculateHash,
+       probably will get done Sunday or Monday */
+    (progress_func)( builder, 0, t.info.pieceCount, &abort, progress_func_user_data );
+
     for( i=0; i<(size_t)t.info.pieceCount; ++i ) {
         tr_ioRecalculateHash( &t, i, walk );
@@ -306 +314 @@
 makeInfoDict ( benc_val_t                 * dict,
                const meta_info_builder_t  * builder,
+               makemeta_progress_func       progress_func,
+               void                       * progress_func_user_data,
                int                          isPrivate )
 {
@@ -322 +332 @@
     tr_bencInitInt( val, builder->pieceSize );
 
-    pch = getHashInfo( builder, &pieceCount );
+    pch = getHashInfo( builder,
+                       progress_func,
+                       progress_func_user_data,
+                       &pieceCount );
     val = tr_bencDictAdd( dict, "pieces" );
     tr_bencInitStr( val, pch, SHA_DIGEST_LENGTH * pieceCount, 0 );
@@ -345 +358 @@
 int
 tr_makeMetaInfo( const meta_info_builder_t  * builder,
+                 makemeta_progress_func       progress_func,
+                 void                       * progress_func_user_data,
                  const char                 * outputFile,
                  const char                 * announce,
@@ -377 +392 @@
         tr_bencInit( val, TYPE_DICT );
         tr_bencDictReserve( val, 666 );
-        makeInfoDict( val, builder, isPrivate );
+        makeInfoDict( val, builder,
+                      progress_func, progress_func_user_data,
+                      isPrivate );
 
     /* debugging... */

branches/file_selection/libtransmission/makemeta.h

@@ -42 +42 @@
 tr_metaInfoBuilderCreate( const char * topFile );
 
+/* set abortFlag to nonzero to abort the checksum generation */
+typedef
+void (*makemeta_progress_func)(const meta_info_builder_t * builder,
+                               size_t                      pieceIndex,
+                               size_t                      pieceCount,
+                               int                       * abortFlag,
+                               void                      * userData );
 int
-tr_makeMetaInfo( const meta_info_builder_t * builder,
-                 const char                * outputFile, /* NULL for builder->top + ".torrent" */
-                 const char                * announce,
-                 const char                * comment,
-                 int                         isPrivate );
+tr_makeMetaInfo( const meta_info_builder_t  * builder,
+                 makemeta_progress_func       progress_func,
+                 void                       * progress_func_user_data,
+                 const char                 * outputFile_or_NULL,
+                 const char                 * announce,
+                 const char                 * comment,
+                 int                          isPrivate );
+
 
 void