Changeset 16f32e1500887c0dcd33cb06ad71759a81a52878

Timestamp:

09/09/07 18:10:45 (10 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1189354245 +0000

git-parent:

[e8f97c66ab6815875ab48a03fe768faee3ca5b3f]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1189354245 +0000

Message:

On OSes other than Windows, Mac OS X and BeOS (so it's Linux) comply with the XDG Base Directory Specification version 0.6. The old configuration file (vlcrc) will be copied to the new location. Other data like caches will have to be rebuilt (the album art cache in VLC was new in 0.9.0 so it's ok to lose it). Closes #1267

Files:

• NEWS (modified) (1 diff)
• include/main.h (modified) (1 diff)
• include/vlc_config.h (modified) (1 diff)
• modules/access_filter/record.c (modified) (1 diff)
• modules/control/http/util.c (modified) (1 diff)
• modules/gui/skins2/win32/win32_factory.cpp (modified) (1 diff)
• modules/gui/skins2/x11/x11_factory.cpp (modified) (1 diff)
• modules/misc/gnutls.c (modified) (3 diffs)
• modules/misc/logger.c (modified) (1 diff)
• modules/misc/lua/vlclua.c (modified) (1 diff)
• src/control/media_library.c (modified) (1 diff)
• src/input/meta.c (modified) (2 diffs)
• src/libvlc-common.c (modified) (2 diffs)
• src/modules/configuration.c (modified) (7 diffs)
• src/modules/configuration.h (modified) (1 diff)
• src/modules/modules.c (modified) (6 diffs)
• src/playlist/loadsave.c (modified) (4 diffs)
• src/video_output/vout_intf.c (modified) (2 diffs)

NEWS

@@ -112 +112 @@
-     finished: http://wiki.xmms2.xmms.se/index.php/Media_Player_Interfaces .
-   * Motion module use disk accelerometers to keep video horizontal
+
+Linux Port:
+ * VLC now complies with the XDG Base Directory Specification version 0.6
+   http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
+   (which means that VLC doesn't use the $HOME/.vlc directory anymore)
-
-Capture:

include/main.h

@@ -39 +39 @@
-    int                    i_argc;           ///< command line arguments count
-    char **                ppsz_argv;        ///< command line arguments
-
-
+
+
+
+
+
-    char *                 psz_configfile;   ///< location of config file
-

include/vlc_config.h

@@ -48 +48 @@
- * outputting an error message (in second) */
-#define THREAD_COND_TIMEOUT             1
-
-/* The configuration file and directory */
-#if defined (SYS_BEOS)
-#  define CONFIG_DIR                    "config/settings/VideoLAN Client"
-#elif defined (__APPLE__)
-#  define CONFIG_DIR                    "Library/Preferences/VLC"
-#elif defined( WIN32 ) || defined( UNDER_CE )
-#  define CONFIG_DIR                    "vlc"
-#else
-#  define CONFIG_DIR                    ".vlc"
-#endif
-#define CONFIG_FILE                     "vlcrc"
-#define PLUGINSCACHE_DIR                "cache"
-
-/*****************************************************************************

modules/access_filter/record.c

@@ -149 +149 @@
-    {
-        free( psz );
-
+ /* XXX: This should never happen */
-            psz = strdup( p_access->p_libvlc->psz_homedir );
-    }

modules/control/http/util.c

@@ -990 +990 @@
-        char *dir;
-        /* This is incomplete : we should also support the ~cmassiot/ syntax. */
-user
+home
-        free( psz_dir );
-        psz_dir = dir;

modules/gui/skins2/win32/win32_factory.cpp

@@ -226 +226 @@
-
-    // Initialize the resource path
-home
-" + CONFIG_DIR + "\\
-
+data
+
+d
-                              "\\skins" );
-    m_resourcePath.push_back( (string)config_GetDataDir() +

modules/gui/skins2/x11/x11_factory.cpp

@@ -72 +72 @@
-
-    // Initialize the resource path
-home
-m_dirSep + CONFIG_DIR
+data
+                     
-    m_resourcePath.push_back( (string)"share/skins2" );
-    m_resourcePath.push_back( (string)DATA_PATH + "/skins2" );

modules/misc/gnutls.c

@@ -703 +703 @@
-    vlc_object_attach( p_session, p_tls );
-
-home
+data
-               *datadir = config_GetDataDir ();
-    size_t l1 = strlen (homedir), l2 = strlen (datadir);
-"CONFIG_DIR"/
-"CONFIG_DIR"/
+
+
-    //                              > sizeof ("/ca-certificates.crt")
-
@@ -720 +720 @@
-    if (var_CreateGetBool (p_tls, "tls-check-cert"))
-    {
-"CONFIG_DIR"/
+
-        gnutls_Addx509Directory ((vlc_object_t *)p_session,
-                                  p_sys->x509_cred, path, VLC_FALSE);
@@ -732 +732 @@
-        p_session->pf_handshake2 = gnutls_ContinueHandshake;
-
-"CONFIG_DIR"/
+
-    gnutls_Addx509Directory ((vlc_object_t *)p_session, p_sys->x509_cred,
-                             path, VLC_TRUE);

modules/misc/logger.c

@@ -202 +202 @@
-            char *psz_homedir = p_this->p_libvlc->psz_homedir;
-
-
+ /* XXX: This should never happen */
-            {
-                msg_Err( p_this, "unable to find home directory" );

modules/misc/lua/vlclua.c

@@ -246 +246 @@
-    char **ppsz_dir;
-
-CONFIG_DIR DIR_SEP "%s", p_this->p_libvlc->psz_homedir
-
+"%s"
+       p_this->p_libvlc->psz_datadir, 
-        return VLC_ENOMEM;
-

src/control/media_library.c

@@ -89 +89 @@
-                           libvlc_exception_t * p_e )
-{
-homedir = p_mlib->p_libvlc_instance->p_libvlc_int->psz_home
+datadir = p_mlib->p_libvlc_instance->p_libvlc_int->psz_data
-    char * psz_uri;
-
-homedir )
+datadir ) /* XXX: i doubt that this can ever happen */
-    {
-HOME DIR
+data directory
-        return;
-    }
-
-CONFIG_DIR DIR_SEP
-      "ml.xsp", psz_home
+"ml.xsp",
+psz_data
-    {
-        libvlc_exception_raise( p_e, "Can't get create the path" );

src/input/meta.c

@@ -274 +274 @@
-        char * psz_artist_sanitized = ArtCacheGetSanitizedFileName( psz_artist );
-
- CONFIG_DIR DIR_SEP
+
-                  "art" DIR_SEP "artistalbum" DIR_SEP "%s" DIR_SEP "%s",
-home
+data
-                      psz_artist_sanitized, psz_album_sanitized );
-        free( psz_album_sanitized );
@@ -284 +284 @@
-    {
-        char * psz_title_sanitized = ArtCacheGetSanitizedFileName( psz_title );
- CONFIG_DIR DIR_SEP
+
-                  "art" DIR_SEP "title" DIR_SEP "%s",
-home
+data
-                  psz_title_sanitized );
-        free( psz_title_sanitized );

src/libvlc-common.c

@@ -326 +326 @@
-
-    /* Set the config file stuff */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    /* Check for plugins cache options */
@@ -1068 +1053 @@
-
-    FREENULL( p_libvlc->psz_homedir );
-
+
+
-    FREENULL( p_libvlc->psz_configfile );
-    FREENULL( p_libvlc->p_hotkeys );

src/modules/configuration.c

@@ -85 +85 @@
-int IsConfigStringType (int type)
-{
- 
+
-    {
-        CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE,
@@ -99 +99 @@
-static int IsConfigIntegerType (int type)
-{
- 
+
-    {
-        CONFIG_ITEM_INTEGER, CONFIG_ITEM_KEY, CONFIG_ITEM_BOOL,
@@ -787 +787 @@
-static FILE *config_OpenConfigFile( vlc_object_t *p_obj, const char *mode )
-{
-
-
-
-
+
-    FILE *p_stream;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-
-    msg_Dbg( p_obj, "opening config file (%s)", psz_filename );
+
-    p_stream = utf8_fopen( psz_filename, mode );
-    if( p_stream == NULL && errno != ENOENT )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return p_stream;
@@ -1018 +1051 @@
-    if( utf8_mkdir( psz_dirname ) && ( errno != EEXIST ) )
-    {
+        if( errno == ENOENT )
+        {
+            /* Let's try to create the parent directory */
+            char *psz_parent = strdup( psz_dirname );
+            char *psz_end = strrchr( psz_parent, DIR_SEP_CHAR );
+            if( psz_end && psz_end != psz_parent )
+            {
+                *psz_end = '\0';
+                if( config_CreateDir( p_this, psz_parent ) == 0 )
+                {
+                    if( !utf8_mkdir( psz_dirname ) )
+                    {
+                        free( psz_parent );
+                        return 0;
+                    }
+                }
+            }
+            free( psz_parent );
+        }
-        msg_Err( p_this, "could not create %s (%s)",
-                 psz_dirname, strerror(errno) );
@@ -1060 +1112 @@
-    vlc_mutex_lock( &p_this->p_libvlc->config_lock );
-
- (p_this->p_libvlc->psz_configfile == NULL
-
-homedir = p_this->p_libvlc->psz_home
-homedir )
-
-home
+( p_this->p_libvlc->psz_configfile == NULL 
+
+configdir = p_this->p_libvlc->psz_config
+configdir ) /* XXX: This should never happen */
+
+configuration
-            vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
-            return -1;
-        }
-
-
-
-
-
-
-
-
+
+
+
+
+
-    {
-        /* look for file size */
@@ -1579 +1629 @@
-                        return -1;
-                    }
-
+
-                    psz_name = (char *)p_conf->psz_current;
-                    p_conf = config_FindConfig( p_this, psz_name );
@@ -1816 +1866 @@
-}
-
+/**
+ * Get the user's home directory
+ */
-char *config_GetHomeDir( void )
-{
+    return GetDir( VLC_FALSE );
+}
+
+/**
+ * Get the user's main data and config directory:
+ *   - on windows that's the App Data directory;
+ *   - on other OSes it's the same as the home directory.
+ */
+char *config_GetUserDir( void );
+char *config_GetUserDir( void )
+{
-    return GetDir( VLC_TRUE );
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static int ConfigStringToKey( const char *psz_key )

src/modules/configuration.h

@@ -34 +34 @@
-
-void config_SetCallbacks( module_config_t *, module_config_t *, size_t );
- 
+
-
-#define config_LoadCmdLine(a,b,c,d) __config_LoadCmdLine(VLC_OBJECT(a),b,c,d)
-#define config_LoadConfigFile(a,b) __config_LoadConfigFile(VLC_OBJECT(a),b)
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# ifdef __cplusplus

src/modules/modules.c

@@ -1666 +1666 @@
-static void CacheLoad( vlc_object_t *p_this )
-{
-home
+data
-    FILE *file;
-    int i, j, i_size, i_read;
@@ -1676 +1676 @@
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-homedir = p_this->p_libvlc->psz_home
-homedir )
-
-psz_homedir is null
-
-
-
-DIR_SEP"%s"
-homedir, CONFIG_DIR
+datadir = p_this->p_libvlc->psz_data
+datadir ) /* XXX: this should never happen */
+
+Unable to get cache directory
+
+
+
+
+datadir
-    if( i_size <= 0 )
-    {
@@ -2023 +2023 @@
-        "#   http://www.brynosaurus.com/cachedir/\r\n";
-
-home
+data
-    FILE *file;
-    int i, j, i_cache;
@@ -2030 +2030 @@
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    psz_filename =
-CONFIG_DIR DIR_SEP 
-home
+
+data
-
-    if( !psz_filename )
@@ -2046 +2047 @@
-    }
-
-DIR_SEP"%s", psz_homedir, CONFIG_DIR
+, psz_datadir
-
-    config_CreateDir( p_this, psz_filename );
@@ -2063 +2064 @@
-    }
-
-DIR_SEP"%s", psz_homedir, CONFIG_DIR
+, psz_datadir
-             PLUGINSCACHE_DIR, CacheName() );
-

src/playlist/loadsave.c

@@ -90 +90 @@
-int playlist_MLLoad( playlist_t *p_playlist )
-{
-homedir = p_playlist->p_libvlc->psz_home
+datadir = p_playlist->p_libvlc->psz_data
-    char *psz_uri = NULL;
-    input_item_t *p_input;
-
-    if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
-homedir )
+datadir ) /* XXX: This should never happen */
-    {
-home
+data
-        return VLC_EGENERIC;
-    }
-
-
-
+
-    {
-        psz_uri = NULL;
@@ -116 +115 @@
-    free( psz_uri );
-
-CONFIG_DIR DIR_SEP
-      "ml.xsp", psz_home
+"ml.xsp",
+psz_data
-    {
-        psz_uri = NULL;
@@ -147 +146 @@
-int playlist_MLDump( playlist_t *p_playlist )
-{
-homedir = p_playlist->p_libvlc->psz_home
+datadir = p_playlist->p_libvlc->psz_data
-    if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
-homedir )
+datadir ) /* XXX: This should never happen */
-    {
-home
+data
-        return VLC_EGENERIC;
-    }
-
-home
-CONFIG_DIR DIR_SEP 
- DIR_SEP CONFIG_DIR, psz_home
+data
+
+, psz_data
-    if( config_CreateDir( (vlc_object_t *)p_playlist, psz_dirname ) )
-    {
@@ -164 +163 @@
-
-    strcat( psz_dirname, DIR_SEP "ml.xsp" );
-
+
-    stats_TimerStart( p_playlist, "ML Dump", STATS_TIMER_ML_DUMP );
-    playlist_Export( p_playlist, psz_dirname, p_playlist->p_ml_category,

src/video_output/vout_intf.c

@@ -620 +620 @@
-        if( p_mypicturesdir == NULL )
-        {
-\\" CONFIG_DIR
+"
-                          p_vout->p_libvlc->psz_homedir ) == -1 )
-                val.psz_string = NULL;
@@ -633 +633 @@
-
-#else
-
-
-
-
+
+
+
+
+
+
-            val.psz_string = NULL;
-    }