dev: remove cancelled download status

Author: InfinityLoop1308

android/src/main/kotlin/project/pipepipe/app/PipePipeApplication.kt

@@ -63,6 +63,11 @@ class PipePipeApplication : Application() {
         SharedContext.platformDatabaseActions = AndroidPlatformDatabaseActions(this)
         SharedContext.platformDatabaseActions.initializeDatabase()
 
+        // Clean up cancelled downloads (legacy status)
+        GlobalScope.launch {
+            runCatching { DatabaseOperations.deleteAllCancelledDownloads() }
+        }
+
         // Initialize youtubedl-android and FFmpeg
         try {
             YoutubeDL.getInstance().init(this)

android/src/main/kotlin/project/pipepipe/app/download/DownloadManager.kt

@@ -232,7 +232,7 @@ class DownloadManager(private val context: Context) {
     }
 
     /**
-     * Cancel a download
+     * Cancel a download (delete directly)
      */
     fun cancelDownload(downloadId: Long) {
         Log.d(TAG, "Canceling download: $downloadId")
@@ -241,8 +241,12 @@ class DownloadManager(private val context: Context) {
         activeWorkers.remove(downloadId)
         updateActiveDownloadIds()
 
+        // Cancel progress notification
+        DownloadService.cancelProgressNotification(context, downloadId)
+
         scope.launch {
-            DatabaseOperations.updateDownloadStatus(downloadId, DownloadStatus.CANCELED.name, null)
+            // Delete from database
+            DatabaseOperations.deleteDownload(downloadId)
 
             // Start next queued download
             startNextInQueue()

android/src/main/kotlin/project/pipepipe/app/download/DownloadWorker.kt

@@ -119,7 +119,6 @@ class DownloadWorker(
                 onStateChange(DownloadStatus.PAUSED, null)
             } else {
                 Log.d(TAG, "Download canceled by user")
-                onStateChange(DownloadStatus.CANCELED, null)
             }
         } catch (e: Exception) {
             Log.e(TAG, "Download error", e)

android/src/main/kotlin/project/pipepipe/app/service/DownloadService.kt

@@ -166,5 +166,10 @@ class DownloadService : Service() {
                 notificationManager.notify(PROGRESS_NOTIFICATION_BASE_ID + downloadId.toInt(), notification)
             }
         }
+
+        fun cancelProgressNotification(context: Context, downloadId: Long) {
+            val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.cancel(PROGRESS_NOTIFICATION_BASE_ID + downloadId.toInt())
+        }
     }
 }

android/src/main/kotlin/project/pipepipe/app/ui/item/DownloadItem.kt

@@ -262,7 +262,7 @@ private fun TitleRow(
                         )
                     }
 
-                    DownloadStatus.FAILED, DownloadStatus.CANCELED -> {
+                    DownloadStatus.FAILED -> {
                         DropdownMenuItem(
                             text = { Text(stringResource(MR.strings.retry)) },
                             leadingIcon = { Icon(Icons.Default.Refresh, contentDescription = null) },
@@ -389,7 +389,6 @@ private fun BottomStatusSection(state: DownloadItemState) {
                         DownloadStatus.PREPROCESSING -> stringResource(MR.strings.download_pre_processing)
                         DownloadStatus.POSTPROCESSING -> stringResource(MR.strings.download_post_processing)
                         DownloadStatus.FAILED -> "Failed: ${state.errorMessage?.take(30) ?: "Unknown error"}"
-                        DownloadStatus.CANCELED -> "Canceled"
                         DownloadStatus.DOWNLOADING -> state.downloadSpeed
                             ?: stringResource(MR.strings.download_pre_processing)
 

library/src/commonMain/kotlin/project/pipepipe/app/database/DatabaseOperations.kt

@@ -745,4 +745,8 @@ object DatabaseOperations {
     suspend fun findDownloadByUrlAndType(url: String, downloadType: String) = withContext(Dispatchers.IO) {
         database.appDatabaseQueries.findDownloadByUrlAndType(url, downloadType).executeAsOneOrNull()
     }
+
+    suspend fun deleteAllCancelledDownloads() = withContext(Dispatchers.IO) {
+        database.appDatabaseQueries.deleteAllCancelledDownloads()
+    }
 }

library/src/commonMain/kotlin/project/pipepipe/app/uistate/BaseUiState.kt

@@ -170,10 +170,9 @@ enum class DownloadStatus {
     POSTPROCESSING,
     PAUSED,
     COMPLETED,
-    FAILED,
-    CANCELED;
+    FAILED;
 
-    fun isTerminal() = this in listOf(COMPLETED, FAILED, CANCELED)
+    fun isTerminal() = this in listOf(COMPLETED, FAILED)
     fun isActive() = this in listOf(QUEUED, FETCHING_INFO, PREPROCESSING, DOWNLOADING, POSTPROCESSING)
 }
 

library/src/commonMain/kotlin/project/pipepipe/app/viewmodel/DownloadViewModel.kt

@@ -23,19 +23,13 @@ class DownloadViewModel : BaseViewModel<DownloadUiState>(DownloadUiState()) {
      */
     private fun observeDownloads() {
         viewModelScope.launch {
-            try {
-                // Get all downloads and observe changes
-                val downloads = DatabaseOperations.getAllDownloads()
-                val downloadItems = downloads.map { it.toDownloadItemState() }
-
-                setState { state ->
-                    state.copy(
-                        downloads = downloadItems,
-                        activeDownloadCount = downloadItems.count { it.status.isActive() }
-                    )
-                }
-            } catch (e: Exception) {
-                // Handle error silently or log
+            val downloads = DatabaseOperations.getAllDownloads()
+            val downloadItems = downloads.map { it.toDownloadItemState() }
+            setState { state ->
+                state.copy(
+                    downloads = downloadItems,
+                    activeDownloadCount = downloadItems.count { it.status.isActive() }
+                )
             }
         }
     }

library/src/commonMain/sqldelight/project/pipepipe/database/AppDatabase.sq

@@ -695,3 +695,6 @@ SELECT * FROM downloads WHERE url = ? AND quality = ? AND download_type = ? LIMI
 
 findDownloadByUrlAndType:
 SELECT * FROM downloads WHERE url = ? AND download_type = ? LIMIT 1;
+
+deleteAllCancelledDownloads:
+DELETE FROM downloads WHERE status = 'CANCELED';