Ticket #1406: download-dir.diff

libtransmission/utils.c

@@ -491 +491 @@
 }
 
 char*
-tr_getcwd( void )
-{
-    char buf[2048];
-    *buf = '\0';
-#ifdef WIN32
-    _getcwd( buf, sizeof( buf ) );
-#else
-    getcwd( buf, sizeof( buf ) );
-#endif
-    return tr_strdup( buf );
-}
-
-char*
 tr_basename( const char * path )
 {
     char * tmp = tr_strdup( path );

libtransmission/utils.h

@@ -144 +144 @@
 char*          tr_getLogTimeStr( char * buf,
                                  int    buflen );
 
-/** a portability wrapper for getcwd(). */
-char*          tr_getcwd( void ) TR_GNUC_MALLOC;
-
 /** a portability wrapper for basename(). */
 char*          tr_basename( const char * path ) TR_GNUC_MALLOC;
 

libtransmission/platform.c

@@ -483 +483 @@
     return s;
 }
 
+const char*
+tr_getDefaultDownloadDir( void )
+{
+    static char * s = NULL;
+
+    if( s == NULL )
+        s = tr_buildPath( getHomeDir( ), "Downloads", NULL );
+
+    return s;
+}
+
 /***
 ****
 ***/

libtransmission/transmission.h

@@ -62 +62 @@
  * - otherwise, if we're running on Darwin,
  *   "$HOME/Library/Application Support/Transmission" is returned.
  * - otherwise, if we're running on WIN32,
- *   "$EXE_FOLDER/Transmission" is returned.
+ *   SHGetFolderPath(CSIDL_APPDATA) + "/Transmission" is returned.
  * - otherwise, if XDG_CONFIG_HOME is set,
  *   "$XDG_CONFIG_HOME/transmission" is returned.
  * - lastly, $HOME/.config/transmission" is used.
  */
 const char* tr_getDefaultConfigDir( void );
 
+const char* tr_getDefaultDownloadDir( void );
+
 typedef struct tr_ctor tr_ctor;
 typedef struct tr_handle tr_handle;
 typedef struct tr_info tr_info;
@@ -98 +100 @@
 /** @see tr_sessionInitFull */
 #define TR_DEFAULT_CONFIG_DIR               tr_getDefaultConfigDir( )
 /** @see tr_sessionInitFull */
+#define TR_DEFAULT_DOWNLOAD_DIR             tr_getDefaultDownloadDir( )
+/** @see tr_sessionInitFull */
 #ifdef TR_EMBEDDED
  #define TR_DEFAULT_ENCRYPTION              TR_CLEAR_PREFERRED
 #else
@@ -285 +289 @@
 /** @brief Shorter form of tr_sessionInitFull()
     @deprecated Use tr_sessionInitFull() instead. */
 tr_handle *  tr_sessionInit( const char * configDir,
-                             const char * downloadDir,
                              const char * tag );
 
 /** @brief End a libtransmission session
@@ -306 +309 @@
  * @see tr_sessionGetDownloadDir()
  * @see tr_ctorSetDownloadDir()
  */
-void         tr_sessionSetDownloadDir(
-    tr_handle *,
-    const char *
-    downloadDir );
+void tr_sessionSetDownloadDir( tr_handle  * session,
+                               const char * downloadDir );
 
 /**
  * @brief Get the default download folder for new torrents.

libtransmission/session.c

@@ -305 +305 @@
 
 tr_handle *
 tr_sessionInit( const char * configDir,
-                const char * downloadDir,
                 const char * tag )
 {
     return tr_sessionInitFull( configDir,
-                               downloadDir,
+                               TR_DEFAULT_DOWNLOAD_DIR,
                                tag,
                                TR_DEFAULT_PEX_ENABLED,
                                TR_DEFAULT_PORT_FORWARDING_ENABLED,

gtk/tr-prefs.c

@@ -104 +104 @@
 #if GLIB_CHECK_VERSION( 2, 14, 0 )
     if( !str ) str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD );
 #endif
-    if( !str ) str = g_get_home_dir( );
+    if( !str ) str = tr_getDefaultDownloadDir( );
     pref_string_set_default ( PREF_KEY_DOWNLOAD_DIR, str );
 
     pref_int_set_default    ( PREF_KEY_PORT, TR_DEFAULT_PORT );

macosx/Controller.m

@@ -239 +239 @@
                                 TR_DEFAULT_PROXY_TYPE, /* reset in prefs */
                                 [fDefaults boolForKey: @"ProxyAuthorize"],
                                 [[fDefaults stringForKey: @"ProxyUsername"] UTF8String],
-                                ""); /* reset in prefs - from Keychain */
+                                "", /* reset in prefs - from Keychain */
+                                TR_DEFAULT_PREALLOCATE_ENABLED ); /* FIXME */
         
         [NSApp setDelegate: self];
         

daemon/daemon.c

@@ -167 +167 @@
               const char * password,
               int          blocklistEnabled )
 {
-    char        * mycwd;
     tr_benc       state, *dict = NULL;
     int           peerPort = -1, peers = -1;
     int           whitelistEnabled = -1;
@@ -190 +189 @@
     ****  If neither of those can be found, the TR_DEFAULT fields are used .
     ***/
 
-    mycwd = tr_getcwd( );
-    getConfigStr( dict, KEY_DOWNLOAD_DIR,    &downloadDir,       mycwd );
+    getConfigStr( dict, KEY_DOWNLOAD_DIR,    &downloadDir,
+                  TR_DEFAULT_DOWNLOAD_DIR );
     getConfigInt( dict, KEY_PEX_ENABLED,     &pexEnabled,
                   TR_DEFAULT_PEX_ENABLED );
     getConfigInt( dict, KEY_PORT_FORWARDING, &fwdEnabled,
@@ -258 +257 @@
 
     if( dict )
         tr_bencFree( &state );
-
-    tr_free( mycwd );
 }
 
 static const char *

daemon/remote.c

@@ -15 +15 @@
 #include <stdlib.h>
 #include <string.h> /* strcmp */
 
+#ifdef WIN32
+ #include <direct.h> /* getcwd */
+#else
+ #include <unistd.h> /* getcwd */
+#endif
+
 #include <libevent/event.h>
 #include <curl/curl.h>
 
@@ -144 +150 @@
 static char * auth = NULL;
 
 static char*
+tr_getcwd( void )
+{
+    char buf[2048];
+    *buf = '\0';
+#ifdef WIN32
+    _getcwd( buf, sizeof( buf ) );
+#else
+    getcwd( buf, sizeof( buf ) );
+#endif
+    return tr_strdup( buf );
+}
+
+static char*
 absolutify( const char * path )
 {
     char * buf;

cli/cli.c

@@ -349 +349 @@
     if( configdir == NULL )
         configdir = tr_getDefaultConfigDir( );
 
-    /* if no download directory specified, use cwd instead */
-    if( !downloadDir )
-        downloadDir = tr_strdup( tr_getcwd( ) );
+    if( downloadDir == NULL )
+        downloadDir = tr_getDefaultDownloadDir( );
 
     /* Initialize libtransmission */
     h = tr_sessionInitFull(