Fixing fileWorkspaceMap listing test

Author: PicoCreator

src/main/java/picoded/dstack/core/Core_FileWorkspaceMap.java

@@ -1,6 +1,7 @@
 package picoded.dstack.core;
 
 import picoded.core.conv.ArrayConv;
+import picoded.core.conv.ConvertJSON;
 import picoded.core.file.FileUtil;
 
 // Java imports
@@ -559,12 +560,26 @@ protected Set<String> backend_filterPathSet(final Set<String> rawSet, final Stri
 		}
 		int searchPathLen = searchPath.length();
 
+		// // Debugging stuff
+		// System.out.println( "#" );
+		// System.out.println( "searchPath: "+searchPath );
+		// System.out.println( "searchPathLen: "+searchPathLen );
+		// System.out.println( "minDepth: "+minDepth );
+		// System.out.println( "maxDepth: "+maxDepth );
+		// System.out.println( "pathType: "+pathType );
+		// System.out.println( ConvertJSON.fromObject(rawSet) );
+
 		// Return set
 		Set<String> ret = new HashSet<>();
 
 		// Get the keyset, and iterate it
 		for (String key : rawSet) {
 
+			// Skip the root folder of a workspace
+			if( key.equals("") || key.equals("/") ) {
+				continue;
+			}
+
 			// If folder does not match - skip
 			if (searchPathLen > 0 && !key.startsWith(searchPath)) {
 				continue;
@@ -575,32 +590,36 @@ protected Set<String> backend_filterPathSet(final Set<String> rawSet, final Stri
 
 			// No filtering is needed, store and continue
 			if (maxDepth <= 0 && minDepth <= 0) {
-				// Does nothing
-			} else {
-				// Lets perform path filtering
-				
-				// Lets filter out the ending "/" 
-				String filteredSubPath = subPath;
-				if (filteredSubPath.endsWith("/")) {
-					filteredSubPath = filteredSubPath.substring(0, filteredSubPath.length());
-				}
-				
-				// Split and count
-				String[] splitSubPath = filteredSubPath.split("/");
-				int subPathLength = (filteredSubPath.length() <= 0) ? 0 : splitSubPath.length;
-				
-				// Check min depth - skip key if check failed
-				if (subPathLength < minDepth) {
-					continue;
-				}
-				
-				// Check max depth - skip key if check failed
-				if (subPathLength > maxDepth) {
-					continue;
-				}
+				// Does no checks, add and continue
+				ret.add(subPath);
+				continue;
+			} 
+			
+			// Lets perform path filtering
+			// ---
+			
+			// Lets filter out the ending "/" 
+			String filteredSubPath = subPath;
+			if (filteredSubPath.endsWith("/")) {
+				filteredSubPath = filteredSubPath.substring(0, filteredSubPath.length() - 1);
+			}
+			
+			// Split and count
+			String[] splitSubPath = filteredSubPath.split("/");
+			int subPathLength = (filteredSubPath.length() <= 0) ? 0 : splitSubPath.length;
+			
+			// Check min depth - skip key if check failed
+			if (minDepth > 0 && subPathLength < minDepth) {
+				continue;
+			}
+			
+			// Check max depth - skip key if check failed
+			if (maxDepth > 0 && subPathLength > maxDepth) {
+				continue;
 			}
 
 			// Alrighto - lets check file / folder type - and add it in
+			// ---
 
 			// Ignore empty, or root path
 			if (subPath.isEmpty() || subPath.equals("/")) {
@@ -627,6 +646,10 @@ protected Set<String> backend_filterPathSet(final Set<String> rawSet, final Stri
 			ret.add(subPath);
 		}
 
+		// // Debugging stuff
+		// System.out.println( "Filtered Set" );
+		// System.out.println( ConvertJSON.fromObject(ret) );
+
 		// Return the filtered set
 		return ret;
 	}

src/main/java/picoded/dstack/mongodb/MongoDB_FileWorkspaceMap.java

@@ -877,7 +877,8 @@ public Set<String> backend_getFileAndFolderPathSet(final String oid, String fold
 				String[] cleanPathArr = cleanPath.split("/");
 				List<String> cleanPathList = Arrays.asList(cleanPathArr);
 
-				// Lets handle parent folders, note that i<cleanPathArr.length, alread excludes the file itself
+				// Lets handle parent folders, note that i<cleanPathArr.length, 
+				// already excludes the file itself
 				for (int i = 1; i < cleanPathArr.length; ++i) {
 					ret.add(String.join("/", cleanPathList.subList(0, i)) + "/");
 				}

src/test/java/picoded/dstack/struct/simple/StructSimple_FileWorkspaceMap_test.java

@@ -346,17 +346,37 @@ public void getPathSetLookup() {
 		fileWorkspace.writeString("test/one.txt", "anything");
 		fileWorkspace.writeString("test/two.txt", "anything");
 		fileWorkspace.writeString("test/d1/file.txt", "anything");
-		fileWorkspace.writeString("test/d2/file.txt", "anything");
+		fileWorkspace.writeString("test/d2/file1.txt", "anything");
+		fileWorkspace.writeString("test/d2/file2.txt", "anything");
 
 		// List all files and folders
-		assertEquals(4, fileWorkspace.getFileAndFolderPathSet(null).size());
-		assertEquals(4, fileWorkspace.getFileAndFolderPathSet("").size());
-		assertEquals(4, fileWorkspace.getFileAndFolderPathSet("/").size());
+		// this includes, 5 files, and 3 folders (test/, test/d1/, test/d2/)
+		assertEquals(8, fileWorkspace.getFileAndFolderPathSet(null, -1, -1).size());
+		assertEquals(8, fileWorkspace.getFileAndFolderPathSet("", -1, -1).size());
+		assertEquals(8, fileWorkspace.getFileAndFolderPathSet("/", -1, -1).size());
 
-		// List files in sub folders
+		assertEquals(3, fileWorkspace.getFolderPathSet("", -1, -1).size());
+		assertEquals(5, fileWorkspace.getFilePathSet("", -1, -1).size());
+
+		// List the `test/` folder
+		assertEquals(1, fileWorkspace.getFileAndFolderPathSet(null).size());
+		assertEquals(1, fileWorkspace.getFileAndFolderPathSet("").size());
+		assertEquals(1, fileWorkspace.getFileAndFolderPathSet("/").size());
+		assertEquals(1, fileWorkspace.getFolderPathSet("").size());
+
+		// The `test/` is not a file, hence 0
+		assertEquals(0, fileWorkspace.getFilePathSet("").size());
+
+		// List files & folders in the `test/` sub folders
 		assertEquals(4, fileWorkspace.getFileAndFolderPathSet("test").size());
 		assertEquals(2, fileWorkspace.getFilePathSet("test").size());
 		assertEquals(2, fileWorkspace.getFolderPathSet("test").size());
+
+		// List files & folders in the `test/d2/` sub folders
+		assertEquals(2, fileWorkspace.getFileAndFolderPathSet("test/d2/").size());
+		assertEquals(2, fileWorkspace.getFilePathSet("test/d2/").size());
+		assertEquals(0, fileWorkspace.getFolderPathSet("test/d2/").size());
+
 	}
 
 	//-----------------------------------------------------------------------------------