Changeset 8ab3302 in sasview for sansguiframe/src/sans

Timestamp:

Dec 22, 2011 11:55:32 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

273801b

Parents:

7983000f

Message:

fixed a little bit the setting of .sansview folder

File:

• sansguiframe/src/sans/guiframe/customdir.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/customdir.py

@@ -12 +12 @@
     The plugin directory is located in the user's home directory.
     """
-    dir = os.path.join(os.path.expanduser("~"), ("." + APPLICATION_NAME), CONF_DIR)
+    dir = os.path.join(os.path.expanduser("~"), 
+                       ("." + APPLICATION_NAME), CONF_DIR)
     
     return dir
@@ -26 +27 @@
     file = os.path.join(dir, "custom_config.py")
     # Place example user models as needed
-    if not os.path.isfile(file):
-        shutil.copyfile(os.path.join(path, "custom_config.py"), file)
+    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