Changeset 6319

Timestamp:

Jul 11, 2008, 4:07:14 AM (14 years ago)

Author:

charles

Message:

(1) add clutch to the tarball.
(2) on autoconf-based installs, install the clutch files in $(datadir)/transmission/web
(3) new function tr_getClutchDir(). Default implementation follows the XDG spec.

Location:

trunk

Files:

• Makefile.am (modified) (3 diffs)
• libtransmission/platform.c (modified) (2 diffs)
• libtransmission/platform.h (modified) (1 diff)
• libtransmission/rpc-server.c (modified) (2 diffs)
• web/README (deleted)

trunk/Makefile.am

@@ -32 +32 @@
 
 EXTRA_DIST = \
+  web \
   NEWS \
   AUTHORS \
@@ -39 +40 @@
   intltool-extract.in \
   intltool-merge.in \
-  intltool-update.in 
+  intltool-update.in
+
+clutchdir = $(datadir)/transmission/web
+clutch_DATA = \
+  web/index.html \
+  web/LICENSE
+
+clutch_cssdir = $(clutchdir)/stylesheets
+clutch_css_DATA = \
+  web/stylesheets/iphone.css \
+  web/stylesheets/common.css
+
+clutch_jsdir = $(clutchdir)/javascript
+clutch_js_DATA = \
+  web/javascript/menu.js \
+  web/javascript/dialog.js \
+  web/javascript/transmission.js \
+  web/javascript/transmission.remote.js \
+  web/javascript/common.js \
+  web/javascript/torrent.js
+
+clutch_jquerydir = $(clutch_jsdir)/jquery
+clutch_jquery_DATA = \
+  web/javascript/jquery \
+  web/javascript/jquery/json.min.js \
+  web/javascript/jquery/jquery.contextmenu.min.js \
+  web/javascript/jquery/jquery.min.js \
+  web/javascript/jquery/jquery.form.min.js \
+  web/javascript/jquery/jquery.transmenu.min.js \
+  web/javascript/jquery/jquery-dimensions.min.js
+
+clutch_imagesdir = $(clutchdir)/images
+clutch_images_DATA = \
+  web/images/favicon.ico \
+  web/images/webclip-icon.png
+
+clutch_graphicsdir = $(clutch_imagesdir)/graphics
+clutch_graphics_DATA = \
+  web/images/graphics/browser_firefox.gif \
+  web/images/graphics/logo.png \
+  web/images/graphics/chrome.png \
+  web/images/graphics/iphone_chrome.png \
+  web/images/graphics/browser_opera.gif \
+  web/images/graphics/filter_bar.png \
+  web/images/graphics/transfer_arrows.png \
+  web/images/graphics/browser_safari.gif
+
+clutch_progressdir = $(clutch_imagesdir)/progress
+clutch_progress_DATA = \
+  web/images/progress/progress.png
+
+clutch_buttonsdir = $(clutch_imagesdir)/buttons
+clutch_buttons_DATA = \
+  web/images/buttons/tab_backgrounds.png \
+  web/images/buttons/toolbar_buttons.png \
+  web/images/buttons/info_general.png \
+  web/images/buttons/torrent_buttons.png \
+  web/images/buttons/info_activity.png
 
 DISTCLEANFILES = \
@@ -45 +103 @@
   intltool-merge \
   intltool-update 
-

trunk/libtransmission/platform.c

@@ -51 +51 @@
 
 #include "transmission.h"
+#include "list.h"
 #include "platform.h"
 #include "utils.h"
@@ -509 +510 @@
 ***/
 
+static int
+isClutchDir( const char * path )
+{
+    struct stat sb;
+    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 );
+    return !stat( tmp, &sb );
+}
+
+const char *
+tr_getClutchDir( const tr_session * session UNUSED )
+{
+    static char * s = NULL;
+
+    if( !s )
+    {
+        char path[MAX_PATH_LENGTH];
+
+        if(( s = getenv( "CLUTCH_HOME" )))
+        {
+            snprintf( path, sizeof( path ), s );
+        }
+        else
+        {
+#ifdef SYS_DARWIN
+#error not implemented
+#elif defined(WIN32)
+#warning hey win32 people is this good or is there a better implementation of the next four lines
+            char appdata[MAX_PATH_LENGTH];
+            SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, appdata );
+            tr_buildPath( path, sizeof( path ),
+                          appdata, "Transmission", NULL );
+#else
+            tr_list *candidates=NULL, *l;
+
+            /* XDG_DATA_HOME should be the first in the list of candidates */
+            s = getenv( "XDG_DATA_HOME" );
+            if( s && *s )
+                tr_list_append( &candidates, tr_strdup( s ) );
+            else {
+                char tmp[MAX_PATH_LENGTH];
+                tr_buildPath( tmp, sizeof( tmp ), getHomeDir(), ".local", "share", NULL );
+                tr_list_append( &candidates, tr_strdup( tmp ) );
+            }
+
+            /* XDG_DATA_DIRS are the backup directories */
+            s = getenv( "XDG_DATA_DIRS" );
+            if( !s || !*s )
+                s = "/usr/local/share/:/usr/share/";
+            while( s && *s ) {
+                char * end = strchr( s, ':' );
+                if( end ) {
+                    tr_list_append( &candidates, tr_strndup( s, end-s ) );
+                    s = end + 1;
+                } else {
+                    tr_list_append( &candidates, tr_strdup( s ) );
+                    break;
+                }
+            }
+
+            for( l=candidates; l; l=l->next ) {
+                tr_buildPath( path, sizeof( path ), l->data, "transmission", "clutch", NULL );
+                if( isClutchDir( path ) )
+                    break;
+                *path = '\0';
+            }
+
+            tr_list_free( &candidates, tr_free );
+#endif
+        }
+
+        if( !*path )
+        {
+            tr_err( _( "Unable to find web interface files" ) );
+            tr_strlcpy( path, "/dev/null", sizeof( path ) );
+        }
+
+        s = tr_strdup( path );
+    }
+
+    return s;
+}
+
+
+/***
+****
+***/
+
 int
 tr_lockfile( const char * filename )

trunk/libtransmission/platform.h

@@ -45 +45 @@
 const char * tr_getTorrentDir ( const struct tr_handle * );
 
+const char * tr_getClutchDir  ( const struct tr_handle * );
+
+
 tr_thread*   tr_threadNew  ( void (*func)(void *), void * arg, const char * name );
 int          tr_amInThread ( const tr_thread * );

trunk/libtransmission/rpc-server.c

@@ -25 +25 @@
 #include "transmission.h"
 #include "bencode.h"
+#include "platform.h"
 #include "rpc.h"
 #include "rpc-server.h"
@@ -252 +253 @@
         char ports[128];
         char passwd[MAX_PATH_LENGTH];
-        char clutchDir[MAX_PATH_LENGTH];
-        char * clutchAlias;
+        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 );
 
-        tr_buildPath( clutchDir, sizeof( clutchDir ), tr_sessionGetConfigDir( server->session ), "clutch", NULL );
-        clutchAlias = tr_strdup_printf( "%s=%s", "/transmission/clutch", clutchDir );
-
+fprintf( stderr, "clutchAlias is [%s]\n", clutchAlias );
         getPasswordFile( server, passwd, sizeof( passwd ) );
         if( !server->isPasswordEnabled )