Refactor backup and import processes to use profile for CSV (#367)

* Refactor backup and import processes to use updated data retrieval methods

* Treat blank CSV profile names as absent to prevent invalid profile creation (#368)

* Initial plan

* Handle blank/whitespace profile names in CSV import

Co-authored-by: yogeshpaliyal <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: yogeshpaliyal <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>
Co-authored-by: yogeshpaliyal <[email protected]>

Author: yogeshpaliyal

app/src/main/java/com/yogeshpaliyal/deepr/backup/AutoBackupWorker.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
 import com.yogeshpaliyal.deepr.DeeprQueries
-import com.yogeshpaliyal.deepr.ListDeeprWithTagsAsc
+import com.yogeshpaliyal.deepr.GetLinksForBackup
 import com.yogeshpaliyal.deepr.preference.AppPreferenceDataStore
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
@@ -37,7 +37,7 @@ class AutoBackupWorker(
                     return@withContext
                 }
 
-                val dataToExport = deeprQueries.listDeeprWithTagsAsc().executeAsList()
+                val dataToExport = deeprQueries.getLinksForBackup().executeAsList()
                 if (dataToExport.isEmpty()) {
                     return@withContext
                 }
@@ -60,7 +60,7 @@ class AutoBackupWorker(
     private fun saveToSelectedLocation(
         location: String,
         fileName: String = "deepr_backup.csv",
-        data: List<ListDeeprWithTagsAsc>,
+        data: List<GetLinksForBackup>,
     ): Boolean =
         try {
             // For content:// URIs from document picker, create a new document in that folder

app/src/main/java/com/yogeshpaliyal/deepr/backup/CsvWriter.kt

@@ -1,14 +1,14 @@
 package com.yogeshpaliyal.deepr.backup
 
 import com.opencsv.CSVWriter
-import com.yogeshpaliyal.deepr.ListDeeprWithTagsAsc
+import com.yogeshpaliyal.deepr.GetLinksForBackup
 import com.yogeshpaliyal.deepr.util.Constants
 import java.io.OutputStream
 
 class CsvWriter {
     fun writeToCsv(
         outputStream: OutputStream,
-        data: List<ListDeeprWithTagsAsc>,
+        data: List<GetLinksForBackup>,
     ) {
         outputStream.bufferedWriter().use { writer ->
             // Write Header
@@ -24,6 +24,7 @@ class CsvWriter {
                         Constants.Header.TAGS,
                         Constants.Header.THUMBNAIL,
                         Constants.Header.IS_FAVOURITE,
+                        Constants.Header.PROFILE_NAME,
                     ),
                 )
                 // Write Data
@@ -35,9 +36,10 @@ class CsvWriter {
                             item.openedCount.toString(),
                             item.name,
                             item.notes,
-                            item.tagsNames ?: "",
+                            item.tags ?: "",
                             item.thumbnail,
                             item.isFavourite.toString(),
+                            item.profileName,
                         ),
                     )
                 }

app/src/main/java/com/yogeshpaliyal/deepr/backup/ExportRepositoryImpl.kt

@@ -30,7 +30,7 @@ class ExportRepositoryImpl(
         if (count == 0L) {
             return RequestResult.Error(context.getString(R.string.no_data_to_export))
         }
-        val dataToExportInCsvFormat = deeprQueries.listDeeprWithTagsAsc().executeAsList()
+        val dataToExportInCsvFormat = deeprQueries.getLinksForBackup().executeAsList()
         if (dataToExportInCsvFormat.isEmpty()) {
             return RequestResult.Error(context.getString(R.string.no_data_available_export))
         }

app/src/main/java/com/yogeshpaliyal/deepr/backup/ImportRepositoryImpl.kt

@@ -15,7 +15,7 @@ class ImportRepositoryImpl(
     deeprQueries: DeeprQueries,
     appPreferenceDataStore: AppPreferenceDataStore,
 ) : ImportRepository {
-    private val csvImporter = CsvBookmarkImporter(context, deeprQueries)
+    private val csvImporter = CsvBookmarkImporter(context, deeprQueries, appPreferenceDataStore)
     private val chromeImporter = ChromeBookmarkImporter(context, deeprQueries, appPreferenceDataStore)
     private val mozillaImporter = MozillaBookmarkImporter(context, deeprQueries, appPreferenceDataStore)
 

app/src/main/java/com/yogeshpaliyal/deepr/backup/importer/ChromeBookmarkImporter.kt

@@ -3,7 +3,7 @@ package com.yogeshpaliyal.deepr.backup.importer
 import android.content.Context
 import com.yogeshpaliyal.deepr.DeeprQueries
 import com.yogeshpaliyal.deepr.preference.AppPreferenceDataStore
-import kotlinx.coroutines.flow.singleOrNull
+import kotlinx.coroutines.flow.first
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 
@@ -22,7 +22,7 @@ class ChromeBookmarkImporter(
 
         // Chrome bookmarks use <a> tags inside <dt> elements
         val links = document.select("dt > a[href]")
-        val profileId = appPreferenceDataStore.getSelectedProfileId.singleOrNull() ?: 1L
+        val profileId = appPreferenceDataStore.getSelectedProfileId.first()
         links.forEach { link ->
             val url = link.attr("href")
             val title = link.text()

app/src/main/java/com/yogeshpaliyal/deepr/backup/importer/CsvBookmarkImporter.kt

@@ -7,8 +7,10 @@ import com.opencsv.CSVReaderBuilder
 import com.opencsv.exceptions.CsvException
 import com.yogeshpaliyal.deepr.DeeprQueries
 import com.yogeshpaliyal.deepr.backup.ImportResult
+import com.yogeshpaliyal.deepr.preference.AppPreferenceDataStore
 import com.yogeshpaliyal.deepr.util.Constants
 import com.yogeshpaliyal.deepr.util.RequestResult
+import kotlinx.coroutines.flow.first
 import java.io.IOException
 
 /**
@@ -17,13 +19,16 @@ import java.io.IOException
 class CsvBookmarkImporter(
     private val context: Context,
     private val deeprQueries: DeeprQueries,
+    private val appPreferenceDataStore: AppPreferenceDataStore,
 ) : BookmarkImporter {
     override suspend fun import(uri: Uri): RequestResult<ImportResult> {
         var updatedCount = 0
         var skippedCount = 0
 
         try {
+            val defaultProfileId = appPreferenceDataStore.getSelectedProfileId.first()
             context.contentResolver.openInputStream(uri)?.use { inputStream ->
+
                 inputStream.reader().use { reader ->
                     val customParser =
                         CSVParserBuilder()
@@ -54,21 +59,21 @@ class CsvBookmarkImporter(
                             val tagsString = row.getOrNull(5) ?: ""
                             val thumbnail = row.getOrNull(6) ?: ""
                             val isFavourite = row.getOrNull(7)?.toLongOrNull() ?: 0
-                            val profileName = row.getOrNull(8)
+                            val profileName = row.getOrNull(8)?.trim()?.takeIf { it.isNotBlank() }
                             val existing = deeprQueries.getDeeprByLink(link).executeAsOneOrNull()
                             if (link.isNotBlank() && existing == null) {
                                 updatedCount++
                                 deeprQueries.transaction {
                                     val profileID =
                                         profileName?.let {
-                                            val profile = deeprQueries.getProfileByName(profileName).executeAsOneOrNull()
+                                            val profile = deeprQueries.getProfileByName(it).executeAsOneOrNull()
                                             if (profile == null) {
-                                                deeprQueries.insertProfile(profileName)
+                                                deeprQueries.insertProfile(it)
                                                 deeprQueries.lastInsertRowId().executeAsOneOrNull()
                                             } else {
                                                 profile.id
                                             }
-                                        }
+                                        } ?: defaultProfileId
                                     deeprQueries.importDeepr(
                                         link = link,
                                         openedCount = openedCount,
@@ -77,7 +82,7 @@ class CsvBookmarkImporter(
                                         thumbnail = thumbnail,
                                         isFavourite = isFavourite,
                                         createdAt = createdAt,
-                                        profileId = profileID ?: 1L,
+                                        profileId = profileID,
                                     )
                                     val linkId = deeprQueries.lastInsertRowId().executeAsOne()
 

app/src/main/java/com/yogeshpaliyal/deepr/backup/importer/HtmlBookmarkImporter.kt

@@ -6,7 +6,7 @@ import com.yogeshpaliyal.deepr.DeeprQueries
 import com.yogeshpaliyal.deepr.backup.ImportResult
 import com.yogeshpaliyal.deepr.preference.AppPreferenceDataStore
 import com.yogeshpaliyal.deepr.util.RequestResult
-import kotlinx.coroutines.flow.singleOrNull
+import kotlinx.coroutines.flow.firstOrNull
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -34,7 +34,7 @@ abstract class HtmlBookmarkImporter(
                     val existing = deeprQueries.getDeeprByLink(bookmark.url).executeAsOneOrNull()
                     if (bookmark.url.isNotBlank() && existing == null) {
                         try {
-                            val profileId = appPreferenceDataStore.getSelectedProfileId.singleOrNull() ?: 1L
+                            val profileId = appPreferenceDataStore.getSelectedProfileId.firstOrNull() ?: 1L
                             deeprQueries.transaction {
                                 deeprQueries.insertDeepr(
                                     link = bookmark.url,

app/src/main/java/com/yogeshpaliyal/deepr/backup/importer/MozillaBookmarkImporter.kt

@@ -3,7 +3,7 @@ package com.yogeshpaliyal.deepr.backup.importer
 import android.content.Context
 import com.yogeshpaliyal.deepr.DeeprQueries
 import com.yogeshpaliyal.deepr.preference.AppPreferenceDataStore
-import kotlinx.coroutines.flow.singleOrNull
+import kotlinx.coroutines.flow.first
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 
@@ -33,7 +33,7 @@ class MozillaBookmarkImporter(
             val lastModified = link.attr("last_modified")
             val shortcutUrl = link.attr("shortcuturl")
             val tags = link.attr("tags")
-            val profileId = appPreferenceDataStore.getSelectedProfileId.singleOrNull() ?: 1L
+            val profileId = appPreferenceDataStore.getSelectedProfileId.first()
             if (url.isNotBlank() && !url.startsWith("place:")) {
                 val tagList =
                     if (tags.isNotBlank()) {

app/src/main/java/com/yogeshpaliyal/deepr/util/Constants.kt

@@ -10,5 +10,6 @@ object Constants {
         const val TAGS = "Tags"
         const val THUMBNAIL = "Thumbnail"
         const val IS_FAVOURITE = "isFavourite"
+        const val PROFILE_NAME = "profileName"
     }
 }