Changeset efe730d in sasview for src/sas/sasgui/guiframe/customdir.py

Timestamp:

Jun 25, 2016 4:07:33 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

899e084

Parents:

9501661

git-author:

Paul Kienzle <pkienzle@…> (06/25/16 02:23:59)

git-committer:

Paul Kienzle <pkienzle@…> (06/25/16 04:07:33)

Message:

move sasview to src/sas/sasview and refactor bundled apps for easier debugging

File:

• src/sas/sasgui/guiframe/customdir.py (modified) (2 diffs)

src/sas/sasgui/guiframe/customdir.py

@@ -1 +1 @@
 # Setup and find Custom config dir
 import sys
+import imp
 import os.path
+import logging
 import shutil
+
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
+from sas.sasgui import get_user_dir, get_app_dir
 
-CONF_DIR = 'config' 
-APPLICATION_NAME = 'sasview'
+def get_custom_config_path():
+    dirname = os.path.join(get_user_dir(), 'config')
+    # If the directory doesn't exist, create it
+    if not os.path.exists(dirname):
+        os.makedirs(dirname)
+    path = os.path.join(dirname, "custom_config.py")
+    return path
 
-def _find_usersasview_dir():
-    """
-    Find and return user/.sasview dir
-    """
-    dir = os.path.join(os.path.expanduser("~"), 
-                       ("." + APPLICATION_NAME))
-    return dir
 
-def _find_customconf_dir():
-    """
-    Find path of the config directory.
-    The plugin directory is located in the user's home directory.
-    """
-    u_dir = _find_usersasview_dir()
-    dir = os.path.join(u_dir, CONF_DIR)
-    
-    return dir
-
-def _setup_conf_dir(path):
+_config_cache = None
+def setup_custom_config():
     """
     Setup the custom config dir and cat file
     """
-    dir = _find_customconf_dir()
-    # If the plugin directory doesn't exist, create it
-    if not os.path.isdir(dir):
-        os.makedirs(dir)
-    file = os.path.join(dir, "custom_config.py")
+    global _config_cache
+    if not _config_cache:
+        _config_cache = _setup_custom_config()
+    return _config_cache
+
+
+def _setup_custom_config():
+    path = get_custom_config_path()
+    if not os.path.isfile(path):
+        # if the custom config file does not exist, copy the default from
+        # the app dir
+        try:
+            shutil.copyfile(os.path.join(get_app_dir(), "custom_config.py"),
+                            path)
+        except Exception:
+            #import traceback; logging.error(traceback.format_exc())
+            logging.error("Could not copy default custom config.")
+
+    custom_config = _load_config(path)
+
     cat_file = CategoryInstaller.get_user_file()
     # If the user category file doesn't exist copy the default to
@@ -44 +52 @@
                 shutil.copyfile(default_cat_file, cat_file)
             else:
-                print "Unable to find/copy default cat file"
-        except:
-            print "Unable to copy default cat file to the user dir."
+                logging.error("Unable to find/copy default cat file")
+        except Exception:
+            logging.error("Unable to copy default cat file to the user dir.")
 
-    # Place example user models as needed
-    try:
-        if not os.path.isfile(file):
-         shutil.copyfile(os.path.join(path, "custom_config.py"), file)
-    except:
-        # Check for data path next to exe/zip file.
-        #Look for maximum n_dir up of the current dir to find plugins dir
-        n_dir = 12
-        is_dir = False
-        f_dir = path
-        for i in range(n_dir):
-            if i > 1:
-                f_dir, _ = os.path.split(f_dir)
-            temp_path = os.path.join(f_dir, "custom_config.py")
-            if os.path.isfile(temp_path):
-                shutil.copyfile(temp_path, file)
-                is_dir = True
-                break
-        if not is_dir:
-            raise
-        
-    return dir
-  
-        
-class SetupCustom(object):
-    """
-    implement custom config dir
-    """
-    def find_dir(self):
-        return _find_customconf_dir()
-    
-    def setup_dir(self, path):
-        return _setup_conf_dir(path)
-    
+    return custom_config
 
-    
-    
-  
+
+def _load_config(path):
+    if os.path.exists(path):
+        try:
+            fObj = None
+            fObj, config_path, descr = imp.find_module('custom_config', [os.path.dirname(path)])
+            custom_config = imp.load_module('custom_config', fObj, config_path, descr)
+            logging.info("GuiManager loaded %s" % config_path)
+            return custom_config
+        except Exception:
+            logging.error("Error loading %s: %s" % (path, sys.exc_value))
+        finally:
+            if fObj is not None:
+                fObj.close()
+    from sas.sasview import custom_config
+    logging.info("GuiManager custom_config defaults to sas.sasview.custom_config")
+    return custom_config