ux: sort files and subdirectories by numeric components in name (fixes #272)

Author: pixelspark

Sushitrain/BrowserTableView.swift

@@ -428,94 +428,3 @@ private struct EntryNameView: View {
 		}
 	}
 }
-
-extension ComparisonResult {
-	var flipped: ComparisonResult {
-		switch self {
-		case .orderedSame: return .orderedSame
-		case .orderedAscending: return .orderedDescending
-		case .orderedDescending: return .orderedAscending
-		}
-	}
-}
-
-private struct EntryComparator: SortComparator {
-	typealias Compared = SushitrainEntry
-
-	enum SortBy {
-		case size
-		case name
-		case lastModifiedDate
-		case fileExtension
-	}
-
-	var order: SortOrder
-	var sortBy: SortBy
-
-	private func compareDates(_ lhs: Date?, _ rhs: Date?) -> ComparisonResult {
-		switch (lhs, rhs) {
-		case (nil, nil): return .orderedSame
-		case (nil, _): return .orderedAscending
-		case (_, nil): return .orderedDescending
-		case (let a, let b): return a!.compare(b!)
-		}
-	}
-
-	func compare(_ lhs: SushitrainEntry, _ rhs: SushitrainEntry) -> ComparisonResult {
-		let ascending: ComparisonResult = order == .forward ? .orderedAscending : .orderedDescending
-		let descending: ComparisonResult = order == .forward ? .orderedDescending : .orderedAscending
-
-		switch (lhs.isDirectory(), rhs.isDirectory()) {
-		// Compare directories among themselves
-		case (true, true):
-			switch self.sortBy {
-			case .size:
-				return .orderedSame  // Directories all have zero size
-			case .lastModifiedDate:
-				let r = compareDates(lhs.modifiedAt()?.date(), rhs.modifiedAt()?.date())
-				return order == .forward ? r : r.flipped
-			case .name:
-				return order == .forward
-					? lhs.name().compare(rhs.name()) : rhs.name().compare(lhs.name())
-			case .fileExtension:
-				return order == .forward
-					? lhs.extension().compare(rhs.extension())
-					: rhs.extension().compare(lhs.extension())
-			}
-
-		// Compare directory with file or vice versa
-		case (true, false): return .orderedAscending  // This doesn't change when order is swapped
-		case (false, true): return .orderedDescending  // This doesn't change when order is swapped
-
-		// Compare entries among themselves
-		case (false, false):
-			switch self.sortBy {
-			case .lastModifiedDate:
-				let r = compareDates(lhs.modifiedAt()?.date(), rhs.modifiedAt()?.date())
-				return order == .forward ? r : r.flipped
-
-			case .name:
-				return order == .forward
-					? lhs.name().compare(rhs.name()) : rhs.name().compare(lhs.name())
-
-			case .fileExtension:
-				return order == .forward
-					? lhs.extension().compare(rhs.extension())
-					: rhs.extension().compare(lhs.extension())
-
-			case .size:
-				let sa = lhs.size()
-				let sb = rhs.size()
-				if sa == sb {
-					return .orderedSame
-				}
-				else if sa < sb {
-					return ascending
-				}
-				else {
-					return descending
-				}
-			}
-		}
-	}
-}

Sushitrain/BrowserView.swift

