Feature/merge vault to db (#100)

* Create vault db * Implement vault db queries * Add Vault data source methods * Adding a vault file to database * Working on merging the vault files to database * Working on merging the vault files to database * Working on merging the vault files to database * Working on merging the vault files to database * Merge root file to database * Refactor and clean code * Refactor and clean code * Merge root file to database * Merge root file to database * Merge root file to database * Handle tella file types * Uncomment code * Refactor unlock action * Update Tella file type function * Fix typo * Divide add files result functions * Separate adding file completion to separate functions * Remove unused code * Add throws when opening the database * Remove the single quotes around (tableName) * Use Swift's native error handling instead of catching errors * Move the rootId to the Vault constant file * Update VaultFilesManager initialisation * Update VaultFilesManager initialisation * Refactor select query * Use TimeInterval instead of Double
Horizontal-org · Dec 4, 2023 · a0bc5d9 · a0bc5d9
1 parent eaf3ddc
commit a0bc5d9
Show file tree

Hide file tree

Showing 128 changed files with 3,301 additions and 2,262 deletions.
diff --git a/Tella.xcodeproj/project.pbxproj b/Tella.xcodeproj/project.pbxproj
diff --git a/Tella/Application/AppViewState.swift b/Tella/Application/AppViewState.swift
@@ -48,7 +48,7 @@ final class AppViewState: ObservableObject {
     }
 
     func resetToUnlock() {
-        homeViewModel.resetVaultManager()
+        homeViewModel.resetData()
         viewStack = [.UNLOCK]
     }
 
@@ -61,7 +61,7 @@ final class AppViewState: ObservableObject {
     }
 
     func resetApp() {
-        homeViewModel.keysInitialized() ? self.resetToUnlock() : self.resetToLock()
+        homeViewModel.vaultManager.keysInitialized() ? self.resetToUnlock() : self.resetToLock()
     }
 
     func initLanguage() {

diff --git a/Tella/Application/TellaApp.swift b/Tella/Application/TellaApp.swift
@@ -17,7 +17,7 @@ struct TellaApp: App {
 
     var body: some Scene {
         WindowGroup {
-            ContentView(mainAppModel: appViewState.homeViewModel)
+            ContentView(mainAppModel: appViewState.homeViewModel, appViewState: appViewState)
                 .environmentObject(appViewState)
                 .onReceive(NotificationCenter.default.publisher(for: UIScreen.capturedDidChangeNotification)) { value in
                     appViewState.homeViewModel.shouldShowRecordingSecurityScreen = UIScreen.main.isCaptured

diff --git a/Tella/Components/ImagePickerSheet.swift b/Tella/Components/ImagePickerSheet.swift
@@ -13,11 +13,9 @@ struct ImagePickerCompletion {
         case image
     }
     let type: MediaType
-    var image: UIImage? = nil
-    var videoURL: URL? = nil
-    var pathExtension: String? = nil
     var referenceURL: URL? = nil
-    var imageURL: URL? = nil
+    var mediaURL: URL? = nil
+
 }
 
 //  SwiftUI wrapper for ImagePickerController for <= iOS 14.0
@@ -59,21 +57,11 @@ class ImageCoordinator: NSObject, UINavigationControllerDelegate, UIImagePickerC
         let mediaURL = info[UIImagePickerController.InfoKey.mediaURL] as? URL
         let referenceURL = info[UIImagePickerController.InfoKey.referenceURL] as? URL
         let imageURL = info[UIImagePickerController.InfoKey.imageURL] as? URL
+
         if mediaType as! CFString == kUTTypeImage {
-            guard let unwrapImage = info[UIImagePickerController.InfoKey.originalImage] as? UIImage else {
-                return
-            }
-            //completion(unwrapImage, nil,mediaURL?.pathExtension, referenceURL, imageURL)
-            completion(ImagePickerCompletion(type: .image,image: unwrapImage,
-                                             pathExtension: mediaURL?.pathExtension,
-                                             referenceURL: referenceURL,
-                                             imageURL: imageURL))
+            completion(ImagePickerCompletion(type: .image, referenceURL: referenceURL, mediaURL: imageURL))
         } else if mediaType as! CFString == kUTTypeMovie {
-            guard let videoURL = info[UIImagePickerController.InfoKey.mediaURL] as? URL else {
-                return
-            }
-            completion(ImagePickerCompletion(type: .video, videoURL: videoURL, referenceURL: referenceURL))
-            //completion(nil, videoURL, nil, nil, nil)
+            completion(ImagePickerCompletion(type: .video, referenceURL: referenceURL, mediaURL: mediaURL))
         }
     }
 

diff --git a/Tella/Components/ImportFilesProgressView/CancelImportView.swift b/Tella/Components/ImportFilesProgressView/CancelImportView.swift
@@ -6,7 +6,7 @@ import SwiftUI
 
 struct CancelImportView: View {
 
-    @ObservedObject var mainAppModel: MainAppModel
+    @EnvironmentObject var mainAppModel: MainAppModel
 
     var importFilesProgressProtocol : ImportFilesProgressProtocol
 
@@ -18,25 +18,18 @@ struct CancelImportView: View {
                                msgText: importFilesProgressProtocol.cancelMessage,
                                cancelText: importFilesProgressProtocol.exitCancelImportButtonTitle,
                                actionText: importFilesProgressProtocol.cancelImportButtonTitle) {
-                mainAppModel.vaultManager.progress.resume()
-                mainAppModel.cancelImportAndEncryption()
+                mainAppModel.vaultFilesManager?.cancelImportAndEncryption()
                 sheetManager.hide()
-
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
-                    mainAppModel.vaultManager.progress.stop()
-                })
-
+
             } didCancelAction: {
-                mainAppModel.vaultManager.progress.resume()
                 sheetManager.hide()
             }
         }
     }
 }
