list also all parent directories in __graalpython__.list_files

(cherry picked from commit 62f1771)

Author: tomasstupka

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -78,7 +78,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.logging.Level;
 
 import org.graalvm.nativeimage.ImageInfo;
@@ -1021,15 +1023,19 @@ Object list(TruffleString dirPath, TruffleString filesListPath) {
             }
 
             try (BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(filesListPath.toJavaStringUncached())))) {
-                getContext().getPublicTruffleFileRelaxed(filesListPath).getParent().createDirectories();
-                List<String> ret = list(dir);
-                String parentPathString = dir.getParent().getAbsoluteFile().getPath();
-                for (String f : ret) {
-                    String tt = f.substring(parentPathString.length());
-                    if (tt.charAt(0) == '\\') {
-                        tt = tt.replace("\\", "/");
+                TruffleFile p = getContext().getPublicTruffleFileRelaxed(filesListPath).getParent();
+                if(!p.exists()) {
+                    getContext().getPublicTruffleFileRelaxed(filesListPath).getParent().createDirectories();
+                }
+                Set<String> ret = list(dir, null);
+                String[] a = ret.toArray(new String[ret.size()]);
+                Arrays.sort(a);
+                for (String f : a) {
+                    if (f.charAt(0) == '\\') {
+                        f = f.replace("\\", "/");
                     }
-                    bw.write(tt);
+
+                    bw.write(f);
                     bw.write("\n");
                 }
             } catch (IOException e) {
@@ -1039,26 +1045,46 @@ Object list(TruffleString dirPath, TruffleString filesListPath) {
             return PNone.NONE;
         }
 
-        private static List<String> list(TruffleFile dir) throws IOException {
-            List<String> ret = new ArrayList<>();
+        private static Set<String> list(TruffleFile dir, TruffleFile rd) throws IOException {
+            HashSet<String> ret = new HashSet<>();
             Collection<TruffleFile> files = dir.list();
-            String dirPath = dir.getAbsoluteFile().getPath();
-            if (!dirPath.endsWith("/")) {
-                dirPath = dirPath + "/";
+            String dirPath = makeDirPath(dir.getAbsoluteFile().getPath());
+
+            // add dir
+            TruffleFile rootDir = rd == null ? dir : rd;
+            String rootPath = makeDirPath(rootDir.getAbsoluteFile().getPath());
+            int rootEndIdx = rootPath.lastIndexOf("/", rootPath.lastIndexOf("/") - 1);
+            ret.add(dirPath.substring(rootEndIdx));
+
+            // add parents up to root
+            TruffleFile parent = dir;
+            while(!parent.equals(rootDir)) {
+                String p = makeDirPath(parent.getAbsoluteFile().getPath());
+                p = p.substring(rootEndIdx);
+                ret.add(p);
+                parent = parent.getParent();
             }
-            ret.add(dirPath);
+
+            // add children
             if (files != null) {
                 for (TruffleFile f : files) {
                     if (f.isRegularFile()) {
-                        ret.add(f.getAbsoluteFile().getPath());
+                        ret.add(f.getAbsoluteFile().getPath().substring(rootEndIdx));
                     } else {
-                        ret.addAll(list(f));
+                        ret.addAll(list(f, rootDir));
                     }
                 }
             }
             return ret;
         }
 
+        private static String makeDirPath(String p) {
+            if (!p.endsWith("/")) {
+                p = p + "/";
+            }
+            return p;
+        }
+
         private void print(OutputStream out, String msg) {
             try {
                 out.write(String.format("%s: %s", getContext().getOption(PythonOptions.Executable), msg).getBytes(StandardCharsets.UTF_8));

graalpython/lib-graalpython/modules/standalone/templates/VirtualFileSystem.java

@@ -200,13 +200,6 @@ private static void initFilesAndDirsList() throws IOException {
                 if(line.endsWith(RESOURCE_SEPARATOR)) {                        
                     line = line.substring(0, line.length() - 1);
                     dirsList.add(line);
-                    int idx;
-                    while((idx = line.lastIndexOf(RESOURCE_SEPARATOR)) != -1) {                        
-                        line = line.substring(0, idx);                        
-                        if(!line.isEmpty()) {
-                            dirsList.add(line);
-                        }
-                    }
                 } else {
                     filesList.add(line);                            
                 }