@@ -732,7 +732,7 @@ private struct BrowserItemsView: View {
 			}
 			do {
 				var dirNames = try folder.list(prefix, directories: true, recurse: false).asArray()
-					.sorted()
+					.sorted(by: { $0.compare($1, options: .numeric) == .orderedAscending })
 				if dotFilesHidden {
 					dirNames = dirNames.filter({ !$0.starts(with: ".") })
 				}
@@ -752,8 +752,9 @@ private struct BrowserItemsView: View {
 				return []
 			}
 			do {
-				return try folder.listEntries(
-					prefix: self.prefix, directories: false, hideDotFiles: dotFilesHidden)
+				var entries = try folder.listEntries(prefix: self.prefix, directories: false, hideDotFiles: dotFilesHidden)
+				entries.sort(by: { $0.fileName().compare($1.fileName(), options: .numeric) == .orderedAscending })
+				return entries
 			}
 			catch let error {
 				Log.warn("Error listing: \(error.localizedDescription)")

Sushitrain/FoldersView.swift

@@ -215,7 +215,9 @@ struct FoldersSections: View {
 	}
 
 	private func update() async {
-		folders = await appState.folders().sorted()
+		folders = await appState.folders().sorted(by: {
+			$0.displayName.compare($1.displayName, options: .numeric) == .orderedAscending
+		})
 
 		let addedFolders = Set(folders.map({ f in f.folderID }))
 		self.pendingFolderIds = ((try? self.appState.client.pendingFolderIDs())?.asArray() ?? []).filter({

Sushitrain/Utils.swift

@@ -1013,3 +1013,94 @@ extension SecCertificate {
 		return Data(digest)
 	}
 }
+
+extension ComparisonResult {
+	var flipped: ComparisonResult {
+		switch self {
+		case .orderedSame: return .orderedSame
+		case .orderedAscending: return .orderedDescending
+		case .orderedDescending: return .orderedAscending
+		}
+	}
+}
+
+struct EntryComparator: SortComparator {
+	typealias Compared = SushitrainEntry
+
+	enum SortBy {
+		case size
+		case name
+		case lastModifiedDate
+		case fileExtension
+	}
+
+	var order: SortOrder
+	var sortBy: SortBy
+
+	private func compareDates(_ lhs: Date?, _ rhs: Date?) -> ComparisonResult {
+		switch (lhs, rhs) {
+		case (nil, nil): return .orderedSame
+		case (nil, _): return .orderedAscending
+		case (_, nil): return .orderedDescending
+		case (let a, let b): return a!.compare(b!)
+		}
+	}
+
+	func compare(_ lhs: SushitrainEntry, _ rhs: SushitrainEntry) -> ComparisonResult {
+		let ascending: ComparisonResult = order == .forward ? .orderedAscending : .orderedDescending
+		let descending: ComparisonResult = order == .forward ? .orderedDescending : .orderedAscending
+
+		switch (lhs.isDirectory(), rhs.isDirectory()) {
+		// Compare directories among themselves
+		case (true, true):
+			switch self.sortBy {
+			case .size:
+				return .orderedSame  // Directories all have zero size
+			case .lastModifiedDate:
+				let r = compareDates(lhs.modifiedAt()?.date(), rhs.modifiedAt()?.date())
+				return order == .forward ? r : r.flipped
+			case .name:
+				return order == .forward
+					? lhs.name().compare(rhs.name(), options: .numeric) : rhs.name().compare(lhs.name(), options: .numeric)
+			case .fileExtension:
+				return order == .forward
+					? lhs.extension().compare(rhs.extension(), options: .numeric)
+					: rhs.extension().compare(lhs.extension(), options: .numeric)
+			}
+
+		// Compare directory with file or vice versa
+		case (true, false): return .orderedAscending  // This doesn't change when order is swapped
+		case (false, true): return .orderedDescending  // This doesn't change when order is swapped
+
+		// Compare entries among themselves
+		case (false, false):
+			switch self.sortBy {
+			case .lastModifiedDate:
+				let r = compareDates(lhs.modifiedAt()?.date(), rhs.modifiedAt()?.date())
+				return order == .forward ? r : r.flipped
+
+			case .name:
+				return order == .forward
+					? lhs.name().compare(rhs.name(), options: .numeric) : rhs.name().compare(lhs.name(), options: .numeric)
+
+			case .fileExtension:
+				return order == .forward
+					? lhs.extension().compare(rhs.extension(), options: .numeric)
+					: rhs.extension().compare(lhs.extension(), options: .numeric)
+
+			case .size:
+				let sa = lhs.size()
+				let sb = rhs.size()
+				if sa == sb {
+					return .orderedSame
+				}
+				else if sa < sb {
+					return ascending
+				}
+				else {
+					return descending
+				}
+			}
+		}
+	}
+}