Changeset 6323

Timestamp:

Jul 11, 2008, 5:09:53 PM (14 years ago)

Author:

charles

Message:

Update NEWS file to say the Clutch rewrite's been folded into Transmission.

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• NEWS (modified) (2 diffs)
• gtk/details.c (modified) (2 diffs)
• gtk/makemeta-ui.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (4 diffs)
• libtransmission/blocklist.c (modified) (1 diff)
• libtransmission/platform.c (modified) (2 diffs)
• libtransmission/port-forwarding.c (modified) (1 diff)
• libtransmission/rpc-server.c (modified) (3 diffs)

trunk/AUTHORS

@@ -3 +3 @@
 
 Lead Developers <dev@transmissionbt.com>
-        Mitchell Livingston <livings124@transmissionbt.com>  (Mac OS X interface)
-        Charles Kerr <charles@transmissionbt.com>  (Backend, GTK+ client)
+        Charles Kerr <charles@transmissionbt.com>  (Daemon, Backend, GTK+ client)
+        Mitchell Livingston <livings124@transmissionbt.com>  (Mac OS X client)
         Eric Petit <titer@m0k.org>  (Creator)
-        Josh Elsasser <josh@elsasser.org>  (Daemon, Backend, GTK+ interface)
-        Bryan Varner <bryan@varnernet.com>  (BeOS interface)
+        Josh Elsasser <josh@elsasser.org>  (Daemon, Backend, GTK+ client)
+        Bryan Varner <bryan@varnernet.com>  (BeOS client)
 
 Project Contributors

trunk/NEWS

@@ -4 +4 @@
 http://trac.transmissionbt.com/query?group=component&milestone=1.30
 - All Platforms
+   + The "Clutch" web interface is now bundled with Transmission
+   + Ability to add and remove tracker addresses
+   + Ability to create torrent files with multiple tracker addresses
    + Added support for HTTP/FTP Seeding (GetRight style)
    + Added proxy support for communicating with trackers
-   + Ability to add and remove tracker addresses
-   + Ability to create torrent files with multiple tracker addresses
    + Allow torrent creation with no tracker address (required by some trackers)
-   + Restructuring of remote access
+   + Redesigned remote access via JSON
+- Daemon
+   + transmission-daemon and transmission-remote were rewritten from scratch
+   + remote and daemon now support per-file priority & download flag settings
 - Mac
    + Quick Look integration in the main window and inspector's file tab
@@ -18 +22 @@
 - GTK+
    + Add options to inhibit hibernation and to toggle the tray icon
-- Daemon
-   + Redesigned & rewritten to use JSON over http
 
 1.22 (2008/06/13)

trunk/gtk/details.c

@@ -558 +558 @@
             switch( *pch ) {
                 case 'O': txt = _( "Optimistic unchoke" ); break;
-                case 'D': txt = _( "Downloading from peer" ); break;
-                case 'd': txt = _( "We'd download from peer if they'd let us" ); break;
+                case 'D': txt = _( "Downloading from this peer" ); break;
+                case 'd': txt = _( "We would download from this peer if they would let us" ); break;
                 case 'U': txt = _( "Uploading to peer" ); break;
-                case 'u': txt = _( "We'd upload to peer if they'd ask us" ); break;
+                case 'u': txt = _( "We would upload to this peer if they asked" ); break;
                 case 'K': txt = _( "Peer has unchoked us, but we're not interested" ); break;
-                case '?': txt = _( "We unchoked the peer, but they're not interested" ); break;
+                case '?': txt = _( "We unchoked this peer, but they're not interested" ); break;
                 case 'E': txt = _( "Encrypted connection" ); break;
                 case 'X': txt = _( "Peer was discovered through Peer Exchange (PEX)" ); break;
@@ -813 +813 @@
 
     g_snprintf( countStr, sizeof( countStr ),
-                ngettext( "%d Piece", "%d Pieces", info->pieceCount ),
+                ngettext( "%'d Piece", "%'d Pieces", info->pieceCount ),
                 info->pieceCount );
     tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) );

trunk/gtk/makemeta-ui.c

@@ -236 +236 @@
         char countStr[512];
         g_snprintf( countStr, sizeof( countStr ),
-                    ngettext( "%d Piece", "%d Pieces", builder->pieceCount ),
+                    ngettext( "%'d Piece", "%'d Pieces", builder->pieceCount ),
                     builder->pieceCount );
         tr_strlsize( sizeStr, builder->pieceSize, sizeof(sizeStr) );

trunk/gtk/tr-prefs.c

