Changeset 1244 for trunk/src/org/expeditee/settings/UserSettings.java

Timestamp:

03/17/19 22:29:23 (5 years ago)

Author:

davidb

Message:

After change to have resources-public and resources-private, some changes needed to support running Expeditee for a single user; other main change is to allow FrameDirs to specify relative directory paths, to help with when Expeditee is run on the cloud -- similar work still needs to occurr for ImageDir and AudioDir; some other minor changes also made.

File:

• trunk/src/org/expeditee/settings/UserSettings.java (modified) (7 diffs)

trunk/src/org/expeditee/settings/UserSettings.java

@@ -27 +27 @@
 import java.util.List;
 
+import org.apollo.io.AudioPathManager;
 import org.expeditee.agents.SearchGreenstone;
 import org.expeditee.agents.mail.MailSession;
@@ -53 +54 @@
         public static String DEFAULT_PROFILE_NAME = "default";
          
-        public static Boolean multiUserMode;
+        public static Boolean PublicAndPrivateResources;
         
         public static final IntegerSetting Gravity = new IntegerSetting("Distance the cursor has to be from a text item to select the text item", "Gravity", 3);
@@ -70 +71 @@
                 }
                 String first = FrameUtils.getLink(text, UserSettings.HomeFrame.get());
-                // do not use non-existant frames as the first frame
+                // do not use non-existent frames as the first frame
                 if (FrameIO.isValidFrameName(first)) {
                         _value = first;
@@ -203 +204 @@
         static {
                 // Are we in the new regime or the old regime? 
-                File resFile = Paths.get(getDesiredExpediteeHome()).resolve(".res").toFile();
-                File resourcesPrivateFile = Paths.get(getDesiredExpediteeHome() + "resources-private" + File.separator).toFile();
+                File resFile = Paths.get(getExpediteeHome()).resolve(".res").toFile();
+                File resourcesPrivateFile = Paths.get(getExpediteeHome() + "resources-private" + File.separator).toFile();
                 if (resourcesPrivateFile.exists()) {
-                        // If resources-private exists than this is a good sign we have new regime available.
-                        multiUserMode = Boolean.TRUE;
-                } else if (resFile.exists()) {
+                        // If resources-private exists then this is a good sign we have new regime available.
+                        PublicAndPrivateResources = Boolean.TRUE;
+                } 
+                else if (resFile.exists()) {
                         // If we do not, but do have the .res file then this is a good sign we are in old regime.
-                        multiUserMode = Boolean.FALSE;
-                } else {
+                        PublicAndPrivateResources = Boolean.FALSE;
+                } 
+                else {
                         // If we have neither then we are unpacking and therefore will have new regime available once unpacked.
-                        multiUserMode = Boolean.TRUE;
+                        PublicAndPrivateResources = Boolean.TRUE;
                 }
                 
@@ -219 +222 @@
         }
                 
-        public static void setupDefaultFolders() {              
-                FrameIO.changeParentFolder(getDesiredExpediteeHome());
-          
+        public static void setupDefaultFolders() {
+                String expeditee_home = getExpediteeHome();
+
+                FrameIO.changeParentAndSubFolders(expeditee_home);
+
                 FolderSettings.FrameDirs.get().clear();
                 FolderSettings.ImageDirs.get().clear();
+                FolderSettings.AudioDirs.get().clear();
                 appendDefaultFolders();
-        }
-
-        private static String getDesiredExpediteeHome() {
-                String homeProperty = System.getProperty("expeditee.home");
-                String expeditee_home = homeProperty == null ? getSaveLocation() : homeProperty + File.separator;
+                
+        }
+
+        private static String getExpediteeHome() {
+                String home_property = System.getProperty("expeditee.home");
+                String expeditee_home = (home_property != null) ? home_property + File.separator : getSaveLocation();
                 return expeditee_home;
         }
 
         public static void appendDefaultFolders() {
-                if (multiUserMode) {
+                if (PublicAndPrivateResources) {
                         // The comments here explain how things have changed with the new regime.
                         // FrameDirs
@@ -244 +251 @@
                         // 6. MESSAGES_PATH                                     Still points to same place.  Should these be per user and encrypted?
                         // 7. PUBLIC_PATH                                       Still points to same place.  Kept for compatibility.
-                        FolderSettings.FrameDirs.get().add(FrameIO.PROFILE_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.FRAME_PRIVATE_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.SHARED_FRAMESETS_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.FRAME_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.RESOURCES_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.MESSAGES_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.PUBLIC_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PRIVATE_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.RESOURCES_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
                         FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
                                                 
@@ -259 +266 @@
                         FolderSettings.ImageDirs.get().add(FrameIO.IMAGES_PATH);
                         FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
+                        
+                        FolderSettings.AudioDirs.get().add(FrameIO.AUDIO_PRIVATE_PATH);
+                        FolderSettings.AudioDirs.get().add(FrameIO.AUDIO_PATH);
+                        FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
+                        
                 } else {
-                        FolderSettings.FrameDirs.get().add(FrameIO.FRAME_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.PUBLIC_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.PROFILE_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.HELP_PATH);
-                        FolderSettings.FrameDirs.get().add(FrameIO.MESSAGES_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
                         FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
+
                         FolderSettings.ImageDirs.get().add(FrameIO.IMAGES_PATH);
                         FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
+                        
+                        FolderSettings.AudioDirs.get().add(FrameIO.AUDIO_PATH);
+                        FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
                 }
         }