Changeset 9545

Timestamp:

Nov 22, 2009, 4:20:22 PM (13 years ago)

Author:

charles

Message:

(trunk gtk) #2556: add a torrent from a URL. works from the menu and from URLs passed in the command line at startup

Location:

trunk/gtk

Files:

• actions.c (modified) (1 diff)
• add-dialog.c (modified) (5 diffs)
• add-dialog.h (modified) (1 diff)
• main.c (modified) (2 diffs)
• tr-core.c (modified) (3 diffs)
• tr-core.h (modified) (1 diff)
• ui.h (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/actions.c

@@ -103 +103 @@
     { "edit-menu", NULL, N_( "_Edit" ), NULL, NULL, NULL },
     { "help-menu", NULL, N_( "_Help" ), NULL, NULL, NULL },
+    { "add-torrent-from-url",  GTK_STOCK_ADD, N_("Add _URL..." ), NULL, N_( "Add URL" ),  G_CALLBACK( action_cb ) },
     { "add-torrent-toolbar",  GTK_STOCK_ADD, NULL, NULL, N_( "Add a torrent" ),  G_CALLBACK( action_cb ) },
     { "add-torrent-menu", GTK_STOCK_ADD, N_( "_Add..." ), "<control>D", N_( "Add a torrent" ), G_CALLBACK( action_cb ) },

trunk/gtk/add-dialog.c

@@ -13 +13 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+
 #include "add-dialog.h"
 #include "conf.h"
@@ -28 +29 @@
 get_recent_destinations( void )
 {
-    int      i;
+    int i;
     GSList * list = NULL;
 
-    for( i = 0; i < N_RECENT; ++i )
-    {
-        char         key[64];
+    for( i=0; i<N_RECENT; ++i )
+    {
+        char key[64];
         const char * val;
-        g_snprintf( key, sizeof( key ), "recent-download-dir-%d", i + 1 );
-        if( ( val = pref_string_get( key ) ) )
+        g_snprintf( key, sizeof( key ), "recent-download-dir-%d", i+1 );
+        if(( val = pref_string_get( key )))
             list = g_slist_append( list, (void*)val );
     }
@@ -45 +46 @@
 save_recent_destination( TrCore * core, const char * dir  )
 {
-    int      i;
+    int i;
+    GSList * l;
     GSList * list = get_recent_destinations( );
-    GSList * l;
-
-    if( !dir )
+
+    if( dir == NULL )
         return;
 
     /* if it was already in the list, remove it */
-    if( ( l = g_slist_find_custom( list, dir, (GCompareFunc)strcmp ) ) )
+    if(( l = g_slist_find_custom( list, dir, (GCompareFunc)strcmp )))
         list = g_slist_delete_link( list, l );
 
@@ -61 +62 @@
     /* make local copies of the strings that aren't
      * invalidated by pref_string_set() */
-    for( l = list; l; l = l->next )
+    for( l=list; l; l=l->next )
         l->data = g_strdup( l->data );
 
     /* save the first N_RECENT directories */
-    for( l = list, i = 0; l && ( i < N_RECENT ); ++i, l = l->next )
-    {
+    for( l=list, i=0; l && ( i<N_RECENT ); ++i, l=l->next ) {
         char key[64];
         g_snprintf( key, sizeof( key ), "recent-download-dir-%d", i + 1 );
@@ -468 +468 @@
 }
 
+/***
+****
+***/
+
+static void
+onAddURLResponse( GtkDialog * dialog, int response, gpointer user_data )
+{
+    gboolean destroy = TRUE;
+
+    if( response == GTK_RESPONSE_ACCEPT )
+    {
+        GtkWidget * e = GTK_WIDGET( g_object_get_data( G_OBJECT( dialog ), "url-entry" ) );
+        char * url = g_strdup( gtk_entry_get_text( GTK_ENTRY( e ) ) );
+        g_strstrip( url );
+
+        if( url && *url )
+        {
+            TrCore * core = user_data;
+
+            if( gtr_is_supported_url( url ) )
+            {
+                tr_core_add_from_url( core, url );
+            }
+            else
+            {
+                GtkWidget * w = gtk_message_dialog_new( GTK_WINDOW( dialog ),
+                                                        GTK_DIALOG_MODAL,
+                                                        GTK_MESSAGE_ERROR,
+                                                        GTK_BUTTONS_CLOSE,
+                                                        "%s", _( "Unrecognized URL" ) );
+                gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( w ),
+                    _( "Transmission doesn't know how to use \"%s\"" ), url );
+                gtk_dialog_run( GTK_DIALOG( w ) );
+                gtk_widget_destroy( w );
+                destroy = FALSE;
+            }
+        }
+    }
+
+    if( destroy )
+        gtk_widget_destroy( GTK_WIDGET( dialog ) );
+}
+
+GtkWidget*
+addURLDialog( GtkWindow * parent, TrCore * core )
+{
+    int row;
+    GtkWidget * e;
+    GtkWidget * t;
+    GtkWidget * w;
+
+    w = gtk_dialog_new_with_buttons( _( "Add a URL" ), parent,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                     GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
+                                     NULL );
+    gtk_dialog_set_alternative_button_order( GTK_DIALOG( w ),
+                                             GTK_RESPONSE_ACCEPT,
+                                             GTK_RESPONSE_CANCEL,
+                                             -1 );
+    g_signal_connect( w, "response", G_CALLBACK( onAddURLResponse ), core );
+
+    row = 0;
+    t = hig_workarea_create( );
+    hig_workarea_add_section_title( t, &row, _( "Add torrent from URL" ) );
+    e = gtk_entry_new( );
+    g_object_set_data( G_OBJECT( w ), "url-entry", e );
+    hig_workarea_add_row( t, &row, _( "_URL" ), e, NULL );
+    
+    gtk_box_pack_start( GTK_BOX( GTK_DIALOG( w )->vbox ), t, TRUE, TRUE, 0 );
+    gtk_widget_show_all( t );
+    gtk_widget_show( w );
+    return w;
+}

trunk/gtk/add-dialog.h

@@ -25 +25 @@
                       TrCore *    core );
 
+GtkWidget* addURLDialog( GtkWindow * parent,
+                         TrCore *    core );
+
 #endif /* TR_GTK_ADD_DIALOG */

trunk/gtk/main.c

@@ -365 +365 @@
 
     gerr = NULL;
-    if( !gtk_init_with_args( &argc, &argv, (char*)_( "[torrent files]" ), entries,
+    if( !gtk_init_with_args( &argc, &argv, (char*)_( "[torrent files or urls]" ), entries,
                              (char*)domain, &gerr ) )
     {
@@ -1357 +1357 @@
     gboolean        changed = FALSE;
 
-    if(  !strcmp( action_name, "add-torrent-menu" )
+    if( !strcmp( action_name, "add-torrent-from-url" ) )
+    {
+        addURLDialog( data->wind, data->core );
+    }
+    else if(  !strcmp( action_name, "add-torrent-menu" )
       || !strcmp( action_name, "add-torrent-toolbar" ) )
     {

trunk/gtk/tr-core.c

@@ -39 +39 @@
 #include <libtransmission/json.h>
 #include <libtransmission/utils.h> /* tr_free */
+#include <libtransmission/web.h>
 
 #include "conf.h"
@@ -976 +977 @@
 }
 
+/***
+****
+***/
+
+struct url_dialog_data
+{
+    TrCore * core;
+    tr_ctor * ctor;
+    GtkDialog * dialog;
+};
+
+static gboolean
+onURLDoneIdle( gpointer vdata )
+{
+    struct url_dialog_data * data = vdata;
+    tr_core_add_ctor( data->core, data->ctor );
+    g_free( data );
+    return FALSE;
+}
+
+static void
+onURLDone( tr_session       * session,
+           long               response_code UNUSED,
+           const void       * response,
+           size_t             response_byte_count,
+           void             * vdata )
+{
+    struct url_dialog_data * data = vdata;
+    tr_ctor * ctor = tr_ctorNew( session );
+
+    /* FIME: error dialog */
+
+    if( tr_ctorSetMetainfo( ctor, response, response_byte_count ) )
+    {
+        tr_ctorFree( ctor );
+        g_free( data );
+    }
+    else /* move the work back to the gtk thread */
+    {
+        data->ctor = ctor;
+        gtr_idle_add( onURLDoneIdle, data );
+    }
+}
+
+void
+tr_core_add_from_url( TrCore * core, const char * url )
+{
+    if( gtr_is_magnet_link( url ) )
+    {
+        g_message( "FIXME: magnet link \"%s\" not handled", url );
+    }
+    else
+    {
+        struct url_dialog_data * data = g_new( struct url_dialog_data, 1 );
+        data->core = core;
+        tr_webRun( tr_core_session( core ), url, NULL, onURLDone, data );
+    }
+}
+
+/***
+****
+***/
+
 static void
 add_filename( TrCore      * core,
@@ -984 +1048 @@
 {
     tr_session * session = tr_core_session( core );
-    if( filename && session )
+
+    if( session == NULL )
+        return;
+
+    if( gtr_is_supported_url( filename ) )
+    {
+        tr_core_add_from_url( core, filename );
+    }
+    else /* try it as a local file */
     {
         int err;
+
         tr_ctor * ctor = tr_ctorNew( session );
+        tr_ctorSetMetainfoFromFile( ctor, filename );
         tr_core_apply_defaults( ctor );
         tr_ctorSetPaused( ctor, TR_FORCE, !doStart );
-        tr_ctorSetMetainfoFromFile( ctor, filename );
 
         err = add_ctor( core, ctor, doPrompt, doNotify );

trunk/gtk/tr-core.h

@@ -136 +136 @@
                                GError     ** err );
 
+/** @brief Add a torrent from a URL */
+void tr_core_add_from_url( TrCore * core, const char * url );
+
 /** @brief Add a torrent.
     @param ctor this function assumes ownership of the ctor */

trunk/gtk/ui.h

@@ -4 +4 @@
     "    <menu action='torrent-menu'>\n"
     "      <menuitem action='add-torrent-menu'/>\n"
+    "      <menuitem action='add-torrent-from-url'/>\n"
     "      <menuitem action='new-torrent'/>\n"
     "      <separator/>\n"

trunk/gtk/util.c

@@ -323 +323 @@
 }
 
+
+gboolean
+gtr_is_supported_url( const char * str )
+{
+    return gtr_is_magnet_link( str )
+        || !strncmp( str, "ftp://", 6 )
+        || !strncmp( str, "http://", 7 )
+        || !strncmp( str, "https://", 8 );
+}
+
+gboolean
+gtr_is_magnet_link( const char * str )
+{
+    return !strncmp( str, "magnet:?", 8 );
+}
+
 GSList *
-checkfilenames( int    argc,
-                char **argv )
-{
-    int      i;
+checkfilenames( int argc, char **argv )
+{
+    int i;
     GSList * ret = NULL;
-    char *   pwd = g_get_current_dir( );
-
-    for( i = 0; i < argc; ++i )
-    {
-        char * filename = g_path_is_absolute( argv[i] )
-                          ? g_strdup ( argv[i] )
-                          : g_build_filename( pwd, argv[i], NULL );
-
-        if( g_file_test( filename, G_FILE_TEST_EXISTS ) )
-            ret = g_slist_prepend( ret, filename );
-        else
-            g_free( filename );
+    char * pwd = g_get_current_dir( );
+
+    for( i=0; i<argc; ++i )
+    {
+        if( gtr_is_supported_url( argv[i] ) )
+        {
+            ret = g_slist_prepend( ret, g_strdup( argv[i] ) );
+        }
+        else /* local file */
+        {
+            char * filename = g_path_is_absolute( argv[i] )
+                            ? g_strdup ( argv[i] )
+                            : g_build_filename( pwd, argv[i], NULL );
+
+            if( g_file_test( filename, G_FILE_TEST_EXISTS ) )
+                ret = g_slist_prepend( ret, filename );
+            else
+                g_free( filename );
+        }
     }
 

trunk/gtk/util.h

@@ -43 +43 @@
 ****
 ***/
+
+gboolean gtr_is_supported_url( const char * str );
+
+gboolean gtr_is_magnet_link( const char * str );
 
 /* create a copy of a GSList of strings, this dups the actual strings too */