-
+//
 struct CancelImportView_Previews: PreviewProvider {
     static var previews: some View {
-        CancelImportView( mainAppModel: MainAppModel.stub(),
-                          importFilesProgressProtocol: ImportFilesProgress())
+        CancelImportView( importFilesProgressProtocol: ImportFilesProgress())
     }
 }
diff --git a/Tella/Components/ImportFilesProgressView/ImportFilesProgressView.swift b/Tella/Components/ImportFilesProgressView/ImportFilesProgressView.swift
@@ -8,6 +8,7 @@ struct ImportFilesProgressView: View {
 
     @EnvironmentObject var mainAppModel : MainAppModel
     @EnvironmentObject var sheetManager: SheetManager
+    @ObservedObject var progress : ProgressFile
 
     var importFilesProgressProtocol : ImportFilesProgressProtocol
     var modalHeight : CGFloat = 215
@@ -33,12 +34,12 @@ struct ImportFilesProgressView: View {
                     .frame(height: 10)
 
                 if importFilesProgressProtocol.progressType == .number {
-                    Text(String.init(format:importFilesProgressProtocol.progressMessage ,  mainAppModel.vaultManager.progress.progressFile.value))
+                    Text(String.init(format:importFilesProgressProtocol.progressMessage ,  progress.progressFile))
                         .font(.custom(Styles.Fonts.regularFontName, size: 14))
                         .foregroundColor(.white)
 
                 } else {
-                    Text(String.init(format:importFilesProgressProtocol.progressMessage + " " , Int(mainAppModel.vaultManager.progress.progress.value * 100)))
+                    Text(String.init(format:importFilesProgressProtocol.progressMessage + " " , Int(progress.progress * 100)))
 
                         .font(.custom(Styles.Fonts.regularFontName, size: 14))
                         .foregroundColor(.white)
@@ -47,15 +48,14 @@ struct ImportFilesProgressView: View {
                 Spacer()
                     .frame(height: 8)
 
-                ProgressView("", value: mainAppModel.vaultManager.progress.progress.value, total: 1)
+                ProgressView("", value: progress.progress, total: 1)
                     .accentColor(.green)
 
                 Spacer()
 
                 HStack {
                     Spacer()
                     Button(importFilesProgressProtocol.cancelImportButtonTitle) {
-                        mainAppModel.vaultManager.progress.pause()
                         showCancelImportView()
                     }
                     .foregroundColor(Color.white)
@@ -64,12 +64,9 @@ struct ImportFilesProgressView: View {
             }
         }
         .padding(EdgeInsets(top: 25, leading: 25, bottom: 35, trailing: 25))
-        .onReceive(mainAppModel.vaultManager.progress.isFinishing) { isFinishing in
+        .onReceive( progress.$isFinishing) { isFinishing in
             if isFinishing {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
-                    sheetManager.hide()
-//                    mainAppModel.vaultManager.clearTmpDirectory()
-                }
+                sheetManager.hide()
             }
         }
     }
@@ -78,14 +75,15 @@ struct ImportFilesProgressView: View {
         sheetManager.showBottomSheet( modalHeight: 152,
                                       shouldHideOnTap: false,
                                       content: {
-            CancelImportView(mainAppModel: mainAppModel,
-                             importFilesProgressProtocol: importFilesProgressProtocol)
+            CancelImportView(importFilesProgressProtocol: importFilesProgressProtocol)
         })
     }
 }
 
 struct ImportFilesProgressView_Previews: PreviewProvider {
     static var previews: some View {
-        ImportFilesProgressView(importFilesProgressProtocol: ImportFilesProgress())
+        ImportFilesProgressView(progress: ProgressFile(),
+                                importFilesProgressProtocol: ImportFilesProgress())
+        .background(Styles.Colors.backgroundMain)
     }
 }
diff --git a/Tella/Components/Tabs/PageView.swift b/Tella/Components/Tabs/PageView.swift
@@ -8,9 +8,9 @@ class PageViewItem {
 
     var title : String
     var page : Pages
-    var number : String
+    var number : Int
 
-    init(title: String, page: Pages, number: String) {
+    init(title: String, page: Pages, number: Int) {
         self.title = title
         self.page = page
         self.number = number
@@ -20,7 +20,7 @@ class PageViewItem {
 public struct PageView: View {
 
     @Binding var selectedOption: Pages
-    @Binding var pageViewItems : [PageViewItem]
+     var pageViewItems : [PageViewItem]
 
     public var body: some View {
         HStack(spacing: 20) {

diff --git a/Tella/Components/Tabs/PageViewCell.swift b/Tella/Components/Tabs/PageViewCell.swift
@@ -7,7 +7,7 @@ import SwiftUI
 struct  PageViewCell: View {
 
     let title: String
-    let number: String
+    let number: Int
 
     let page: Pages
 
@@ -21,13 +21,13 @@ struct  PageViewCell: View {
 
             let selected: Bool = page == selectedOption
             VStack {
-                HStack {
+                HStack(spacing: 3) {
                     Text(title)
                         .font(.custom(Styles.Fonts.boldFontName, size: 15))
                         .foregroundColor(selected ? .white : .white.opacity(0.5))
                         .padding(.bottom, 1)
-                    if !number.isEmpty {
-                        Text(number)
+                    if number > 0 {
+                        Text("(\(number))")
                             .font(.custom(Styles.Fonts.boldFontName, size: 15))
                             .foregroundColor(Styles.Colors.yellow)
                     }

diff --git a/Tella/Components/VaultFileImages.swift b/Tella/Components/VaultFileImages.swift
@@ -4,7 +4,7 @@
 
 import SwiftUI
 
-extension VaultFile {
+extension VaultFileDB {
     var gridImage: AnyView {
         AnyView(
             GeometryReader { geometryReader in
@@ -26,7 +26,7 @@ extension VaultFile {
     }
 }
 
-extension VaultFile {
+extension VaultFileDB {
     var listImage: AnyView {
         AnyView(
             ZStack{

diff --git a/Tella/Data/AuthenticationManager.swift b/Tella/Data/AuthenticationManager.swift
diff --git a/Tella/Data/Database/Common/DataBaseHelper.swift b/Tella/Data/Database/Common/DataBaseHelper.swift
@@ -13,25 +13,28 @@ class DataBaseHelper {
 
     var dbPointer: OpaquePointer?
 
-    func openDatabases(key: String?) {
+    init(key: String?, databaseName: String) throws {
 
-        dbURL =  FileManager.documentDirectory(withPath: D.databaseName)
+        dbURL =  FileManager.documentDirectory(withPath:databaseName)
 
         guard let key = key else { return }
 
         if sqlite3_open(dbURL?.path, &dbPointer) != SQLITE_OK {
             debugLog("Error opening database at \(dbURL?.absoluteString ?? "")!")
-            logDbErr("Error opening database")
+            logDbErr()
+            throw  RuntimeError("Error opening database")
+
         } else {
             debugLog("Opening database at \(dbURL?.absoluteString ?? "")")
         }
 
         if (sqlite3_key(dbPointer, key, Int32(key.count)) != SQLITE_OK) {
             logDbErr("Error setting key")
+            throw  RuntimeError("Error setting key")
         }
     }
 
-    func logDbErr(_ msg: String) {
+    func logDbErr(_ msg: String = "") {
         let errmsg = String(cString: sqlite3_errmsg(dbPointer)!)
         debugLog("\(msg): \(errmsg)")
     }

diff --git a/Tella/Data/Database/Common/DatabaseConstants.swift b/Tella/Data/Database/Common/DatabaseConstants.swift
@@ -10,7 +10,7 @@ struct D {
     /* DATABASE */
     static let databaseName = "tella_vault.db"
 
-    /* DATABASE VERSIO */
+    /* DATABASE VERSION */
 
     static let databaseVersion = 1
 

diff --git a/Tella/Data/Database/Common/DatabaseUtilities.swift b/Tella/Data/Database/Common/DatabaseUtilities.swift
@@ -6,7 +6,7 @@
 import Foundation
 import SQLite3
 
-extension TellaDataBase {
+extension DataBase {
 
     func cddl(_ columnName: String, _ columnType: String,  primaryKey : Bool ,  autoIncrement : Bool) -> String {
         return columnName + " " + columnType + (primaryKey ?  " PRIMARY KEY "  : "") +  (autoIncrement ? " AUTOINCREMENT " : "");
@@ -47,6 +47,14 @@ extension TellaDataBase {
     func comma() -> String {
         return " , ";
     }
-
-
+
+    func parseDicToObjectOf<T:Codable>(type: T.Type, dic: Any) throws -> T {
+        let data = try JSONSerialization.data(withJSONObject: dic)
+        let decodedValues = try JSONDecoder().decode(T.self, from: data)
+        return decodedValues
+    }
+
+
 }
+
+
diff --git a/Tella/Data/Database/Common/KeyValue.swift b/Tella/Data/Database/Common/KeyValue.swift
@@ -9,10 +9,34 @@ import Foundation
 struct KeyValue {
     var key : String
     var value : Any?
+    var sqliteOperator : SQliteOperator
+
+    init(key: String, value: Any? = nil, sqliteOperator: SQliteOperator = .empty) {
+        self.key = key
+        self.value = value
+        self.sqliteOperator = sqliteOperator
+    }
+
 }
 
 
 struct KeyValues {
     var key : String
     var value : [Any]
+
+    var sqliteOperator : SQliteOperator
+
+
+    init(key: String, value: [Any], sqliteOperator: SQliteOperator = .empty) {
+        self.key = key
+        self.value = value
+        self.sqliteOperator = sqliteOperator
+    }
 }
+
+enum SQliteOperator: String {
+    case empty = " "
+    case and = " AND "
+    case or = " OR "
+}
+