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

Timestamp:

Oct 7, 2016 5:11:40 PM (8 years ago)

Author:

mathieu

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57

Parents:

60df6c1

Message:

Pull categories from models. Get rid of default categories. Fixes #535

File:

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

src/sas/sasgui/guiframe/customdir.py

@@ -1 +1 @@
 # Setup and find Custom config dir
-import sys
 import os.path
 import shutil
-from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 
 CONF_DIR = 'config' 
@@ -12 +10 @@
     Find and return user/.sasview dir
     """
-    dir = os.path.join(os.path.expanduser("~"), 
-                       ("." + APPLICATION_NAME))
-    return dir
+    return os.path.join(os.path.expanduser("~"), ("." + APPLICATION_NAME))
 
 def _find_customconf_dir():
@@ -22 +18 @@
     """
     u_dir = _find_usersasview_dir()
-    dir = os.path.join(u_dir, CONF_DIR)
-    
-    return dir
+    return os.path.join(u_dir, CONF_DIR)
 
 def _setup_conf_dir(path):
@@ -30 +24 @@
     Setup the custom config dir and cat file
     """
-    dir = _find_customconf_dir()
+    conf_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")
-    cat_file = CategoryInstaller.get_user_file()
-    # If the user category file doesn't exist copy the default to
-    # the user directory
-    if not os.path.isfile(cat_file):
-        try:
-            default_cat_file = CategoryInstaller.get_default_file()
-            if os.path.isfile(default_cat_file):
-                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."
+    if not os.path.isdir(conf_dir):
+        os.makedirs(conf_dir)
+    config_file = os.path.join(conf_dir, "custom_config.py")
 
     # Place example user models as needed
     try:
-        if not os.path.isfile(file):
-         shutil.copyfile(os.path.join(path, "custom_config.py"), file)
+        if not os.path.isfile(config_file):
+            shutil.copyfile(os.path.join(path, "custom_config.py"), config_file)
     except:
         # Check for data path next to exe/zip file.
@@ -63 +45 @@
             temp_path = os.path.join(f_dir, "custom_config.py")
             if os.path.isfile(temp_path):
-                shutil.copyfile(temp_path, file)
+                shutil.copyfile(temp_path, config_file)
                 is_dir = True
                 break
         if not is_dir:
             raise
-        
-    return dir
-  
-        
+    return conf_dir
+
+
 class SetupCustom(object):
     """
@@ -81 +62 @@
     def setup_dir(self, path):
         return _setup_conf_dir(path)
-    
-
-    
-    
-