Changeset 1447 for trunk

Timestamp:

11/12/19 14:37:28 (4 years ago)

Author:

bnemhaus

Message:

When dnd'ing a or copy/pasting a image that is external to expeditee (not a sub file of expedite.home) then that image is imported into the expeditee file system with a randomly generated name. A users FolderSettings are used to determine location to import image too.

Location:

trunk/src/org/expeditee

Files:

• gui/management/ResourceUtil.java (modified) (2 diffs)
• importer/FilePathImporter.java (modified) (1 diff)
• importer/ImageImporter.java (modified) (3 diffs)

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

@@ -26 +26 @@
          * Attempts to relativise a image path using expeditee.home (FrameIO.PARENT_FOLDER).
          * @param path The path to attempt to relativise
-         * @return Returns the most relativised path if one exists, otherwise returns a copy of the ref parameter passed in.
+         * @return Returns the most relativised path if one exists, otherwise returns the ref parameter passed in.
          */
         public static Path relativiseImagePath(Path path) {
@@ -49 +49 @@
                 
                 return null;
+        }
+        
+        public static Path getImageSaveFileLocation(Frame context) {
+                List<String> directories = ResourceManager.images.getDirectories(context);
+                if (directories.isEmpty()) {
+                        return Paths.get(FrameIO.PARENT_FOLDER).toAbsolutePath();
+                } else {
+                        return Paths.get(directories.get(0));
+                }
         }
         

trunk/src/org/expeditee/importer/FilePathImporter.java

@@ -40 +40 @@
                 }
 
-                return null;
-                
-        }
-
-        
+                return null;            
+        }       
 }

trunk/src/org/expeditee/importer/ImageImporter.java

@@ -21 +21 @@
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.Collection;
 import java.util.HashSet;
@@ -90 +92 @@
                 Path imagePath = Paths.get(fullPath);
                 Path imagePathRelitivized = ResourceUtil.relativiseImagePath(imagePath);
+                if (!isInternal(imagePathRelitivized)) {
+                        Path destinationDirectoryPath = ResourceUtil.getImageSaveFileLocation(DisplayController.getCurrentFrame());
+                        String extension = imagePathRelitivized.toString();
+                        extension = extension.substring(extension.lastIndexOf('.'));
+                        Path newFilePath = Files.createTempFile(destinationDirectoryPath, "", extension);
+                        Files.copy(imagePathRelitivized, newFilePath, StandardCopyOption.REPLACE_EXISTING);
+                        imagePathRelitivized = ResourceUtil.relativiseImagePath(newFilePath);
+                }
                 source = DragAndDropManager.importString("@i: " + imagePathRelitivized.toString() + size, location, attachToFreeItems);
 //              final Path imagesPath = Paths.get(FrameIO.IMAGES_PATH);
@@ -107 +117 @@
                 return source.getEnclosures().iterator().next();
         }
+        
+        private boolean isInternal(Path p) {
+                Path expediteeHomePath = Paths.get(FrameIO.PARENT_FOLDER).toAbsolutePath();
+                return p.startsWith(expediteeHomePath);
+        }
 }