json, icon, and misc fixes and improvements made to ejpi/gonvert

[gc-dialer] / dialcentral / util / linux.py

diff --git a/dialcentral/util/linux.py b/dialcentral/util/linux.py
index 4e77445..21bf959 100644 (file)
--- a/dialcentral/util/linux.py
+++ b/dialcentral/util/linux.py
@@ -28,13 +28,13 @@ def set_process_name(name):
                _moduleLogger.warning('Unable to set processName: %s" % e')
 
 
                _moduleLogger.warning('Unable to set processName: %s" % e')
 
 

-def get_new_resource(resourceType, resource, name):
+def _get_xdg_path(resourceType):

        if BaseDirectory is not None:
                if resourceType == "data":
                        base = BaseDirectory.xdg_data_home
                        if base == "/usr/share/mime":
                                # Ugly hack because somehow Maemo 4.1 seems to be set to this
        if BaseDirectory is not None:
                if resourceType == "data":
                        base = BaseDirectory.xdg_data_home
                        if base == "/usr/share/mime":
                                # Ugly hack because somehow Maemo 4.1 seems to be set to this

-                               base = os.path.join(os.path.expanduser("~"), ".%s" % resource)
+                               base = None

                elif resourceType == "config":
                        base = BaseDirectory.xdg_config_home
                elif resourceType == "cache":
                elif resourceType == "config":
                        base = BaseDirectory.xdg_config_home
                elif resourceType == "cache":

@@ -42,10 +42,26 @@ def get_new_resource(resourceType, resource, name):
                else:
                        raise RuntimeError("Unknown type: "+resourceType)
        else:
                else:
                        raise RuntimeError("Unknown type: "+resourceType)
        else:

+               base = None
+
+       return base
+
+
+def get_resource_path(resourceType, resource, name = None):
+       base = _get_xdg_path(resourceType)
+       if base is not None:
+               dirPath = os.path.join(base, resource)
+       else:

                base = os.path.join(os.path.expanduser("~"), ".%s" % resource)
                base = os.path.join(os.path.expanduser("~"), ".%s" % resource)

+               dirPath = base
+       if name is not None:
+               dirPath = os.path.join(dirPath, name)
+       return dirPath
+

 
 

-       filePath = os.path.join(base, resource, name)
-       dirPath = os.path.dirname(filePath)
+def get_new_resource(resourceType, resource, name):
+       dirPath = get_resource_path(resourceType, resource)
+       filePath = os.path.join(dirPath, name)

        if not os.path.exists(dirPath):
                # Looking before I leap to not mask errors
                os.makedirs(dirPath)
        if not os.path.exists(dirPath):
                # Looking before I leap to not mask errors
                os.makedirs(dirPath)

@@ -54,17 +70,7 @@ def get_new_resource(resourceType, resource, name):
 
 
 def get_existing_resource(resourceType, resource, name):
 
 
 def get_existing_resource(resourceType, resource, name):

-       if BaseDirectory is not None:
-               if resourceType == "data":
-                       base = BaseDirectory.xdg_data_home
-               elif resourceType == "config":
-                       base = BaseDirectory.xdg_config_home
-               elif resourceType == "cache":
-                       base = BaseDirectory.xdg_cache_home
-               else:
-                       raise RuntimeError("Unknown type: "+resourceType)
-       else:
-               base = None
+       base = _get_xdg_path(resourceType)

 
        if base is not None:
                finalPath = os.path.join(base, name)
 
        if base is not None:
                finalPath = os.path.join(base, name)