add subdir

Author: arslan2012

.gitignore

@@ -1,5 +1,6 @@
 .*.swp
 .DS_Store
+.idea/
 build/
 xcuserdata/
 CattleGrid.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/

CattleGrid/ContentView.swift

@@ -59,7 +59,7 @@ struct MainScreen: View {
             NavigationView {
                 if (tagStore.amiibos.count > 0) {
                     List(tagStore.amiibos, id:\.path) { amiibo in
-                        Text(amiibo.lastPathComponent).onTapGesture {
+                        Text(amiibo.relativePath).onTapGesture {
                             self.tagStore.load(amiibo)
                         }
                         .foregroundColor(self.selected(amiibo) ? .primary : .secondary)

CattleGrid/DirectoryWatcher.swift

@@ -15,20 +15,16 @@ public class DirectoryWatcher: NSObject {
     var watchedUrl: URL
 
     private var source: DispatchSourceFileSystemObject?
-    private var previousContents: Set<URL>
     private var queue: DispatchQueue?
     private var retriesLeft: Int!
     private var directoryChanging = false
 
     public var ignoreDirectories = true
-    public var onNewFiles: (([URL]) -> Void)?
-    public var onDeletedFiles: (([URL]) -> Void)?
+    public var onFilesChanged: (() -> Void)?
 
     //init
     init(watchedUrl: URL) {
         self.watchedUrl = watchedUrl
-        let contentsArray = (try? FileManager.default.contentsOfDirectory(at: watchedUrl, includingPropertiesForKeys: [.isDirectoryKey], options: .skipsHiddenFiles)) ?? []
-        self.previousContents = Set(contentsArray)
     }
 
     public class func watch(_ url: URL) -> DirectoryWatcher? {
@@ -79,8 +75,7 @@ public class DirectoryWatcher: NSObject {
 
     deinit {
         let _ = self.stopWatching()
-        self.onNewFiles = nil
-        self.onDeletedFiles = nil
+        self.onFilesChanged = nil
     }
 }
 
@@ -141,37 +136,7 @@ extension DirectoryWatcher {
             // Changes appear to be completed
             // Post a notification informing that the directory did change
             DispatchQueue.main.async {
-                let contentsArray = (try? FileManager.default.contentsOfDirectory(at: self.watchedUrl, includingPropertiesForKeys: [.isDirectoryKey], options: .skipsHiddenFiles)) ?? []
-                let newContents = Set(contentsArray)
-
-                let newElements = newContents.subtracting(self.previousContents)
-                let deletedElements = self.previousContents.subtracting(newContents)
-
-                self.previousContents = newContents
-
-                if !deletedElements.isEmpty {
-                    let elements = deletedElements.compactMap({ (element) -> URL? in
-                        let isDirectory = (try? element.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory ?? false
-
-                        guard (!isDirectory || !self.ignoreDirectories) else {
-                            return nil
-                        }
-                        return element
-                    })
-                    self.onDeletedFiles?(elements)
-                }
-
-                if !newElements.isEmpty {
-                    let elements = newElements.compactMap({ (element) -> URL? in
-                        let isDirectory = (try? element.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory ?? false
-
-                        guard (!isDirectory || !self.ignoreDirectories) else {
-                            return nil
-                        }
-                        return element
-                    })
-                    self.onNewFiles?(elements)
-                }
+                self.onFilesChanged?()
             }
         }
     }

CattleGrid/TagStore.swift

@@ -94,11 +94,7 @@ class TagStore : NSObject, ObservableObject, NFCTagReaderSessionDelegate {
                 return
             }
 
-            watcher.onNewFiles = { newFiles in
-              self.loadList()
-            }
-
-            watcher.onDeletedFiles = { deletedFiles in
+            watcher.onFilesChanged = {
               self.loadList()
             }
         }
@@ -122,21 +118,19 @@ class TagStore : NSObject, ObservableObject, NFCTagReaderSessionDelegate {
     }
 
     func loadList() {
-        do {
-            let items = try fm.contentsOfDirectory(at: getDocumentsDirectory(), includingPropertiesForKeys: [], options: [.skipsHiddenFiles, .skipsPackageDescendants, .skipsSubdirectoryDescendants])
-            let sortedItems = items.sorted(by: { $0.lastPathComponent < $1.lastPathComponent})
-            amiibos = sortedItems.filter({ (item) -> Bool in
-                do {
-                    let isDir = (try item.resourceValues(forKeys: [.isDirectoryKey])).isDirectory ?? false
-                    let isKeyRetail = item.lastPathComponent == KEY_RETAIL
-                    return !isDir && !isKeyRetail
-                } catch {
-                    return false
-                }
-            })
-        } catch {
-            // failed to read directory – bad permissions, perhaps?
+        let dirEnumerator = fm.enumerator(at: getDocumentsDirectory(), includingPropertiesForKeys: nil, options: [.includesDirectoriesPostOrder, .producesRelativePathURLs])!
+        var fileURLs: [URL] = []
+        for case let fileURL as URL in dirEnumerator {
+            guard let resourceValues = try? fileURL.resourceValues(forKeys: [.isDirectoryKey]),
+                let isDirectory = resourceValues.isDirectory
+                else {
+                    continue
+            }
+            if (!isDirectory) {
+                fileURLs.append(fileURL)
+            }
         }
+        amiibos = fileURLs.sorted(by: { $0.relativePath < $1.relativePath})
     }
 
     func getDocumentsDirectory() -> URL {