Changeset 1543

Timestamp:

11/18/20 11:15:44 (3 years ago)

Author:

davidb

Message:

When unpacking resources from a JAR file, important that when specifying a directory, it ends in the directory separator

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (5 diffs)

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

@@ -1831 +1831 @@
                         // Extract private resources
                         Path resourcesPrivate = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-private");
-                        extractResources("org/expeditee/assets/resources-private", resourcesPrivate, force);
+                        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);
+                        extractResources("org/expeditee/assets/resources-public/", resourcesPublic, force);
                 } else if (AuthenticatorBrowser.isAuthenticationRequired()) {
                         // Deal with the instance of being in the old regime but using authentication.
@@ -1841 +1841 @@
                         // Ensure additional framesets
                         Path framesetsDir = Paths.get(FrameIO.FRAME_PATH);
-                        boolean extracted = extractResources("org/expeditee/assets/resources-public/framesets", framesetsDir, force);
+                        boolean extracted = extractResources("org/expeditee/assets/resources-public/framesets/", framesetsDir, force);
                         
                         // Ensure additional images
                         Path imagesDir = Paths.get(FrameIO.IMAGES_PATH);
-                        extracted |= extractResources("org/expeditee/assets/resources-public/images", imagesDir, force);
+                        extracted |= extractResources("org/expeditee/assets/resources-public/images/", imagesDir, force);
                         
                         // Ensure deaddrops area exists
@@ -1896 +1896 @@
         private static boolean extractResources(String source, Path destination, boolean force) {
                 // If resources have already been extracted, and we are not forcing the extraction, there is nothing to do.
+        
                 if (!force && destination.resolve(".res").toFile().exists()) {
                         return false;
@@ -1907 +1908 @@
                 ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
                 URL resourceUrl = classLoader.getResource(source);
+                
                 if (resourceUrl.getProtocol().equals("jar")) {
                         try {
@@ -1959 +1961 @@
                                 continue;
                         }
-                        File out = destination.resolve(ze.getName().substring(source.length())).toFile();
+                        
+                        // Note:
+                        //   'source' needs to be specified as directory ending in a "/"
+                        // If it doesn't then 'ze_name_rel' incorrectly presents as an absolute name
+                        //
+                        // As this is a private method, the "/" requirement is considered a reasonable
+                        // requirement to ensure is applied within this class.
+                        
+                        String ze_name = ze.getName();          
+                        String ze_name_rel = ze_name.substring(source.length());                        
+                        
+                        File out = destination.resolve(ze_name_rel).toFile();
+                        
                         if (ze.isDirectory()) {
                                 out.mkdirs();