fix: 修复没有标记取消状态的Item

Author: shoaky009

core/src/main/kotlin/io/github/shoaky/sourcedownloader/core/processor/CoreProcessContext.kt

@@ -20,6 +20,7 @@ class CoreProcessContext(
     val stat: ProcessStat = ProcessStat(processName)
     private val currentProcessItemPathsMapping: Multimap<CoreItemContent, Path> = ArrayListMultimap.create()
     private val processedItems: MutableList<SourceItem> = mutableListOf()
+    private val cancelItems: MutableSet<SourceItem> = mutableSetOf()
     private var hasError: Boolean = false
     override fun processor(): ProcessorInfo {
         return processor
@@ -64,4 +65,12 @@ class CoreProcessContext(
             .map { it.key }
     }
 
+    fun cancelItem(sourceItem: SourceItem) {
+        cancelItems.add(sourceItem)
+    }
+
+    fun isItemCanceled(sourceItem: SourceItem): Boolean {
+        return cancelItems.contains(sourceItem)
+    }
+
 }

core/src/main/kotlin/io/github/shoaky/sourcedownloader/core/processor/SourceProcessor.kt

@@ -754,7 +754,7 @@ class SourceProcessor(
                 log.debug("Processor:'{}' {} filtered item:{}", name, filterBy::class.simpleName, sourceItem)
                 return ProcessingContent(name, itemContent).copy(status = FILTERED)
             }
-
+            val itemContext = ItemContext()
             val mover = this.selectUpdateStatusMover()
             var replaceFiles: List<CoreFileContent> = emptyList()
             processLock.lock {
@@ -771,16 +771,26 @@ class SourceProcessor(
                 secondaryFileMover.preoccupiedTargetPath(sourceItem, targetPaths)
                 replaceFiles = identifyFilesToReplace(itemContent)
                 context.addItemPaths(itemContent, targetPaths)
-            }
 
-            val (shouldDownload, contentStatus) = probeContentStatus(itemContent, replaceFiles)
-            log.trace(
-                "Processor:'{}' item:{}, shouldDownload: {}, contentStatus:{}",
-                name, sourceItem, shouldDownload, contentStatus
-            )
-            val processingContent = postProcessingContent(
-                ProcessingContent(name, itemContent).copy(status = contentStatus)
-            )
+                val (shouldDownload, contentStatus) = probeContentStatus(itemContent, replaceFiles)
+                itemContext.shouldDownload = shouldDownload
+                itemContext.status = contentStatus
+                if (context.isItemCanceled(sourceItem)) {
+                    itemContext.status = CANCELLED
+                }
+                log.trace(
+                    "Processor:'{}' item:{}, shouldDownload: {}, contentStatus:{}",
+                    name, sourceItem, shouldDownload, contentStatus
+                )
+                val processingContent = postProcessingContent(
+                    ProcessingContent(name, itemContent).copy(status = itemContext.status)
+                )
+                itemContext.content = processingContent
+            }
+            val shouldDownload = itemContext.shouldDownload
+            val contentStatus = itemContext.status
+            val processingContent = itemContext.content
+            checkNotNull(processingContent)
 
             if (shouldDownload) {
                 val success = doDownload(processingContent, replaceFiles)
@@ -860,6 +870,7 @@ class SourceProcessor(
                                     content.fileContents.filter { it.targetPath() == existTargetPath }
                                         .onEach { it.status = FileContentStatus.REPLACED }
                                     cancelItem(content.sourceItem, fileContent, discardedItems)
+                                    context.cancelItem(content.sourceItem)
                                 }
                         }
                     }
@@ -966,6 +977,12 @@ class SourceProcessor(
         }
     }
 
+    private data class ItemContext(
+        var shouldDownload: Boolean = false,
+        var status: ProcessingContent.Status = NO_FILES,
+        var content: ProcessingContent? = null
+    )
+
     private fun invokeListeners(
         mode: ListenerMode = ListenerMode.EACH,
         inProcess: Boolean = true,

plugins/telegram4j-plugin/build.gradle.kts

@@ -2,6 +2,14 @@ plugins {
     `java-library`
 }
 
+// repositories {
+//     rootProject.repositories.add(
+//         maven {
+//             url = uri("https://mvn.mchv.eu/repository/mchv/")
+//         }
+//     )
+// }
+
 dependencies {
     implementation(project(":sdk"))
     implementation(project(":common"))
@@ -12,4 +20,7 @@ dependencies {
 
     implementation(libs.zxing.core)
     implementation(libs.telegram4j)
+    // implementation(platform("it.tdlight:tdlight-java-bom:3.4.0+td.1.8.26"))
+    // implementation("it.tdlight:tdlight-java")
+    // implementation(group = "it.tdlight", name = "tdlight-natives", classifier = "macos_arm64")
 }