@capacitor-community/sqlite 3.3.3-3 → 3.3.3

package/ios/Plugin/CapacitorSQLitePlugin.m

@@ -12,6 +12,7 @@ CAP_PLUGIN(CapacitorSQLitePlugin, "CapacitorSQLite",
            CAP_PLUGIN_METHOD(getNCDatabasePath, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(open, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(close, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(getUrl, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getVersion, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(execute, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(executeSet, CAPPluginReturnPromise);

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -207,6 +207,39 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
     }
 
+    // MARK: - GetUrl
+
+    @objc func getUrl(_ call: CAPPluginCall) {
+        guard let dbName = call.options["database"] as? String else {
+            retHandler.rResult(
+                call: call,
+                message: "GetUrl: Must provide a database name")
+            return
+        }
+        do {
+            let res: String = try implementation?.getUrl(dbName) ?? ""
+            if res.count > 0 {
+                retHandler.rUrl(call: call, ret: res)
+                return
+            } else {
+                retHandler.rUrl(
+                    call: call, ret: "",
+                    message: "getUrl: No path returned")
+                return
+            }
+        } catch CapacitorSQLiteError.failed(let message) {
+            retHandler.rUrl(
+                call: call, ret: "",
+                message: "getUrl: \(message)")
+            return
+        } catch let error {
+            retHandler.rUrl(
+                call: call, ret: "",
+                message: "getUrl: \(error)")
+            return
+        }
+    }
+
     // MARK: - getVersion
 
     @objc func getVersion(_ call: CAPPluginCall) {

package/ios/Plugin/Database.swift

@@ -81,6 +81,12 @@ class Database {
         return ncDB
     }
 
+    // MARK: - getUrl
+
+    func getUrl () -> String {
+        return "file://\(path)"
+    }
+
     // MARK: - Open
 
     // swiftlint:disable cyclomatic_complexity

package/ios/Plugin/ReturnHandler.swift

@@ -106,4 +106,16 @@ class ReturnHandler {
             return
         }
     }
+    // MARK: - rUrl
+
+    func rUrl(call: CAPPluginCall, ret: String,
+              message: String? = nil) {
+        if let intMessage = message {
+            call.reject(intMessage)
+            return
+        } else {
+            call.resolve(["url": ret])
+            return
+        }
+    }
 }

package/ios/Plugin/Utils/UtilsFile.swift

@@ -29,24 +29,17 @@ enum UtilsFileError: Error {
     case getFolderURLFailed(message: String)
     case createDirFailed(message: String)
     case moveAllDBSQLiteFailed(message: String)
+    case createDatabaseLocationFailed(message: String)
 }
 // swiftlint:disable file_length
 // swiftlint:disable type_body_length
 class UtilsFile {
 
-    // MARK: - IsFileExist
-
-    class func isDirExist(dirPath: String) -> Bool {
-        var isDir: ObjCBool = true
-        let fileManager = FileManager.default
-        let exists = fileManager.fileExists(atPath: dirPath, isDirectory: &isDir)
-        return exists && isDir.boolValue
-    }
-
-    class func createDirCopyDB(url: URL) throws {
+    class func createDatabaseLocation(location: String) throws {
         do {
-            var dirUrl = url
-            let dirPath: String = url.path
+            var dirUrl: URL = try UtilsFile
+                .getFolderURL(folderPath: location)
+            let dirPath: String = dirUrl.path
             if !UtilsFile.isDirExist(dirPath: dirPath) {
                 // create the directory
                 try FileManager.default
@@ -54,20 +47,31 @@ class UtilsFile {
                 // exclude the directory from iCloud Backup
                 try UtilsFile.setExcludeFromiCloudBackup(&dirUrl,
                                                          isExcluded: true)
-                // move all SQLite database from Documents folder
-                // to this new directory
-                try UtilsFile.moveAllDBSQLite(dirUrl: dirUrl)
+                // move all existing dbs from "Documents" to location folder
+                if location.prefix(9) != "Documents" &&
+                    location.prefix(7) != "default" {
+
+                    try UtilsFile.moveAllDBSQLite(dirUrl: dirUrl)
+                }
             }
         } catch UtilsFileError.getFolderURLFailed(let message) {
-            throw UtilsFileError.createDirFailed(message: message)
+            throw UtilsFileError.createDatabaseLocationFailed(message: message)
         } catch UtilsFileError.moveAllDBSQLiteFailed(let message) {
-            throw UtilsFileError.createDirFailed(message: message)
+            throw UtilsFileError.createDatabaseLocationFailed(message: message)
         } catch let error {
-            var msg: String = "createDir command failed :"
+            var msg: String = "CreateDatabaseLocation command failed :"
             msg.append(" \(error.localizedDescription)")
-            throw UtilsFileError.createDirFailed(message: msg)
+            throw UtilsFileError.createDatabaseLocationFailed(message: msg)
         }
+    }
 
+    // MARK: - IsFileExist
+
+    class func isDirExist(dirPath: String) -> Bool {
+        var isDir: ObjCBool = true
+        let fileManager = FileManager.default
+        let exists = fileManager.fileExists(atPath: dirPath, isDirectory: &isDir)
+        return exists && isDir.boolValue
     }
 
     // MARK: - moveAllDBSQLite
@@ -175,11 +179,6 @@ class UtilsFile {
         do {
             let url: URL = try UtilsFile
                 .getFolderURL(folderPath: databaseLocation)
-            if databaseLocation.prefix(9) != "Documents" &&
-                databaseLocation.prefix(7) != "default" {
-                // create the directories if they do not exists
-                try UtilsFile.createDirCopyDB(url: url)
-            }
             let dbPath: String = url
                 .appendingPathComponent("\(fileName)").path
             return dbPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.3.3-3",
+  "version": "3.3.3",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",