Merge lp:~ploum-deactivatedaccount/serpentine/xdg_folders into lp:serpentine

[Lionel Dricot]

[Lionel Dricot (ploum-deactivatedaccount)]

This patch changes the config dir from .serpentine to $XDG_CONFIG_HOME.

As no critical informations are in the current .serpentine, there's no migration plan involved, I think it's a bit overkill to have a migration plan only for the playlist.xml.

[Tiago Cogumbreiro (cogumbreiro)]

> This patch changes the config dir from .serpentine to $XDG_CONFIG_HOME.
>
> As no critical informations are in the current .serpentine, there's no
> migration plan involved, I think it's a bit overkill to have a migration plan
> only for the playlist.xml.

In this project we try to make dependencies optional when feasible.

If the import of 'xdg.BaseDirectory' fails, then I would like the algorithm to fall back to the old method.

Could you do that?

review: Needs Resubmitting

[Lionel Dricot (ploum-deactivatedaccount)]

I don't think that a linux distribution without python-xdg still exists but, anyway, I did make the dependancies optionnal.

[Tiago Cogumbreiro (cogumbreiro)]

Thanks for the alteration.

The code should follow PEP 008. This means the test is wrong and the code style of that if has an extra white space before the colon.

Could you please fix that?

review: Needs Fixing

Unmerged revisions

166. By Lionel Dricot on 2009-07-27

oops, wrong folder

165. By Lionel Dricot on 2009-07-27

xdg is now optionnal

164. By Lionel Dricot on 2009-07-23

playlist are now in XDG folder

=== modified file 'serpentine/preferences.py'
--- serpentine/preferences.py	2008-03-03 18:30:50 +0000
+++ serpentine/preferences.py	2009-07-27 15:19:08 +0000
@@ -25,6 +25,10 @@
 from os import path
 from types import StringType
 from gettext import gettext as _
+try :
+    from xdg.BaseDirectory import xdg_data_home, xdg_config_home
+except :
+    xdg_config_home = None
 
 # Local imports
 import gaw
@@ -312,7 +316,10 @@
     
     ############
     # configDir
-    __config_dir = path.join (path.expanduser ("~"), ".serpentine")
+    if xdg_config_home :
+        __config_dir = path.join (xdg_config_home, "serpentine/")
+    else :
+        __config_dir = path.join (path.expanduser ("~"), ".serpentine")
     def getConfigDir (self):
         return self.__config_dir