Changeset 1244 for trunk/src/org/expeditee/gui

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.

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (5 diffs)
• DisplayController.java (modified) (1 diff)
• FrameIO.java (modified) (15 diffs)
• FrameUtils.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -22 +22 @@
 import java.io.IOException;
 import java.net.Authenticator;
+import java.nio.file.Path;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -148 +149 @@
         public static boolean _hasExited = false;
 
+        public static String USER_NOBODY = "nobody";
+        
         /** A flag which is set once the application is exiting. */
         protected boolean _isExiting = false;
@@ -154 +157 @@
         
         private static String _startFrame = null;
+
 
         /**
@@ -162 +166 @@
         public static void main(String[] args)
         {
+                if (Boolean.getBoolean("auth")) {
+                        String starting_user_name = System.getProperty("user.name");
+                        System.setProperty("startinguser.name", starting_user_name);
+                        System.setProperty("user.name", USER_NOBODY);
+                }
+                
                 // Parse the starting frame command-line argument
                 if(args.length > 0) {
@@ -261 +271 @@
                 Frame userProfile = loadProfiles();
 
+                if (!Boolean.getBoolean("auth")) {
+                        String userName = UserSettings.ProfileName.get();
+                        FrameIO.setupPersonalResources(userName);
+                }
                 // Listen for save status to display during and after runtime
                 EntitySaveManager.getInstance().addSaveStateChangedEventListener(this);

trunk/src/org/expeditee/gui/DisplayController.java

@@ -68 +68 @@
                 RIGHT
         }
-
+        
+        // To help title calculations on frame
+        public static final int MINIMUM_FRAME_WIDTH = 512;
+        
         /** Convenience definition of TwinFramesSide.LEFT. */
         public static final TwinFramesSide LEFT = TwinFramesSide.LEFT;

trunk/src/org/expeditee/gui/FrameIO.java

@@ -33 +33 @@
 import java.io.Writer;
 import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.Time;
@@ -43 +45 @@
 import java.util.stream.Collectors;
 
+import org.apollo.gui.IChangeParentAndSubFolders;
+import org.apollo.io.AudioPathManager;
 import org.expeditee.actions.Actions;
 import org.expeditee.agents.ExistingFramesetException;
@@ -81 +85 @@
  * 
  */
