Changeset 2131

Timestamp:

Jun 17, 2007, 2:37:33 PM (15 years ago)

Author:

charles

Message:

• if user aborts, don't physically create the torrent file. (thx BMW)
• remove the gtk threading code that got checked in by accident in yesterday's flurry
• slightly better error checking in makemeta

Location:

branches/file_selection

Files:

• gtk/main.c (modified) (1 diff)
• gtk/makemeta-ui.c (modified) (1 diff)
• libtransmission/makemeta.c (modified) (7 diffs)
• libtransmission/utils.c (modified) (1 diff)

branches/file_selection/gtk/main.c

@@ -352 +352 @@
     textdomain( "transmission-gtk" );
 
-    g_thread_init (0);
     g_set_application_name( _("Transmission") );
     gtk_init( argc, argv );

branches/file_selection/gtk/makemeta-ui.c

@@ -83 +83 @@
         if( ui->builder->failed )
         {
+            const char * reason = ui->builder->abortFlag
+                ? _("Torrent creation aborted.")
+                : _("Torrent creation 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_BUTTONS_CLOSE, reason );
             gtk_dialog_run( GTK_DIALOG( w ) );
             gtk_widget_destroy( ui->progress_dialog );
+            ui->builder->abortFlag = 0;
         }
         else

branches/file_selection/libtransmission/makemeta.c

@@ -292 +292 @@
         memcpy( buf, prev, pch-prev );
         buf[pch-prev] = '\0';
-        /*fprintf ( stderr, "adding [%s] to the list of paths\n", buf );*/
 
         sub = tr_bencListAdd( uninitialized_path );
@@ -365 +364 @@
     int n = 5;
     benc_val_t top, *val;
-fprintf( stderr, "builder %p in realMakeMetaInfo\n", builder );
 
     tr_bencInit ( &top, TYPE_DICT );
@@ -394 +392 @@
 
     /* save the file */
-    if (1) {
+    if ( !builder->abortFlag ) {
+        size_t nmemb;
+        char * pch = tr_bencSaveMalloc( &top, &n );
         FILE * fp = fopen( builder->outputFile, "wb+" );
-        char * pch = tr_bencSaveMalloc( &top, &n );
-        fwrite( pch, n, 1, fp );
+        nmemb = n;
+        if( fp == NULL )
+            builder->failed = 1;
+        else if( fwrite( pch, 1, nmemb, fp ) != nmemb )
+            builder->failed = 1;
         free( pch );
         fclose( fp );
@@ -405 +408 @@
     tr_bencFree( & top );
     builder->isDone = 1;
-    builder->failed = builder->abortFlag; /* FIXME: doesn't catch all failures */
+    builder->failed |= builder->abortFlag;
 }
 
@@ -456 +459 @@
           break;
 
-fprintf( stderr, "worker thread got builder %p\n", builder);
         tr_realMakeMetaInfo ( builder );
     }
 
-fprintf( stderr, "worker thread exiting\n" );
     workerIsRunning = 0;
 }
@@ -483 +484 @@
     }
 
-fprintf( stderr, "enqueuing a builder %p\n", builder);
     /* enqueue the builder */
     lock = getQueueLock ( builder->handle );
@@ -491 +491 @@
     if( !workerIsRunning ) {
         workerIsRunning = 1;
-fprintf( stderr, "making new worker thread\n" );
         tr_threadCreate( &workerThread, workerFunc, builder->handle, "makeMeta" );
     }

branches/file_selection/libtransmission/utils.c

@@ -330 +330 @@
 tr_ioErrorFromErrno( void )
 {
-    if( EACCES == errno || EROFS == errno )
-    {
-        return TR_ERROR_IO_PERMISSIONS;
-    }
-    else if( ENOSPC == errno )
-    {
-        return TR_ERROR_IO_SPACE;
-    }
-    else if( EMFILE == errno || EFBIG == errno )
-    {
-        return TR_ERROR_IO_RESOURCES;
-    }
-    tr_dbg( "generic i/o errno from errno: %s", strerror( errno ) );
-    return TR_ERROR_IO_OTHER;
+    switch( errno )
+    {
+        case EACCES:
+        case EROFS:
+            return TR_ERROR_IO_PERMISSIONS;
+        case ENOSPC:
+            return TR_ERROR_IO_SPACE;
+        case EMFILE:
+        case EFBIG:
+            return TR_ERROR_IO_RESOURCES;
+        default:
+            tr_dbg( "generic i/o errno from errno: %s", strerror( errno ) );
+            return TR_ERROR_IO_OTHER;
+    }
 }