Changeset 33757 for main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

Timestamp:

2019-12-07T01:40:13+13:00 (4 years ago)

Author:

ak19

Message:

1. Windows bugfix for getting exMeta to be loaded into GLI where there are subdirs involved in the Gather pane, or there are non-ASCII filenames, or the file rename method is set to base64. 2. Bugfix for Linux and Windows: Using Base64 to rename files was still a problem despite the previous commit (which was supposed to have fixed all GLI exMeta loading issues on Linux) in the special case where a subfolder was pure ASCII. The perl code wouldn't base64 encode such subdirs. However, GLI won't know which part of a relative file path to decode based on the file rename method used and which parts are not to be decoded. So GLI uniformly decoded them, and ASCII named subfolders that were not base64 encoded (but contained files that were to be renamed with base64) got base64 decoded into garbage, so that exMeta still did not get attached. 3. This commit contains debug stmts.

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -114 +114 @@
       
       return result;
+    }
+    
+    /**
+     * The following calls a method in WindowsNativeFunctions.java to retrieve Windows short file names
+     * taken from http://dolf.trieschnigg.nl/eightpointthree/eightpointthree.html
+     * which uses the the non-JNI NativeCall jar file for which WindowsNativeFunctions imports com.eaio.nativecall.*
+     *
+     * returns the short filename (8.3) for a file in Windows
+     * 
+     * @param longFileName - must be the full path to an actual existing file
+     * @return a string with the short filename, or null if an error occurred or the
+     *         file does not exist.
+     */
+    public static String getWindowsShortFileName(String longFileName) throws Exception {
+        if(!Utility.isWindows()) {
+            return longFileName;
+        } else {
+            //return WindowsNativeFunctions.getEightPointThree(longFileName);
+            return getMSDOSName(longFileName);
+        }
+    }
+    
+    /**  
+     * getMSDOSName() and its helper function getAbsolutePath(fileName)
+     * are from https://stackoverflow.com/questions/18893284/how-to-get-short-filenames-in-windows-using-java
+     * getMSDOSName() modified to use our SafeProcess class.
+     *
+     * @param fileName - the regular fileName to be converted. Must be the full path to an actual existing file
+     * @return Windows shortfile name for the fileName parameter given.
+     */
+    public static String getMSDOSName(String fileName)
+        throws IOException, InterruptedException {
+
+        /*
+        String path = getAbsolutePath(fileName);
+        
+        changed "+ fileName.toUpperCase() +" to "path"
+        Process process =
+            Runtime.getRuntime().exec(
+                "cmd /c for %I in (\"" + path + "\") do @echo %~fsI");
+        
+        process.waitFor();
+        
+        byte[] data = new byte[65536];
+        int size = process.getInputStream().read(data);
+
+        if (size <= 0) {
+            return null;
+        }
+
+        return new String(data, 0, size).replaceAll("\\r\\n", "");
+        */
+        String path = getAbsolutePath(fileName);
+        
+        SafeProcess process = new SafeProcess("cmd /c for %I in (\"" + path + "\") do @echo %~fsI");
+        int returnVal = process.runProcess();
+        if(returnVal != 0) {
+            return null;
+        }
+
+        String data = process.getStdOutput();
+        if(data == null) {
+            return null;            
+        }
+        else return data.replaceAll("\\r\\n", "");
+    }
+    public static String getAbsolutePath(String fileName)
+        throws IOException {
+        File file = new File(fileName);
+        String path = file.getAbsolutePath();
+
+        if (file.exists() == false)
+            file = new File(path);
+
+        path = file.getCanonicalPath();
+
+        if (file.isDirectory() && (path.endsWith(File.separator) == false))
+            path += File.separator;
+
+        return path;
     }