Changeset 7255

Timestamp:

Dec 3, 2008, 6:01:38 AM (12 years ago)

Author:

charles

Message:

(gtk) #1409: "Duplicate Torrent" error message should be more helpful

Location:

trunk/gtk

Files:

• main.c (modified) (4 diffs)
• tr-core.c (modified) (3 diffs)

trunk/gtk/main.c

@@ -948 +948 @@
     GtkWidget * w;
 
-    for( l = *files; l; l = l->next )
-        g_string_append_printf( s, "%s\n", (const char*)l->data );
+    if( g_slist_length( *files ) > 1 ) {
+        for( l=*files; l!=NULL; l=l->next )
+            g_string_append_printf( s, "\xE2\x88\x99 %s\n", (const char*)l->data );
+    } else {
+        for( l=*files; l!=NULL; l=l->next )
+            g_string_append_printf( s, "%s\n", (const char*)l->data );
+    }
     w = gtk_message_dialog_new( window,
                                 GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -973 +978 @@
         flushAddTorrentErrors( GTK_WINDOW( cbdata->wind ),
                                ngettext( "Couldn't add corrupt torrent",
-                                        "Couldn't add corrupt torrents",
-                                        g_slist_length( cbdata->errqueue ) ),
+                                         "Couldn't add corrupt torrents",
+                                         g_slist_length( cbdata->errqueue ) ),
                                &cbdata->errqueue );
 
@@ -980 +985 @@
         flushAddTorrentErrors( GTK_WINDOW( cbdata->wind ),
                                ngettext( "Couldn't add duplicate torrent",
-                                        "Couldn't add duplicate torrents",
-                                        g_slist_length( cbdata->dupqueue ) ),
+                                         "Couldn't add duplicate torrents",
+                                         g_slist_length( cbdata->dupqueue ) ),
                                &cbdata->dupqueue );
 }
@@ -1001 +1006 @@
 
         case TR_EDUPLICATE:
-            c->dupqueue =
-                g_slist_append( c->dupqueue, g_path_get_basename( msg ) );
+            c->dupqueue = g_slist_append( c->dupqueue, g_strdup( msg ) );
             break;
 

trunk/gtk/tr-core.c

@@ -859 +859 @@
     if( filename && session )
     {
-        int       err;
-        tr_ctor * ctor = tr_ctorNew( session );
+        tr_ctor * ctor;
+
+        ctor = tr_ctorNew( session );
         tr_core_apply_defaults( ctor );
         tr_ctorSetPaused( ctor, TR_FORCE, !doStart );
+
         if( tr_ctorSetMetainfoFromFile( ctor, filename ) )
         {
@@ -868 +870 @@
             tr_ctorFree( ctor );
         }
-        else if( ( err = tr_torrentParse( session, ctor, NULL ) ) )
-        {
-            /* don't complain about .torrent files in the watch directory
-               that have already been added... that gets annoying, and we
-               don't want to nag about cleaning up the watch dir */
-            const gboolean quiet = ( err == TR_EDUPLICATE )
-                                && ( core->priv->adding_from_watch_dir );
-            if( !quiet )
-                tr_core_errsig( core, err, filename );
-
-            tr_ctorFree( ctor );
-        }
-        else if( doPrompt )
-            g_signal_emit( core, TR_CORE_GET_CLASS(
-                               core )->promptsig, 0, ctor );
         else
         {
-            tr_torrent * tor = tr_torrentNew( session, ctor, &err );
-            if( err )
-                tr_core_errsig( core, err, filename );
-            else
-                tr_core_add_torrent( core, tr_torrent_new_preexisting( tor ) );
+            tr_info inf;
+            int err = tr_torrentParse( session, ctor, &inf );
+
+            switch( err )
+            {
+                case TR_EINVALID:
+                    tr_core_errsig( core, err, filename );
+                    break;
+
+                case TR_EDUPLICATE:
+                    /* don't complain about .torrent files in the watch directory
+                     * that have already been added... that gets annoying and we
+                     * don't want to be naggign users to clean up their watch dirs */
+                    if( !core->priv->adding_from_watch_dir )
+                        tr_core_errsig( core, err, inf.name );
+                    tr_metainfoFree( &inf );
+                    break;
+
+                default:
+                    if( doPrompt )
+                        g_signal_emit( core, TR_CORE_GET_CLASS( core )->promptsig, 0, ctor );
+                    else {
+                        tr_torrent * tor = tr_torrentNew( session, ctor, &err );
+                        if( err )
+                            tr_core_errsig( core, err, filename );
+                        else
+                            tr_core_add_torrent( core, tr_torrent_new_preexisting( tor ) );
+                    }
+                    tr_metainfoFree( &inf );
+                    break;
+            }
         }
     }
@@ -901 +914 @@
 {
     add_filename( core, filename,
-                 pref_flag_get( PREF_KEY_START ),
-                 pref_flag_get( PREF_KEY_OPTIONS_PROMPT ) );
+                  pref_flag_get( PREF_KEY_START ),
+                  pref_flag_get( PREF_KEY_OPTIONS_PROMPT ) );
     *success = TRUE;
     return TRUE;