From 2b26c2d160942aee65886e2c2c38083869e3cf16 Mon Sep 17 00:00:00 2001 From: chivehao Date: Sat, 19 Oct 2024 13:16:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=93=BE=E6=8E=A5=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=E7=BB=99=E9=99=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E6=9D=A1=E7=9B=AE=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.MD | 4 ++++ build.gradle | 2 +- gradle.properties | 2 +- ...7.0-sources.jar => api-0.17.4-sources.jar} | Bin 70781 -> 71333 bytes lib/{api-0.17.0.jar => api-0.17.4.jar} | Bin 186192 -> 189157 bytes .../ikaros/plugin/mikan/MikanSubHandler.java | 22 ++++++++++++------ src/main/resources/plugin.yaml | 4 ++-- .../plugin/mikan/MikanSubHandlerTest.java | 2 +- 8 files changed, 24 insertions(+), 12 deletions(-) rename lib/{api-0.17.0-sources.jar => api-0.17.4-sources.jar} (85%) rename lib/{api-0.17.0.jar => api-0.17.4.jar} (82%) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 14de3fa..d6d8041 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,4 +1,8 @@ +# 17.1.3 + +- 链接附件时给附件添加个条目标签 + # 17.1.2 - 修复添加标签的问题 diff --git a/build.gradle b/build.gradle index 0a46d7b..d13a2cc 100644 --- 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 index 0bd08cc..da5fb02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group=run.ikaros.plugin description=A mikan plugin for ikaros. -version=17.1.2 \ No newline at end of file +version=17.1.3 \ No newline at end of file diff --git a/lib/api-0.17.0-sources.jar b/lib/api-0.17.4-sources.jar similarity index 85% rename from lib/api-0.17.0-sources.jar rename to lib/api-0.17.4-sources.jar index 724bc63ebb6b99dda7e765d585cb2add8758690a..9d696cf767b3f2d701af65c223fb1366bf2ff492 100644 GIT binary patch delta 2955 zcmZWqc_7qV8=i9vGt6Lyi5iS(k)fibMKKB~Dk_D_Qr26Phzbdp7Kxm6+Dp`RBg(X? z)U~vbN{d8VwYj1wsfh3VeuI49H~+lP^PJ~>&-uM)nP1t=OR9@_mI~;l6HB^H@&{C*RGv%qymx@X*vmvxjoQ5DsVqNKftA)b>v}Xb8ubl@OPQ#x4xX=Y&6?&`8ADbfVs^Nl$=5@ zd*sx(&QtQOQgR#iM5ysv{)AMg#{J`4iGQgPq+_3mdG4JrY9HoeHelZj4 zuAA<*S(ez)w6wr)eQIY!sMcZEmxB5>%SP)=FaON_g$Z_ATc*@X-@Z{?p89RFdv=f@ z)VO6_@)r}2*(>5IX6);kaB^dQn30i1a`x$Z#|N+e_IsEUaO`_$=lZ5)ZLJTF#;AE7 zR6W*geOCR5_6gPjtIYiP(mU&$CN*Dkv^*GaJpX*itOGwITWyyI)SL@Z<7XB{Gu>Tn zqf>6%rxbZ+j!f&uJ{`FxA%;IXE?j6#`cRW{$fw6_Q}k|8)ZA}7p9QbwUthgb`}wJS z;YrcO^w`ctQQ5lV9~PA_;`qj->OE|#-dF#=y-rtp#pb?1juW^50icgIx3N&68<$VG zTZE`g)WBdcK9EBpMj^|F#Q2Z34h!>M5fJ1X9JbKgf6O1=;ob?()^p`dxmRXZ=tddi zD6fP^@?-1=Y5oK?=N_D{owT-KklO1{K1QSBhVF7mYpq=GyBk@zn^TgbbCOd&jr8B`_DH?{Ug^UDmTr@e~GIT=MGk@pPtj2 zJYmD+GKqxm5PN1(*2B8!6w&kC*zkhHP%Yla;TzaDU#SZ6FWr36{{Cc!shY=)r-rzs zE^w2vy#0?zt51)k7`?YiTH-b`kZx7awxQ_sJ+4%<^eIP~>eX9^o=*ozui8-0-7zsP zJ8mnLmQtIjz-xVRZqaOuoXK0fa~Gx?n|;kV zej+XUefHVJDKFah|7&g*9M88ie{;^+gv~49&C7X}z>h-DA`A|1ueR?Bugr_=Hn6+p zx>@qNXrXWB6050I*?CvRTcS}quldqqeRkLEiDIqn>5kgE`5`Y zE4~70{Jj_Q)N_D*tIen=Jy@MGNRGS!XiU?g|9uH+n}VRWEedfFA-|87FvO0ApIcby z_Q$bswS7NzvgaVULaSV9ddgJ??X2fAsm;Wu0w9D9Zs@+D271}bM2B0sL;vqa z^nC+~S+QE~eP-qVx*`ZP3_^LWLTI<7*DwtRE$#E7$!+7nAynKp1lcX+Bkhk|bgWGT zUwP05-7oU!S(_LNJ$tDY6noKd%~yF8`9%y@{HCg&3g{M*jt!8$&Vqj4y$QB($8wb6 zHyGXfDuyL8xYC=0MD1eGnD%WLTGcLwhCT><8-@O9w}R@v1bV@JezcPG%?|PcNdD-w z4lyjG&|qZKF&?G`($FGc2s%kd%2p!1@4Bd+K(LBHcQ|+r2}UUUyE$CA7QOs#19wnC zh$KIzLB~)U?)xzj>W3lI^_r;hhZruVpdMKe52vyKmuJx5X&$55dXH>0C6tYlev09< zK5Bq^2(4L1az`TPPBGL9C(r<8by~w25d<2ig$sy>hbDFjVeooNK`~ttcyt3Q?pg)6 zZKN|L8-@`R7p13Xm@ zh(RrdjnM8ySwEI+8F-zZY^4{Nl&FZilt~Ij<5YPd z!d!WRFVYzKZRg?J3V?@hB@L`sHW6u@M-`Y)M7=R|K+gY1D-v;LNOgIHi1JaP&m^*wC2LLL zkSYe3X@aT>hu~kzfQP#{q>T0znZ<-l{3_S_i2^Dr;^1^HN&HExv*DzFsL`Q#v@-cN zi{gI5!YRsNJcOkKlqO{`6`GadT|A(PB`SbR{h#4^DnJVc(y9*Lrb23G$q1?{Q^NHs zBxluiDo2MB(C{)o*5Q*)K3>M-^xe*^Sbdzz10v#3$9bycNR-nYcc_x|$eXfs!yD>U zDi?&J08AhNLgE6v(YRZ2Au~?E1 delta 2434 zcmZ8i2~<=^7VWC;hKAmu*_z!2p_yS-7y$tV33!XU>WyFtfMP+28l-r-b6 zf<)s2X95Fh6VVwL3~@%lC?0|_1QInNYJh;UFEaIi10mDr^r?IAyY*iEs`r1LujkFx z^2A$%xjY4jBM@-(?ZZ!sZMbx3a$D)k?N^1XV|@vhP!KiL)wQ<(aX6h^Kz?qAx3zD< z&Wc{>@X0DZCbB$Yo#!tuu082!TP@sPkTc+CecQaV(W%wgXj5!+#v3PuakBZ_yKW`? z$+bgJWYrhYQ*}D?-t!>y5M{GgU~?|*Z6Ml4m8&JHmiASAjhVp z^!c@q?cFM~W&I8HF^_KeuKsG$EctNw{if_P7uS6~v$M8dmL67(`IVx&{E?ekZ=Ld# zRDPGgq2)9EZ^aQhXG8L8cVpX4{(kaH3a8++Z*R!jwW=Z^uV=8R(oe5uqst3f$VC0t zJti^dJ5-lSBQt8$(ISUv*LN$rSA2IlJegcf|Bt`P+4UO-K0fV!HM?-`j^EFjqy1x^sS~*_&C2g@ zgftvX3TdBph`&|RHD~PZ>|8VG9N54wc6m?WdF9FBIAyV;+AN?`!R@gP1B6z9EP)S3 z(Gqy@N}*1Sk?!G67095Z)C#QHMC!AxJwm;>lXN58mc?$iJwHXk%ZB;STA+~^5N4_Hyjy9sVVTsRJfdh5x6EEI_(VM^q3?5 zMgxBuTZfGjShZ{CDpI9S&&T%>50b`}xJRRZFdl#qjkZ&RL}TkTvay z%TgDjLHJG@q-7{!#f%E0bQUJhY``rV*fQgeNd`PVXaw?E74Bf5HN;aW%w*vEa{^FP zwrzoh zyG!(0t|9yIp7ToldQs-Xq4`kkae%tqnJC%GMWRYeB*BpfA^mT5l{=6f{*ZwVl}*SO zxBZnuKW2x?W`vY@@(>du6$tqtJF<(uv*aa00XX;w>EzNEI5uC0Bx0HamIOOGTSWRX zqRo}J=n@boE_xGpTf9zUBpWBEW(n9NS<`NcySBU}n zMT=&7Sq!_%%*k49ivL)`;zQcV179tr*q+qt&`znWTHc1Ue`j29v&xW(ib$A%F78+r zD~8qZA+%bTR0(Lh(&`0G%BCS)9lE$5&od(N(xEj>YFR^XojzkwVZ|pfQg2KK82l!K z9bsTl2DuH(%m2Wdpr%1eJcY;%hNdL=UOkZukrhmiOUalnts-h*gzb2nnluTKC8&Oq z!kW*Pr+JT!#Np2`F^*NFT7-0ow+O9A{iIQdRx^Shp80$!szan=jqEjP!7^3yq;%m@-s3hfvNFZtCG;-uV L98TodOu7F7(CntM diff --git a/lib/api-0.17.0.jar b/lib/api-0.17.4.jar similarity index 82% rename from lib/api-0.17.0.jar rename to lib/api-0.17.4.jar index a1c4aba1f5c98d236550e97817539332dd08bf53..259d45aede30040e99ec285dcf56d88d51737646 100644 GIT binary patch delta 11780 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 VF$9md9$F8L%NBkaA>PHb{{zYZdGG)L delta 8812 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 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 index 9b7911d..cab60d5 100644 --- 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 index 9f48315..47bfa1c 100644 --- 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();