Add support for multiple accounts on FeedSyncIosWorker

prof18 · Jul 29, 2024 · 570a17e · 570a17e
1 parent 5a7e93c
commit 570a17e
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 61 deletions.
diff --git a/iosApp/Source/Accounts/Dropbox/Data/DropboxDataSourceIos.swift b/iosApp/Source/Accounts/Dropbox/Data/DropboxDataSourceIos.swift
@@ -85,6 +85,7 @@ class DropboxDataSourceIos: DropboxDataSource {
         downloadParam: DropboxDownloadParam,
         completionHandler: @escaping (DropboxDownloadResult?, Error?) -> Void
     ) {
+        // TODO: download direclty in the database file?
         let fileManager = FileManager.default
         let directoryURL = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
         let destURL = directoryURL.appendingPathComponent(downloadParam.outputName)

diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/di/Koin.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/di/Koin.kt
@@ -11,13 +11,12 @@ import com.prof18.feedflow.feedsync.icloud.ICloudSettings
 import com.prof18.feedflow.shared.data.SettingsHelper
 import com.prof18.feedflow.shared.domain.DateFormatter
 import com.prof18.feedflow.shared.domain.HtmlRetriever
-import com.prof18.feedflow.shared.domain.accounts.AccountsRepository
 import com.prof18.feedflow.shared.domain.browser.BrowserSettingsRepository
 import com.prof18.feedflow.shared.domain.feed.FeedSourceLogoRetriever
 import com.prof18.feedflow.shared.domain.feed.FeedUrlRetriever
 import com.prof18.feedflow.shared.domain.feed.manager.FeedManagerRepository
 import com.prof18.feedflow.shared.domain.feed.retriever.FeedRetrieverRepository
-import com.prof18.feedflow.shared.domain.feedsync.FeedSyncAccountsRepository
+import com.prof18.feedflow.shared.domain.feedsync.AccountsRepository
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncMessageQueue
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncRepository
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncer
@@ -258,12 +257,6 @@ private val coreModule = module {
 
     singleOf(::FeedSyncMessageQueue)
 
-    factory {
-        FeedSyncAccountsRepository(
-            dropboxSettings = get(),
-        )
-    }
-
     singleOf(::AccountsRepository)
 
     factory {

diff --git a/...red/domain/accounts/AccountsRepository.kt → ...red/domain/feedsync/AccountsRepository.kt b/...red/domain/accounts/AccountsRepository.kt → ...red/domain/feedsync/AccountsRepository.kt
@@ -1,11 +1,12 @@
-package com.prof18.feedflow.shared.domain.accounts
+package com.prof18.feedflow.shared.domain.feedsync
 
 import com.prof18.feedflow.core.model.SyncAccounts
 import com.prof18.feedflow.feedsync.dropbox.DropboxSettings
 import com.prof18.feedflow.feedsync.icloud.ICloudSettings
 import com.prof18.feedflow.shared.domain.model.CurrentOS
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 
 internal class AccountsRepository(
     private val currentOS: CurrentOS,
@@ -51,16 +52,26 @@ internal class AccountsRepository(
         currentAccountMutableState.value = SyncAccounts.LOCAL
     }
 
-    private fun restoreAccounts() {
+    fun getCurrentSyncAccount(): SyncAccounts {
         val dropboxSettings = dropboxSettings.getDropboxData()
         if (dropboxSettings != null) {
-            currentAccountMutableState.value = SyncAccounts.DROPBOX
+            return SyncAccounts.DROPBOX
         }
         if (currentOS == CurrentOS.Ios) {
             val useICloud = icloudSettings.getUseICloud()
             if (useICloud) {
-                currentAccountMutableState.value = SyncAccounts.ICLOUD
+                return SyncAccounts.ICLOUD
             }
         }
+        return SyncAccounts.LOCAL
+    }
+
+    fun isSyncEnabled(): Boolean =
+        getCurrentSyncAccount() != SyncAccounts.LOCAL
+
+    private fun restoreAccounts() {
+        currentAccountMutableState.update {
+            getCurrentSyncAccount()
+        }
     }
 }
diff --git a/...ommonMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncAccountsRepository.kt b/...ommonMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncAccountsRepository.kt
diff --git a/...ed/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncRepository.kt b/...ed/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncRepository.kt
@@ -14,7 +14,7 @@ import kotlinx.datetime.Clock
 class FeedSyncRepository internal constructor(
     private val syncedDatabaseHelper: SyncedDatabaseHelper,
     private val feedSyncWorker: FeedSyncWorker,
-    private val feedSyncAccountRepository: FeedSyncAccountsRepository,
+    private val feedSyncAccountRepository: AccountsRepository,
     private val feedSyncMessageQueue: FeedSyncMessageQueue,
     private val dropboxSettings: DropboxSettings,
     private val logger: Logger,

diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/presentation/AccountsViewModel.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/presentation/AccountsViewModel.kt
@@ -1,7 +1,7 @@
 package com.prof18.feedflow.shared.presentation
 
 import com.prof18.feedflow.core.model.SyncAccounts
-import com.prof18.feedflow.shared.domain.accounts.AccountsRepository
+import com.prof18.feedflow.shared.domain.feedsync.AccountsRepository
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
 
 class AccountsViewModel internal constructor(

diff --git a/...c/commonMobileMain/kotlin/com/prof18/feedflow/shared/presentation/DropboxSyncViewModel.kt b/...c/commonMobileMain/kotlin/com/prof18/feedflow/shared/presentation/DropboxSyncViewModel.kt
@@ -10,8 +10,8 @@ import com.prof18.feedflow.feedsync.dropbox.DropboxSettings
 import com.prof18.feedflow.feedsync.dropbox.DropboxStringCredentials
 import com.prof18.feedflow.feedsync.dropbox.getDxCredentialsAsString
 import com.prof18.feedflow.shared.domain.DateFormatter
-import com.prof18.feedflow.shared.domain.accounts.AccountsRepository
 import com.prof18.feedflow.shared.domain.feed.retriever.FeedRetrieverRepository
+import com.prof18.feedflow.shared.domain.feedsync.AccountsRepository
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncMessageQueue
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncRepository
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutines

diff --git a/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/di/KoinIOS.kt b/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/di/KoinIOS.kt
@@ -99,6 +99,7 @@ internal actual fun getPlatformModule(appEnvironment: AppEnvironment): Module =
             appEnvironment = appEnvironment,
             dropboxSettings = get(),
             settingsRepository = get(),
+            accountsRepository = get(),
         )
     }
 

diff --git a/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncIosWorker.kt b/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncIosWorker.kt
@@ -1,6 +1,7 @@
 package com.prof18.feedflow.shared.domain.feedsync
 
 import co.touchlab.kermit.Logger
+import com.prof18.feedflow.core.model.SyncAccounts
 import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.core.utils.DispatcherProvider
 import com.prof18.feedflow.feedsync.database.data.SyncedDatabaseHelper.Companion.SYNC_DATABASE_NAME_DEBUG
@@ -43,6 +44,7 @@ internal class FeedSyncIosWorker(
     private val appEnvironment: AppEnvironment,
     private val dropboxSettings: DropboxSettings,
     private val settingsRepository: SettingsRepository,
+    private val accountsRepository: AccountsRepository,
 ) : FeedSyncWorker {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
@@ -59,8 +61,6 @@ internal class FeedSyncIosWorker(
     }
 
     private suspend fun performUpload() = withContext(dispatcherProvider.io) {
-        restoreDropboxClient()
-
         try {
             feedSyncer.populateSyncDbIfEmpty()
             feedSyncer.updateFeedItemsToSyncDatabase()
@@ -71,13 +71,7 @@ internal class FeedSyncIosWorker(
                 emitErrorMessage()
                 return@withContext
             }
-            val dropboxUploadParam = DropboxUploadParam(
-                path = "/${getDatabaseName()}.db",
-                url = databasePath,
-            )
-            dropboxDataSource.performUpload(dropboxUploadParam)
-            dropboxSettings.setLastUploadTimestamp(Clock.System.now().toEpochMilliseconds())
-            logger.d { "Upload to dropbox successfully" }
+            accountSpecificUpload(databasePath)
             settingsRepository.setIsSyncUploadRequired(false)
             emitSuccessMessage()
         } catch (e: Exception) {
@@ -87,24 +81,9 @@ internal class FeedSyncIosWorker(
     }
 
     override suspend fun download(): SyncResult = withContext(dispatcherProvider.io) {
-        val dropboxDownloadParam = DropboxDownloadParam(
-            path = "/${getDatabaseName()}.db",
-            outputName = "${getDatabaseName()}.db",
-        )
-
-        restoreDropboxClient()
-
         return@withContext try {
             feedSyncer.closeDB()
-            val result = dropboxDataSource.performDownload(dropboxDownloadParam)
-            val destinationUrl = result.destinationUrl
-            if (destinationUrl == null) {
-                logger.e { "Error downloading database" }
-                return@withContext SyncResult.Error
-            }
-            replaceDatabase(destinationUrl.url)
-            dropboxSettings.setLastDownloadTimestamp(Clock.System.now().toEpochMilliseconds())
-            SyncResult.Success
+            accountSpecificDownload()
         } catch (e: Exception) {
             logger.e("Download from dropbox failed", e)
             SyncResult.Error
@@ -205,4 +184,60 @@ internal class FeedSyncIosWorker(
         }
         return false
     }
+
+    private suspend fun accountSpecificUpload(databasePath: NSURL) =
+        when (accountsRepository.getCurrentSyncAccount()) {
+            SyncAccounts.DROPBOX -> {
+                restoreDropboxClient()
+                val dropboxUploadParam = DropboxUploadParam(
+                    path = "/${getDatabaseName()}.db",
+                    url = databasePath,
+                )
+                dropboxDataSource.performUpload(dropboxUploadParam)
+                dropboxSettings.setLastUploadTimestamp(Clock.System.now().toEpochMilliseconds())
+                logger.d { "Upload to dropbox successfully" }
+            }
+
+            SyncAccounts.ICLOUD -> {
+                // TODO
+                logger.d { "TODO: Upload to iCloud" }
+            }
+
+            SyncAccounts.LOCAL -> {
+                // Do nothing
+            }
+        }
+
+    private suspend fun accountSpecificDownload(): SyncResult {
+        return when (accountsRepository.getCurrentSyncAccount()) {
+            SyncAccounts.DROPBOX -> {
+                val dropboxDownloadParam = DropboxDownloadParam(
+                    path = "/${getDatabaseName()}.db",
+                    outputName = "${getDatabaseName()}.db",
+                )
+
+                restoreDropboxClient()
+                val result = dropboxDataSource.performDownload(dropboxDownloadParam)
+                val destinationUrl = result.destinationUrl
+                if (destinationUrl == null) {
+                    logger.e { "Error downloading database" }
+                    return SyncResult.Error
+                }
+                replaceDatabase(destinationUrl.url)
+                dropboxSettings.setLastDownloadTimestamp(Clock.System.now().toEpochMilliseconds())
+                SyncResult.Success
+            }
+
+            SyncAccounts.ICLOUD -> {
+                // TODO
+                logger.d { "TODO: Download from iCloud" }
+                SyncResult.Success
+            }
+
+            SyncAccounts.LOCAL -> {
+                // Do nothing
+                SyncResult.Success
+            }
+        }
+    }
 }
diff --git a/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/presentation/ICloudSyncViewModel.kt b/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/presentation/ICloudSyncViewModel.kt
@@ -4,7 +4,7 @@ import com.prof18.feedflow.core.model.AccountConnectionUiState
 import com.prof18.feedflow.core.model.AccountSyncUIState
 import com.prof18.feedflow.feedsync.icloud.ICloudSettings
 import com.prof18.feedflow.shared.domain.DateFormatter
-import com.prof18.feedflow.shared.domain.accounts.AccountsRepository
+import com.prof18.feedflow.shared.domain.feedsync.AccountsRepository
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncMessageQueue
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutines
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState

diff --git a/...rc/jvmMain/kotlin/com/prof18/feedflow/shared/presentation/DropboxSyncViewModel.desktop.kt b/...rc/jvmMain/kotlin/com/prof18/feedflow/shared/presentation/DropboxSyncViewModel.desktop.kt
@@ -15,8 +15,8 @@ import com.prof18.feedflow.feedsync.dropbox.DropboxException
 import com.prof18.feedflow.feedsync.dropbox.DropboxSettings
 import com.prof18.feedflow.feedsync.dropbox.DropboxStringCredentials
 import com.prof18.feedflow.shared.domain.DateFormatter
-import com.prof18.feedflow.shared.domain.accounts.AccountsRepository
 import com.prof18.feedflow.shared.domain.feed.retriever.FeedRetrieverRepository
+import com.prof18.feedflow.shared.domain.feedsync.AccountsRepository
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncRepository
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow