feat: add option to recursively list all files in a branch (fixes #362)

Signed-off-by: Tommy van der Vorst <tommy@pixelspark.nl>

Author: pixelspark

Localizable.xcstrings

@@ -31292,6 +31292,52 @@
         }
       }
     },
+    "Show files in subdirectories" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dateien in Unterverzeichnissen anzeigen"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mostrar archivos en subdirectorios"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mostra file nelle sottodirectory"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "サブディレクトリのファイルを表示"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bestanden in submappen tonen"
+          }
+        },
+        "uk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Показати файли в підкаталогах"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示子目录中的文件"
+          }
+        }
+      }
+    },
     "Show folder in the app" : {
       "localizations" : {
         "de" : {

Sushitrain/BrowserView.swift

@@ -124,6 +124,7 @@ struct BrowserView: View {
 	@State private var isWorking = false
 	@State private var isBookmarked = false
 	@State private var showNewBookmarkInfo = false
+	@State private var recursive = false
 
 	#if os(macOS)
 		@State private var showIgnores = false
@@ -173,6 +174,7 @@ struct BrowserView: View {
 			viewStyle: $viewStyle,
 			filterAvailability: currentFilterAvailability,
 			sortOrder: currentSort,
+			recursive: recursive,
 			searchText: $searchText,
 			showSettings: $showSettings
 		)
@@ -454,6 +456,8 @@ struct BrowserView: View {
 			Divider()
 
 			Toggle("Hide dotfiles", systemImage: "eye.slash", isOn: userSettings.$dotFilesHidden)
+			
+			Toggle("Show files in subdirectories", systemImage: "text.insert", isOn: $recursive)
 
 		} label: {
 			Label("Filter and sort", systemImage: "line.3.horizontal.decrease")
@@ -517,7 +521,7 @@ struct BrowserView: View {
 		})
 
 		// Check for presence of index.html to enable web view
-		if folderExists, let entry = try? folder.getFileInformation(self.prefix + "index.html"),
+		if folderExists, !recursive, let entry = try? folder.getFileInformation(self.prefix + "index.html"),
 			!entry.isDirectory() && !entry.isDeleted()
 		{
 			self.webViewAvailable = true
@@ -921,6 +925,7 @@ private struct BrowserItemsView: View {
 	@Binding var viewStyle: BrowserViewStyle?
 	let filterAvailability: BrowserViewFilterAvailability
 	let sortOrder: BrowserViewSort
+	let recursive: Bool
 
 	@Binding var searchText: String
 	@Binding var showSettings: Bool
@@ -1024,6 +1029,11 @@ private struct BrowserItemsView: View {
 				await self.updateExtraneousFiles()
 			}
 		}
+		.onChange(of: recursive) {
+			Task {
+				await self.reload()
+			}
+		}
 	}
 
 	private var isEmpty: Bool {
@@ -1275,7 +1285,7 @@ private struct BrowserItemsView: View {
 				return []
 			}
 			do {
-				var entries = try folder.listEntries(prefix: self.prefix, directories: false, hideDotFiles: dotFilesHidden)
+				var entries = try folder.listEntries(prefix: self.prefix, directories: false, hideDotFiles: dotFilesHidden, recursive: self.recursive)
 				entries.sort(by: sortSpec.isOrderedBefore)
 				return entries
 			}
@@ -1325,7 +1335,7 @@ private struct BrowserItemsView: View {
 
 		if self.viewStyle == nil {
 			// Do we have an index.html? If so switch to web view
-			if appState.userSettings.automaticallyShowWebpages && self.files.contains(where: { $0.fileName() == "index.html" }) {
+			if appState.userSettings.automaticallyShowWebpages && !recursive && self.files.contains(where: { $0.fileName() == "index.html" }) {
 				self.viewStyle = .web
 			}
 			else if appState.userSettings.automaticallySwitchViewStyle {

Sushitrain/Utils.swift

@@ -213,8 +213,8 @@ extension SushitrainFolder {
 		try self.unlink()
 	}
 
-	func listEntries(prefix: String, directories: Bool, hideDotFiles: Bool) throws -> [SushitrainEntry] {
-		let list = try self.list(prefix, directories: directories, recurse: false)
+	func listEntries(prefix: String, directories: Bool, hideDotFiles: Bool, recursive: Bool) throws -> [SushitrainEntry] {
+		let list = try self.list(prefix, directories: directories, recurse: recursive)
 		var entries: [SushitrainEntry] = []
 		for i in 0..<list.count() {
 			let path = list.item(at: i)

SushitrainCore/src/folder.go

@@ -274,14 +274,27 @@ func (fld *Folder) listEntries(prefix string, directories bool, recurse bool) ([
 	return fld.client.app.Internals.GlobalTree(fld.FolderID, prefix, levels, directories)
 }
 
+func flatten(entries []*model.TreeEntry, recurse bool, prefix string) []string {
+	newEntries := make([]string, 0)
+	for e := range entries {
+		entry := entries[e]
+		newEntries = append(newEntries, prefix+entry.Name)
+		if recurse {
+			newEntries = append(newEntries, flatten(entry.Children, recurse, prefix+entry.Name+"/")...)
+		}
+	}
+	return newEntries
+}
+
 func (fld *Folder) List(prefix string, directories bool, recurse bool) (*ListOfStrings, error) {
 	entries, err := fld.listEntries(prefix, directories, recurse)
 	if err != nil {
 		return nil, err
 	}
-	return List(Map(entries, func(entry *model.TreeEntry) string {
-		return entry.Name
-	})), nil
+
+	// Flatten the tree
+	names := flatten(entries, recurse, "")
+	return List(names), nil
 }
 
 func (fld *Folder) ShareWithDevice(deviceID string, toggle bool, encryptionPassword string) error {