+
+
 public class FrameIO {
 
         private static final char FRAME_NAME_LAST_CHAR = 'A';
-
-        public static void changeParentFolder(String newFolder) {
-                // Partial Paths.
-                PARENT_FOLDER = newFolder;
-                String resourcesPublicPath = PARENT_FOLDER + "resources-public" + File.separator;
-                String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;
-                
-                // Standard paths.
-                PUBLIC_PATH = PARENT_FOLDER + "public" + File.separator;
-                MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
-                TRASH_PATH = PARENT_FOLDER + "trash" + File.separator;
-                HELP_PATH = PARENT_FOLDER + "documentation" + File.separator;
-                PROFILE_PATH = PARENT_FOLDER + "profiles" + File.separator;
-                EXPORTS_DIR = PARENT_FOLDER + "exports" + File.separator;
-                STATISTICS_DIR = PARENT_FOLDER + "statistics" + File.separator;
-                LOGS_DIR = PARENT_FOLDER + "logs" + File.separator;
-                                
-                // New regime paths.
-                if (UserSettings.multiUserMode) {
-                        SHARED_FRAMESETS_PATH = resourcesPrivateIndividualPath + "framesets-shared" + File.separator;
-                        RESOURCES_PRIVATE = PARENT_FOLDER + "resources-private" + File.separator;
-                        RESOURCES_PATH = resourcesPublicPath + "documentation" + File.separator;
-                        FRAME_PRIVATE_PATH = resourcesPrivateIndividualPath + "framesets" + File.separator;
-                        IMAGES_PRIVATE_PATH = resourcesPrivateIndividualPath + "images" + File.separator;
-                        CONTACTS_PATH = resourcesPrivateIndividualPath + "contacts" + File.separator;
-                } else {
-                        // If we are using the old regime then these paths should not be used.
-                        SHARED_FRAMESETS_PATH = null;
-                        RESOURCES_PRIVATE = null;               
-                        RESOURCES_PATH = null;
-                        FRAME_PRIVATE_PATH = null;
-                        IMAGES_PRIVATE_PATH = null;
-                        CONTACTS_PATH = null;
-                }
-                
-                // Conditional paths
-                if (UserSettings.multiUserMode) {
-                        FONT_PATH = resourcesPublicPath + "fonts" + File.separator;
-                        DICT_PATH = resourcesPublicPath + "dict" + File.separator;
-                        IMAGES_PATH = resourcesPublicPath + "images" + File.separator;
-                        FRAME_PATH = resourcesPublicPath + "framesets" + File.separator;
-                } else {
-                        FONT_PATH = PARENT_FOLDER + "fonts" + File.separator;
-                        DICT_PATH = PARENT_FOLDER + "dict" + File.separator;
-                        IMAGES_PATH = PARENT_FOLDER + "images" + File.separator;
-                        FRAME_PATH = PARENT_FOLDER + "framesets" + File.separator;
-                }
-        }
 
         // The parent path that all others are relative to.  Also referred to as Expeditee Home.
@@ -142 +100 @@
         public static String MESSAGES_PATH;
         public static String IMAGES_PATH;
+        public static String AUDIO_PATH;
         public static String PUBLIC_PATH;
         public static String TRASH_PATH;
@@ -159 +118 @@
         public static String FRAME_PRIVATE_PATH;
         public static String IMAGES_PRIVATE_PATH;
+        public static String AUDIO_PRIVATE_PATH;
         
         // Paths used only by old regime.
@@ -175 +135 @@
         
         private static final String INF_FILENAME = "frame.inf";
+        
+        public static void changeParentAndSubFolders(String newFolder) {
+                // Partial Paths.
+                PARENT_FOLDER = newFolder;
+                        
+                String resourcesPublicPath = PARENT_FOLDER + "resources-public" + File.separator;
+
+                // Standard paths.
+                PUBLIC_PATH = PARENT_FOLDER + "public" + File.separator;
+                MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
+                TRASH_PATH = PARENT_FOLDER + "trash" + File.separator;
+                HELP_PATH = PARENT_FOLDER + "documentation" + File.separator;
+                PROFILE_PATH = PARENT_FOLDER + "profiles" + File.separator;
+                EXPORTS_DIR = PARENT_FOLDER + "exports" + File.separator;
+                STATISTICS_DIR = PARENT_FOLDER + "statistics" + File.separator;
+                LOGS_DIR = PARENT_FOLDER + "logs" + File.separator;
+                                
+                
+                // Conditional paths
+                if (UserSettings.PublicAndPrivateResources) {
+                        // Work with a system of public and private folders
+                        
+                        FONT_PATH = resourcesPublicPath + "fonts" + File.separator;
+                        DICT_PATH = resourcesPublicPath + "dict" + File.separator;
+                        IMAGES_PATH = resourcesPublicPath + "images" + File.separator;
+                        AUDIO_PATH = resourcesPublicPath + "audio" + File.separator;
+                        FRAME_PATH = resourcesPublicPath + "framesets" + File.separator;
+                }
+                else {
+                        FONT_PATH = PARENT_FOLDER + "fonts" + File.separator;
+                        DICT_PATH = PARENT_FOLDER + "dict" + File.separator;
+                        IMAGES_PATH = PARENT_FOLDER + "images" + File.separator;
+                        AUDIO_PATH = PARENT_FOLDER + "audio" + File.separator;
+                        FRAME_PATH = PARENT_FOLDER + "framesets" + File.separator;
+                }
+                
+                if (!UserSettings.PublicAndPrivateResources || System.getProperty("user.name").equals(Browser.USER_NOBODY)) {
+                        
+                        if (System.getProperty("user.name").equals(Browser.USER_NOBODY)) {
+                                System.err.println("**** FrameIO::changeParentAndSubFolders(): Not setting subfolders for user '"+Browser.USER_NOBODY+"'");
+                        }
+                        
+                        // If we are using the old regime, or user.name set to Browser.USER_NOBODY
+                        // => then these paths should not be used.
+                        RESOURCES_PATH = null;
+                        SHARED_FRAMESETS_PATH = null;
+                        RESOURCES_PRIVATE = null;               
+                        FRAME_PRIVATE_PATH = null;
+                        IMAGES_PRIVATE_PATH = null;
+                        AUDIO_PRIVATE_PATH = null;
+                        CONTACTS_PATH = null;
+                }
+                else {
+                        String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;
+                        
+                        RESOURCES_PATH = resourcesPublicPath + "documentation" + File.separator;
+                        SHARED_FRAMESETS_PATH = resourcesPrivateIndividualPath + "framesets-shared" + File.separator;
+                        
+                        RESOURCES_PRIVATE = PARENT_FOLDER + "resources-private" + File.separator;
+                        FRAME_PRIVATE_PATH = resourcesPrivateIndividualPath + "framesets" + File.separator;
+                        IMAGES_PRIVATE_PATH = resourcesPrivateIndividualPath + "images" + File.separator;
+                        AUDIO_PRIVATE_PATH = resourcesPrivateIndividualPath + "audio" + File.separator;
+                        CONTACTS_PATH = resourcesPrivateIndividualPath + "contacts" + File.separator;
+                } 
+                        
+                
+                System.err.println("**** FrameIO::changeParentAndSubFolder(): Calling AudioPathManger.changeParentAndSubFolder()");
+                AudioPathManager.changeParentAndSubFolders(newFolder);
+        }
         
         // All methods are static, this should not be instantiated
@@ -341 +370 @@
                         loaded = LoadKnownPath(knownPath, framename);
                 } else {
-                        List<String> directoriesToSearch = FolderSettings.FrameDirs.get();
+                        List<String> directoriesToSearch = FolderSettings.FrameDirs.getAbsoluteDirs();
                         
                         if (Authenticator.Authenticated) {
@@ -378 +407 @@
                 StringBuffer list = new StringBuffer();
 
-                for (String path : FolderSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) {
                         File files = new File(path);
                         if (!files.exists()) {
@@ -466 +495 @@
                 }
 
-                for (String path : FolderSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) {
                         if (getFrameFullPathName(path, frameName) != null) {
                                 return true;
@@ -478 +507 @@
                 String fullPath = null;
                 if (path == null) {
-                        for (String possiblePath : FolderSettings.FrameDirs.get()) {
+                        for (String possiblePath : FolderSettings.FrameDirs.getAbsoluteDirs()) {
                                 fullPath = getFrameFullPathName(possiblePath, frameName);
                                 if (fullPath != null) {
@@ -879 +908 @@
                 if (!DisplayController.isTwinFramesOn() && !Justification.center.equals(((Text)titleItem).getJustification())) {
                         if ((titleItem.getX() + 1) < template.getNameItem().getX()) {
-                                while (titleItem.getSize() > Text.MINIMUM_FONT_SIZE
-                                                && titleItem.getBoundsWidth() + titleItem.getX() > template
-                                                                .getNameItem().getX()) {
+                                int title_item_xr = titleItem.getX() + titleItem.getBoundsWidth(); // should really be '... -1'
+                                int frame_name_xl = template.getNameItem().getX();
+                                if (frame_name_xl < DisplayController.MINIMUM_FRAME_WIDTH) {
+                                        frame_name_xl = DisplayController.MINIMUM_FRAME_WIDTH;
+                                }
+                                
+                                while ((titleItem.getSize() > Text.MINIMUM_FONT_SIZE) && title_item_xr > frame_name_xl) {
                                         titleItem.setSize(titleItem.getSize() - 1);
+                                        System.err.println("**** shrunk titleItem: " + titleItem + " to font size: " + titleItem.getSize());
                                 }
                         } else {
@@ -1544 +1578 @@
         public static Boolean canAccessFrameset(String framesetName) {
                 framesetName = framesetName.toLowerCase();
-                for (String path : FolderSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) {
                         if ((new File(path + framesetName)).exists()) {
                                 return true;
@@ -1685 +1719 @@
 
                 // Search all the available directories for the directory
-                for (String path : FolderSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) {
                         String source = path + framesetName.toLowerCase() + File.separator;
                         File framesetDirectory = new File(source);
@@ -1730 +1764 @@
                 // search through all the directories to find the frameset we are
                 // copying
-                for (String path : FolderSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.getAbsoluteDirs()) {
                         String source = path + framesetToCopy.toLowerCase()
                                         + File.separator;
@@ -1890 +1924 @@
                 toSave.setActiveTime(activeTime);
         }
+        
+        public static Path setupPersonalResources(String username)
+        {
+                Path personalResources = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + username);
+                personalResources.toFile().mkdir();             
+                File[] globalResourcesToCopy = Paths.get(FrameIO.RESOURCES_PRIVATE).toFile().listFiles();
+                
+                try {
+                        for (File toCopy: globalResourcesToCopy) {
+                                Path p = Paths.get(toCopy.getAbsolutePath());
+                                if (!p.getFileName().toString().equals(".res") && !p.getFileName().toString().equals("about")) {
+                                        copyFileTree(p.toAbsolutePath(), personalResources.resolve(p.getFileName()));
+                                }
+                        }
+                }
+                catch (IOException e) {
+                        e.printStackTrace();
+                        personalResources = null;
+                }
+                
+                return personalResources;
+        }
+        
+        private static void copyFileTree(Path source, Path target) throws IOException {
+                Files.copy(source, target);
+                if (source.toFile().isDirectory()) {
+                        File[] files = source.toFile().listFiles();
+                        for (File file: files) {
+                                Path asPath = Paths.get(file.getAbsolutePath());
+                                copyFileTree(asPath, target.resolve(asPath.getFileName()));
+                        }
+                }
+        }
 }

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -1090 +1090 @@
                                 Logger.Log(e);
                                 e.printStackTrace();
-                                MessageBay.warningMessage("Exception occured when loading " + i.getClass().getSimpleName() + "(ID: "
-                                                + i.getID() + ") " + e.getMessage() != null ? e.getMessage() : "");
+                                System.err.println("**** Have temporarily supressed MessageBay call, as resulted in infinite recursion");
+                                //MessageBay.warningMessage("Exception occured when loading " + i.getClass().getSimpleName() + "(ID: "
+                                //              + i.getID() + ") " + e.getMessage() != null ? e.getMessage() : "");
                         }
                 }
@@ -1820 +1821 @@
          */
         public static void extractResources(boolean force) {
-                // Extract private resources
-                Path resourcesPrivate = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-private");
-                extractResources("org/expeditee/assets/resources-private", resourcesPrivate, force);
                 
-                // Extract public resources
-                Path resourcesPublic = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-public");
-                extractResources("org/expeditee/assets/resources-public", resourcesPublic, force);
+                if (UserSettings.PublicAndPrivateResources) {
+                        // Extract private resources
+                        Path resourcesPrivate = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-private");
+                        extractResources("org/expeditee/assets/resources-private", resourcesPrivate, force);
+                        
+                        // Extract public resources
+                        Path resourcesPublic = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-public");
+                        extractResources("org/expeditee/assets/resources-public", resourcesPublic, force);
+                }
         }