Merge pull request #277 from merlos/fix/open-folder-crashes-app

Fix: Tap on folder icon crashes app sometimes

Author: merlos

Diff for: OpenGpxTracker/GPXFileInfo.swift

@@ -14,24 +14,46 @@ import Foundation
 ///
 class GPXFileInfo: NSObject {
 
+    /// Cached modified date. Assumes a short lived time. It keeps the value of the size that only once is retrived from the filesystem
+    var _modifiedDate: Date?
+    
+    /// Cached filesize. Assuming a short lived time it keeps the value so only once is retrieved
+    var _fileSize: Int?
+    
     /// file URL
     var fileURL: URL = URL(fileURLWithPath: "")
 
-    /// Last time the file was modified
+    /// Returns last time the file was modified
+    /// The date is cached in the internal variable _modifiedDate,.
+    /// If for some reason the date cannot be retrieved it returns `Date.distantPast`
+    ///
     var modifiedDate: Date {
-        // swiftlint:disable:next force_try
-        return try! fileURL.resourceValues(forKeys: [.contentModificationDateKey]).contentModificationDate ?? Date.distantPast
+        if _modifiedDate != nil {
+            return _modifiedDate!
+        }
+        guard let resourceValues = try? fileURL.resourceValues(forKeys: [.contentModificationDateKey]),
+              let _modifiedDate = resourceValues.contentModificationDate else {
+            return Date.distantPast // Default value if the modification date cannot be retrieved
+        }
+        return _modifiedDate
     }
-    
     /// modified date has a time ago string (for instance: 3 days ago)
     var modifiedDatetimeAgo: String {
         return modifiedDate.timeAgo(numericDates: true)
     }
 
     /// File size in bytes
+    /// It returns -1 if there is any issue geting the size from the filesystem
+    /// It caches the values in _filezise
     var fileSize: Int {
-        // swiftlint:disable:next force_try
-        return try! fileURL.resourceValues(forKeys: [.fileSizeKey]).fileSize ?? 0
+        if (_fileSize != nil) {
+            return _fileSize!
+        }
+        guard let resourceValues = try? fileURL.resourceValues(forKeys: [.fileSizeKey]),
+              let _filesize = resourceValues.fileSize else {
+            return -1 // Default value if the file size cannot be retrieved
+        }
+        return _filesize
     }
 
     /// File size as string in a more readable format (example: 10 KB)
@@ -40,6 +62,9 @@ class GPXFileInfo: NSObject {
     }
 
     /// The filename without extension
+    /// Example:
+    ///  /path/to/file.ext => file
+    ///
     var fileName: String {
         return fileURL.deletingPathExtension().lastPathComponent
     }

Diff for: OpenGpxTracker/GPXFileManager.swift

@@ -7,21 +7,22 @@
 
 import Foundation
 
-/// GPX File extension
-let kFileExt = ["gpx", "GPX"]
-
 ///
 /// Class to handle actions with GPX files (save, delete, etc..)
 ///
 /// It works on the default document directory of the app.
 ///
 class GPXFileManager: NSObject {
 
+    /// List of GPX File extension
+    static let gpxExtList = ["gpx", "GPX"]
+
     ///
     /// Folder that where all GPX files are stored
     ///
     class var GPXFilesFolderURL: URL {
         if let customFolderURL = Preferences.shared.gpxFilesFolderURL {
+            print("GPXFileManager: using custom folder: \(customFolderURL)")
             return customFolderURL
         }
         let documentsUrl = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0] as URL
@@ -32,17 +33,13 @@ class GPXFileManager: NSObject {
     /// Gets the list of `.gpx` files in Documents directory ordered by modified date
     ///
     class var fileList: [GPXFileInfo] {
-        let fileManager = FileManager.default
-        let documentsURL = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
-        var files = self.fetchFilesList(from: documentsURL)
-        if let customFolderURL = Preferences.shared.gpxFilesFolderURL {
-            _ = customFolderURL.startAccessingSecurityScopedResource()
-            files += self.fetchFilesList(from: customFolderURL)
-            customFolderURL.stopAccessingSecurityScopedResource()
-        }
-        return files.sorted { lhs, rhs in
-            return lhs.modifiedDate > rhs.modifiedDate
+        let documentsURL = GPXFileManager.GPXFilesFolderURL
+        if documentsURL.startAccessingSecurityScopedResource() {
+            let files = self.fetchFilesList(from: documentsURL)
+            documentsURL.stopAccessingSecurityScopedResource()
+            return files
         }
+        return []
     }
 
     ///
@@ -55,8 +52,8 @@ class GPXFileManager: NSObject {
         var fullURL = self.GPXFilesFolderURL.appendingPathComponent(filename)
         print("URLForFilename(\(filename): pathForFilename: \(fullURL)")
         // Check if filename has extension
-        if  !(kFileExt.contains(fullURL.pathExtension)) {
-            fullURL = fullURL.appendingPathExtension(kFileExt[0])
+        if  !(gpxExtList.contains(fullURL.pathExtension)) {
+            fullURL = fullURL.appendingPathExtension(gpxExtList[0])
         }
         return fullURL
     }
@@ -189,6 +186,7 @@ class GPXFileManager: NSObject {
     private class func fetchFilesList(from rootURL: URL) -> [GPXFileInfo] {
         var GPXFiles: [GPXFileInfo] = []
         let fileManager = FileManager.default
+        print("====================================================================")
         do {
             // Get all files from the directory .documentsURL. Of each file get the URL (~path)
             // last modification date and file size
@@ -204,17 +202,18 @@ class GPXFileManager: NSObject {
                      fileSize: (try? url.resourceValues(forKeys: [.fileSizeKey]))?.fileSize ?? 0)
                     }
                     .sorted(by: { $0.1 > $1.1 }) // sort descending modification dates
-                print(sortedURLs)
                 // Now we filter GPX Files
                 for (url, modificationDate, fileSize) in sortedURLs {
-                    if kFileExt.contains(url.pathExtension) {
+                    if gpxExtList.contains(url.pathExtension) {
                         GPXFiles.append(GPXFileInfo(fileURL: url))
                         let lastPathComponent = url.deletingPathExtension().lastPathComponent
-                        print("\(modificationDate) \(modificationDate.timeAgo(numericDates: true)) \(fileSize)bytes -- \(lastPathComponent)")
+                        print("fetchFileList: GPXFileInfo added \(modificationDate) \(modificationDate.timeAgo(numericDates: true)) \(fileSize)bytes -- \(lastPathComponent)")
                     }
                 }
             }
         }
+        print("fetchFilesList: returned \(GPXFiles.count) files")
+        print("====================================================================")
         return GPXFiles
     }
 }