Changeset 9635 for trunk/gtk/util.c

Timestamp:

Nov 29, 2009, 8:35:48 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) #2096 "magnet links" -- if a user (or, more likely, web browser) starts up a second copy of Transmission to add a magnet link via its command line, delegate that magnet link back to the already-running copy of Transmission via DBus.

File:

• trunk/gtk/util.c (modified) (4 diffs)

trunk/gtk/util.c

@@ -376 +376 @@
             else {
                 if( gtr_is_hex_hashcode( argv[i] ) )
-                    ret = g_slist_prepend( ret, g_strdup( argv[i] ) );
+                    ret = g_slist_prepend( ret, g_strdup_printf( "magnet:?xt=urn:btih:%s", argv[i] ) );
                 g_free( filename );
             }
@@ -565 +565 @@
     /* FIXME: why is this static? */
     static gboolean success = FALSE;
+
 #ifdef HAVE_DBUS_GLIB
-    DBusGProxy * proxy = NULL;
-    GError * err = NULL;
-    DBusGConnection * conn;
-    char * file_contents;
+    char * payload;
     gsize file_length;
-
+    char * file_contents = NULL;
+
+    /* If it's a file, load its contents and send them over the wire...
+     * it might be a temporary file that's going to disappear. */
     if( g_file_get_contents( filename, &file_contents, &file_length, NULL ) )
-    {
-        char * b64 = tr_base64_encode( file_contents, file_length, NULL );
+        payload = tr_base64_encode( file_contents, file_length, NULL );
+    else if( gtr_is_supported_url( filename ) || gtr_is_magnet_link( filename ) )
+        payload = tr_strdup( filename );
+    else
+        payload = NULL;
+
+    if( payload != NULL )
+    {
+        GError * err = NULL;
+        DBusGConnection * conn;
+        DBusGProxy * proxy = NULL;
+
         if(( conn = dbus_g_bus_get( DBUS_BUS_SESSION, &err )))
             proxy = dbus_g_proxy_new_for_name (conn, VALUE_SERVICE_NAME,
@@ -581 +592 @@
         else if( err )
            g_message( "err: %s", err->message );
+
         if( proxy )
             dbus_g_proxy_call( proxy, "AddMetainfo", &err,
-                               G_TYPE_STRING, b64,
+                               G_TYPE_STRING, payload,
                                G_TYPE_INVALID,
                                G_TYPE_BOOLEAN, &success,
@@ -595 +607 @@
             dbus_g_connection_unref( conn );
 
-        tr_free( b64 );
-        g_free( file_contents );
-    }
-    else g_message( "couldn't read %s", filename );
+        tr_free( payload );
+    }
+
+    g_free( file_contents );
 
 #endif