Changeset 1436 for trunk/src/org/expeditee/gui/management/ResourceManager.java

Timestamp:

11/05/19 16:16:11 (5 years ago)

Author:

bnemhaus

Message:

Added the ability to copy/paste recognised files (mostly images) into Expeditee. This functionality already existed when drag n dropping, but now also works when using copy/paste.

At this stage, recognised files get imported as a approapriate Text Item. For example, a image will create a @i Text Item and attach it to your cursor. Ideally this would be the image directly. Unfortunately, items attached to the cursor (FreeItems) are not currently parsed. This is something I will discuss with David as there are confounding issues to consider. For example: surrogates...

Attached to the bottom of this commit message are my current thoughts.

Also made it so when creating a @i through DND or Copy/Paste, that @i is as relative as possible. The users image directories setting is used to achieve this.

---

• FreeItems need to be parsed...we would need to deal with primaries/surrogates in them...
• Do we want FreeItems to be parsed? If I attach an item to my cursor and then enter surrogate mode, should it change?
• My gut says no. Both because it would be work, and also because it kind of feels like a free win if we do not.
• But we do want to replace @i with images etc. Therefore, we want an old style parse for FreeItems?

File:

• trunk/src/org/expeditee/gui/management/ResourceManager.java (modified) (3 diffs)

trunk/src/org/expeditee/gui/management/ResourceManager.java

@@ -29 +29 @@
         private static ResolvedDirectoryList audio = instance.new ResolvedDirectoryList(FolderSettings.AudioDirs);
         
-        public static void invalidateAllResourceDirectories() {
-                commonInvalidated = true;
-        }
-        
-        private static void refreshAll() {
-                Frame currentFrame = DisplayController.getCurrentFrame();
-                String framesetPath = currentFrame == null ? null : currentFrame.getFramesetPath();
-                frames.refresh(framesetPath);
-                images.refresh(framesetPath);
-                audio.refresh(framesetPath);
-        }
-        
+        /**
+         * Attempts to relativise a image path using the users the directories listed for images in their settings.
+         * @param path The path to attempt to relativise
+         * @param context The context to use.  Most likely the Frame that the image is on.
+         * @return Returns the most relativised path if one exists, otherwise returns a copy of the ref parameter passed in.
+         */
+        public static Path relativiseImagePath(Path path, Frame context) {
+                String pathStr = path.toString();
+                
+                // Consult the resolved images directory for a list of paths to relativise too. 
+                List<String> directories = images.getDirectories(context);
+                
+                // Find the longest match that can be used to relativise the path.
+                String longestMatch = "";
+                for (String dir: directories) {
+                        if (pathStr.startsWith(dir) && (dir.length() > longestMatch.length())) {
+                                longestMatch = dir;
+                        }
+                }
+                
+                return Paths.get(pathStr.replace(longestMatch, ""));
+        }
+                        
         /**
          * Creates a Frame object from an associated resour
@@ -224 +235 @@
         }
         
+        public static void invalidateAllResourceDirectories() {
+                commonInvalidated = true;
+        }
+        
+        private static void refreshAll() {
+                Frame currentFrame = DisplayController.getCurrentFrame();
+                String framesetPath = currentFrame == null ? null : currentFrame.getFramesetPath();
+                frames.refresh(framesetPath);
+                images.refresh(framesetPath);
+                audio.refresh(framesetPath);
+        }
+        
         private class ResolvedDirectoryList {
                 private List<String> directories = null;
@@ -262 +285 @@
                 
                 private void refresh(String context) {
+                        
                         List<String> unresolved = source.getAbsoluteDirs();
                         directories = resolve(unresolved, context);