mirror of
https://github.com/transmission/transmission
synced 2024-12-26 17:47:37 +00:00
(trunk libT) #1957: tr_getDownloadDir() should honor XDG
This commit is contained in:
parent
cc6eff1555
commit
fa7f320f5b
1 changed files with 58 additions and 4 deletions
|
@ -40,6 +40,7 @@
|
||||||
#include <unistd.h> /* getuid getpid close */
|
#include <unistd.h> /* getuid getpid close */
|
||||||
|
|
||||||
#include "transmission.h"
|
#include "transmission.h"
|
||||||
|
#include "ggets.h"
|
||||||
#include "session.h"
|
#include "session.h"
|
||||||
#include "list.h"
|
#include "list.h"
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
@ -443,15 +444,68 @@ tr_getDefaultConfigDir( const char * appname )
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This was stolen from gthumb, though it probably originates from
|
||||||
|
* xdg-user-dirs's xdg-user-dir-lookup.c. See:
|
||||||
|
* http://www.redhat.com/archives/fedora-devel-list/2007-March/msg00677.html
|
||||||
|
*/
|
||||||
const char*
|
const char*
|
||||||
tr_getDefaultDownloadDir( void )
|
tr_getDefaultDownloadDir( void )
|
||||||
{
|
{
|
||||||
static char * s = NULL;
|
static char * user_dir = NULL;
|
||||||
|
|
||||||
if( s == NULL )
|
#ifdef SYS_DARWIN
|
||||||
s = tr_buildPath( getHomeDir( ), "Downloads", NULL );
|
|
||||||
|
|
||||||
return s;
|
user_dir = tr_buildPath( getHomeDir( ), "Downloads", NULL );
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
if( user_dir == NULL )
|
||||||
|
{
|
||||||
|
const char * config_home;
|
||||||
|
char * config_file;
|
||||||
|
char * content;
|
||||||
|
size_t content_len;
|
||||||
|
|
||||||
|
/* figure out where to look for user-dirs.dirs */
|
||||||
|
config_home = getenv( "XDG_CONFIG_HOME" );
|
||||||
|
if( config_home && *config_home )
|
||||||
|
config_file = tr_buildPath( config_home, "user-dirs.dirs", NULL );
|
||||||
|
else
|
||||||
|
config_file = tr_buildPath( getHomeDir( ), ".config", "user-dirs.dirs", NULL );
|
||||||
|
|
||||||
|
/* read in user-dirs.dirs and look for the download dir entry */
|
||||||
|
content = (char *) tr_loadFile( config_file, &content_len );
|
||||||
|
if( content && content_len>0 )
|
||||||
|
{
|
||||||
|
const char * key = "XDG_DOWNLOAD_DIR=\"";
|
||||||
|
char * line = strstr( content, key );
|
||||||
|
if( line != NULL )
|
||||||
|
{
|
||||||
|
char * value = line + strlen( key );
|
||||||
|
char * end = strchr( value, '"' );
|
||||||
|
|
||||||
|
if( end )
|
||||||
|
{
|
||||||
|
*end = '\0';
|
||||||
|
|
||||||
|
if( !memcmp( value, "$HOME/", 6 ) )
|
||||||
|
user_dir = tr_buildPath( getHomeDir( ), value+6, NULL );
|
||||||
|
else
|
||||||
|
user_dir = tr_strdup( value );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if( user_dir == NULL )
|
||||||
|
user_dir = tr_buildPath( getHomeDir( ), "Downloads", NULL );
|
||||||
|
|
||||||
|
tr_free( content );
|
||||||
|
tr_free( config_file );
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return user_dir;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***
|
/***
|
||||||
|
|
Loading…
Reference in a new issue