feat: 链接附件时给附件添加个条目标签

ikaros-dev · Oct 19, 2024 · 2b26c2d · 2b26c2d
1 parent 37bf14c
commit 2b26c2d
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 12 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,4 +1,8 @@
 
+# 17.1.3
+
+- 链接附件时给附件添加个条目标签
+
 # 17.1.2
 
 - 修复添加标签的问题

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ ext {
     springContext = '6.0.3'
     pf4j = '3.8.0'
     lombok = '1.18.24'
-    libFile = 'lib/api-0.17.0.jar'
+    libFile = 'lib/api-0.17.4.jar'
 }
 
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=run.ikaros.plugin
 description=A mikan plugin for ikaros.
-version=17.1.2
+version=17.1.3
diff --git a/lib/api-0.17.0-sources.jar → lib/api-0.17.4-sources.jar b/lib/api-0.17.0-sources.jar → lib/api-0.17.4-sources.jar
diff --git a/lib/api-0.17.0.jar → lib/api-0.17.4.jar b/lib/api-0.17.0.jar → lib/api-0.17.4.jar
diff --git a/src/main/java/run/ikaros/plugin/mikan/MikanSubHandler.java b/src/main/java/run/ikaros/plugin/mikan/MikanSubHandler.java
@@ -14,12 +14,11 @@
 import run.ikaros.api.core.attachment.AttachmentReferenceOperate;
 import run.ikaros.api.core.subject.Subject;
 import run.ikaros.api.core.subject.SubjectOperate;
+import run.ikaros.api.core.tag.Tag;
+import run.ikaros.api.core.tag.TagOperate;
 import run.ikaros.api.infra.properties.IkarosProperties;
 import run.ikaros.api.infra.utils.FileUtils;
-import run.ikaros.api.store.enums.AttachmentReferenceType;
-import run.ikaros.api.store.enums.AttachmentType;
-import run.ikaros.api.store.enums.FileType;
-import run.ikaros.api.store.enums.SubjectSyncPlatform;
+import run.ikaros.api.store.enums.*;
 import run.ikaros.plugin.mikan.qbittorrent.QbTorrentInfoFilter;
 import run.ikaros.plugin.mikan.qbittorrent.QbittorrentClient;
 import run.ikaros.plugin.mikan.qbittorrent.model.QbTorrentInfo;
@@ -47,18 +46,20 @@ public class MikanSubHandler {
     private final SubjectOperate subjectOperate;
     private final AttachmentOperate attachmentOperate;
     private final AttachmentReferenceOperate attachmentReferenceOperate;
+    private final TagOperate tagOperate;
     private final IkarosProperties ikarosProperties;
     private RuntimeMode pluginRuntimeMode;
 
     public MikanSubHandler(MikanClient mikanClient, QbittorrentClient qbittorrentClient,
                            SubjectOperate subjectOperate, AttachmentOperate attachmentOperate,
-                           AttachmentReferenceOperate attachmentReferenceOperate,
+                           AttachmentReferenceOperate attachmentReferenceOperate, TagOperate tagOperate,
                            IkarosProperties ikarosProperties) {
         this.mikanClient = mikanClient;
         this.qbittorrentClient = qbittorrentClient;
         this.subjectOperate = subjectOperate;
         this.attachmentOperate = attachmentOperate;
         this.attachmentReferenceOperate = attachmentReferenceOperate;
+        this.tagOperate = tagOperate;
         this.ikarosProperties = ikarosProperties;
     }
 
@@ -177,9 +178,16 @@ private Mono<Subject> matchingSingleFile(Subject subject, String fileName, Long
         return attachmentOperate.findByTypeAndParentIdAndName(AttachmentType.File, parentId,
                         fileName)
                 .map(Attachment::getId)
-                .flatMap(attId -> attachmentReferenceOperate
+                .flatMap(attId -> tagOperate.create(Tag.builder()
+                        .createTime(LocalDateTime.now())
+                        .type(TagType.ATTACHMENT)
+                        .masterId(attId)
+                        .name("subject:" + subject.getId())
+                        .userId(-1L)
+                        .build()))
+                .flatMap(tag -> attachmentReferenceOperate
                         .matchingAttachmentsAndSubjectEpisodes(
-                                subject.getId(), new Long[]{attId}, true))
+                                subject.getId(), new Long[]{tag.getMasterId()}, true))
                 .then(Mono.just(subject));
     }
 

diff --git a/src/main/resources/plugin.yaml b/src/main/resources/plugin.yaml
@@ -4,8 +4,8 @@ name: PluginMikan
 # plugin entry class that extends BasePlugin
 clazz: run.ikaros.plugin.mikan.MikanPlugin
 # plugin 'version' is a valid semantic version string (see semver.org).
-version: 17.1.1
-requires: ">=0.17.0"
+version: 17.1.3
+requires: ">=0.17.4"
 author:
   name: Ikaros OSS Team
   website: https://github.com/ikaros-dev

diff --git a/src/test/java/run/ikaros/plugin/mikan/MikanSubHandlerTest.java b/src/test/java/run/ikaros/plugin/mikan/MikanSubHandlerTest.java
@@ -31,7 +31,7 @@ void parseMikanSubRssAndAddToQbittorrent() {
         qc.setBaseSavePath("C:\\Users\\chivehao\\Videos\\Tests");
         qc.setConfig(config);
 
-        MikanSubHandler mikanSubHandler = new MikanSubHandler(mc, qc, null, null, null, null);
+        MikanSubHandler mikanSubHandler = new MikanSubHandler(mc, qc, null, null, null, null, null);
 
         StepVerifier.create(mikanSubHandler.parseMikanSubRssAndAddToQbittorrent())
                 .verifyComplete();