Merge pull request #188 from sometoby/master

.travis.yml

@@ -36,7 +36,7 @@ install:
 
 before_deploy:
 #- travis/cache-homebrew
-- pip2 install dmgbuild
+- pip install dmgbuild
 - mkdir dist_dmg
 - mv resources/macos_vlc_install.command resources/.macos_vlc_install.command
 - mv resources/lua/intf/syncplay.lua resources/lua/intf/.syncplay.lua

syncplay/constants.py

@@ -8,8 +8,7 @@ MPC_OSD_POSITION = 1  #Right corner, 1 for left
 MPLAYER_OSD_LEVEL = 1
 UI_TIME_FORMAT = "[%X] "
 CONFIG_NAMES = [".syncplay", "syncplay.ini"]  #Syncplay searches first to last
-DEFAULT_CONFIG_NAME_WINDOWS = "syncplay.ini"
+DEFAULT_CONFIG_NAME = "syncplay.ini"
-DEFAULT_CONFIG_NAME_LINUX = ".syncplay"
 RECENT_CLIENT_THRESHOLD = "1.5.3"  #This and higher considered 'recent' clients (no warnings)
 WARN_OLD_CLIENTS = True  #Use MOTD to inform old clients to upgrade
 LIST_RELATIVE_CONFIGS = True  # Print list of relative configs loaded

syncplay/ui/ConfigurationGetter.py

@@ -322,21 +322,29 @@ class ConfigurationGetter(object):
 
     def _getConfigurationFilePath(self):
         configFile = self._checkForPortableFile()
-        if not configFile:
+        if configFile:
-            for name in constants.CONFIG_NAMES:
+            return configFile
-                if configFile and os.path.isfile(configFile):
+        for name in constants.CONFIG_NAMES:
-                    break
+            configFile = self._expandConfigPath(name, xdg = False)
-                if os.name <> 'nt':
+            if os.path.isfile(configFile):
-                    configFile = os.path.join(os.getenv('HOME', '.'), name)
+                return configFile
-                else:
+        return self._expandConfigPath()
-                    configFile = os.path.join(os.getenv('APPDATA', '.'), name)
-            if configFile and not os.path.isfile(configFile):
-                if os.name <> 'nt':
-                    configFile = os.path.join(os.getenv('HOME', '.'), constants.DEFAULT_CONFIG_NAME_LINUX)
-                else:
-                    configFile = os.path.join(os.getenv('APPDATA', '.'), constants.DEFAULT_CONFIG_NAME_WINDOWS)
 
-        return configFile
+    def _expandConfigPath(self, name = None, xdg = True):
+        if os.name != 'nt':
+            if xdg:
+                prefix = self._getXdgConfigHome()
+            else:
+                prefix = os.getenv('HOME', '.')
+        else:
+            prefix = os.getenv('APPDATA', '.')
+        return os.path.join(prefix, name or constants.DEFAULT_CONFIG_NAME)
+
+    def _getXdgConfigHome(self):
+        path = os.getenv('XDG_CONFIG_HOME', os.path.expanduser('~/.config'))
+        if not os.path.isdir(path):
+            os.mkdir(path, 0o755)
+        return path
 
     def _parseConfigFile(self, iniPath, createConfig=True):
         parser = SafeConfigParserUnicode()