@@ -711 +711 @@
     gtk_list_store_set( page->store, &iter,
                         COL_PERMISSION, _( "Allow" ),
-                        COL_ADDRESS, _( "0.0.0.0" ),
+                        COL_ADDRESS,  "0.0.0.0",
                         -1 );
 
@@ -768 +768 @@
 
 static GtkWidget*
-remotePage( GObject * core )
+webPage( GObject * core )
 {
     const char  * s;
@@ -781 +781 @@
     g_object_set_data_full( G_OBJECT( t ), "page", page, g_free );
 
-    hig_workarea_add_section_title( t, &row, _( "Remote Access" ) );
+    hig_workarea_add_section_title( t, &row, _( "Web Interface" ) );
 
         /* "enabled" checkbutton */
-        s = _( "A_llow requests from transmission-remote, Clutch, etc." );
+        s = _( "Allow remote access" );
         w = new_check_button( s, PREF_KEY_RPC_ENABLED, core );
         hig_workarea_add_wide_control( t, &row, w );
@@ -1087 +1087 @@
                               gtk_label_new (_("Network")) );
     gtk_notebook_append_page( GTK_NOTEBOOK( n ),
-                              remotePage( core ),
-                              gtk_label_new (_("Remote")) );
+                              webPage( core ),
+                              gtk_label_new (_("Web")) );
 
     g_signal_connect( d, "response", G_CALLBACK(response_cb), core );

trunk/libtransmission/blocklist.c

@@ -275 +275 @@
         tr_strlcpy( buf, b->filename, sizeof( buf ) );
         name = basename( buf );
-        tr_inf( _( "Blocklist \"%s\" updated with %'d entries" ), name, lineCount );
+        tr_inf( _( "Blocklist \"%1$s\" updated with %2$'d entries" ), name, lineCount );
     }
 

trunk/libtransmission/platform.c

@@ -517 +517 @@
     char tmp[MAX_PATH_LENGTH];
     tr_buildPath( tmp, sizeof( tmp ), path, "javascript", "transmission.js", NULL );
-fprintf( stderr, "path is [%s]; testing [%s] for clutch\n", path, tmp );
+    tr_inf( _( "Searching for web interface file \"%s\"" ), tmp );
     return !stat( tmp, &sb );
 }
@@ -587 +587 @@
 
         if( !*path )
-        {
-            tr_err( _( "Unable to find web interface files" ) );
-            tr_strlcpy( path, "/dev/null", sizeof( path ) );
-        }
+            tr_err( _( "Couldn't find the web interface's files!  To customize this, set the CLUTCH_HOME environmental variable to the folder where index.html is located." ) );
 
         s = tr_strdup( path );

trunk/libtransmission/port-forwarding.c

@@ -97 +97 @@
 
     if( newStatus != oldStatus )
-        tr_ninf( getKey(), _( "State changed from \"%s\" to \"%s\"" ),
+        tr_ninf( getKey(), _( "State changed from \"%1$s\" to \"%2$s\"" ),
                  getNatStateStr(oldStatus),
                  getNatStateStr(newStatus) );

trunk/libtransmission/rpc-server.c

@@ -254 +254 @@
         char passwd[MAX_PATH_LENGTH];
         const char * clutchDir = tr_getClutchDir( server->session );
-        char * clutchAlias = tr_strdup_printf( "%s=%s", "/transmission/clutch", clutchDir );
         struct timeval tv = tr_timevalMsec( UNUSED_INTERVAL_MSEC );
 
-fprintf( stderr, "clutchAlias is [%s]\n", clutchAlias );
         getPasswordFile( server, passwd, sizeof( passwd ) );
         if( !server->isPasswordEnabled )
@@ -268 +266 @@
         shttpd_register_uri( server->ctx, "/transmission/rpc", handle_rpc, server );
         shttpd_register_uri( server->ctx, "/transmission/upload", handle_upload, server );
-        shttpd_set_option(server->ctx, "aliases", clutchAlias );
+
+        if( clutchDir && *clutchDir ) {
+            char * clutchAlias = tr_strdup_printf( "%s=%s", "/transmission/clutch", clutchDir );
+            tr_inf( _( "Serving the web interface files from \"%s\"" ), clutchDir );
+            shttpd_set_option( server->ctx, "aliases", clutchAlias );
+            tr_free( clutchAlias );
+        }
+
         shttpd_set_option( server->ctx, "ports", ports );
         shttpd_set_option( server->ctx, "dir_list", "0" );
@@ -286 +291 @@
         evtimer_set( &server->timer, rpcPulse, server );
         evtimer_add( &server->timer, &tv );
-
-        tr_free( clutchAlias );
     }
 }