From fdbeff9506d4dbb66bfeb62b45a3a4cb73b5927e Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 20:43:54 +0800 Subject: [PATCH 01/11] Update workflow_download.py --- usage/workflow_download.py | 646 ++++++++++++++++++++++++++++++++++++- 1 file changed, 645 insertions(+), 1 deletion(-) diff --git a/usage/workflow_download.py b/usage/workflow_download.py index 9b480f0db..0c866331d 100644 --- a/usage/workflow_download.py +++ b/usage/workflow_download.py @@ -3,7 +3,651 @@ # 下方填入你要下载的本子的id，一行一个，每行的首尾可以有空白字符 jm_albums = ''' - +id +1207964 +631273 +435689 +643158 +618703 +620808 +628546 +126 +638627 +643308 +592437 +643130 +624151 +494679 +506291 +642026 +639801 +641132 +627137 +638671 +638685 +637736 +458391 +485542 +569092 +620863 +625789 +401727 +637421 +637719 +636721 +628562 +595531 +622722 +628389 +629138 +625243 +627904 +626314 +626220 +626490 +625795 +604109 +604787 +611605 +615389 +620234 +620897 +625759 +226836 +410272 +620677 +620678 +535938 +617912 +612198 +612203 +504833 +224406 +507769 +505203 +419967 +498708 +442179 +158 +584491 +298716 +138145 +565384 +603162 +603163 +603360 +603108 +581947 +594763 +580934 +595981 +595465 +571148 +596436 +588987 +581079 +579404 +564304 +576557 +582099 +432288 +546303 +560580 +582718 +548405 +453056 +509853 +432910 +/* +577637 +433651 +540468 +539382 +258170 +388960 +291029 +392330 +178271 +211921 +394149 +196314 +393906 +269672 +385760 +389781 +384716 +179365 +388563 +390353 +389479 +391645 +74 +391501 +244664 +348856 +374035 +388874 +389278 +389281 +375246 +386945 +339116 +122133 +301716 +180771 +203314 +344326 +258313 +382558 +356177 +380358 +387096 +94774 +385405 +123762 +317107 +150755 +308029 +381424 +149116 +384248 +384234 +382092 +378773 +317492 +348126 +302261 +191991 +371101 +284946 +320243 +309898 +165321 +152327 +125628 +199628 +384044 +383676 +382567 +372785 +161031 +382396 +371322 +368758 +383378 +382752 +381566 +300993 +349251 +381453 +378254 +363851 +379567 +143092 +368607 +379079 +377795 +325295 +318730 +179723 +343898 +263320 +374554 +375619 +377438 +183992 +377158 +376126 +308812 +316811 +376015 +100335 +376555 +374565 +374031 +373226 +368660 +373408 +372723 +372720 +316267 +354998 +372447 +368640 +371794 +369941 +113237 +369387 +370634 +369456 +244090 +5058 +36846 +177959 +221019 +323907 +367530 +367550 +365865 +203268 +361735 +365982 +291210 +258442 +362452 +211666 +146270 +236009 +361955 +601117 +349461 +136433 +362471 +357656 +314459 +362217 +361176 +361995 +354989 +361958 +361268 +349255 +338179 +226789 +137131 +361163 +232088 +360997 +340306 +266701 +350099 +349982 +348168 +231573 +360275 +314460 +360015 +289566 +116093 +147936 +305886 +292414 +354574 +359559 +355588 +358950 +358842 +351384 +353608 +263106 +310185 +356446 +358799 +339685 +357781 +356453 +358501 +358521 +343918 +351841 +216624 +218570 +356989 +88122 +206909 +342923 +85836 +355912 +280579 +301250 +84136 +138139 +306826 +355674 +254338 +355003 +129744 +273002 +355333 +114484 +349689 +307111 +341471 +353553 +205537 +353577 +337574 +349770 +353586 +150716 +330468 +351362 +308620 +352727 +235236 +344291 +76674 +83888 +94778 +305515 +343530 +351587 +346784 +188963 +350786 +349361 +342313 +46552 +90526 +182135 +133899 +347117 +140175 +330778 +348850 +347789 +245807 +348119 +348135 +230547 +345063 +319865 +288551 +346393 +303714 +141796 +346821 +345433 +345437 +319476 +306763 +305888 +344555 +345052 +341978 +342569 +213541 +123525 +345013 +343934 +345026 +77416 +336267 +342328 +342332 +90478 +12985 +94447 +308595 +261943 +298467 +301771 +390371 +338706 +324781 +337364 +339379 +339378 +339115 +339703 +339997 +340838 +340798 +310623 +338838 +340027 +340213 +340343 +340806 +260977 +339981 +1011 +147871 +335744 +279762 +306825 +149080 +139743 +139677 +141194 +187823 +335208 +290898 +335772 +316438 +335492 +182175 +151979 +188409 +332065 +240348 +226250 +332019 +332034 +331438 +325316 +324903 +326272 +330257 +330537 +330293 +326930 +313919 +313959 +308447 +310161 +308584 +308864 +305745 +237187 +148915 +308500 +290815 +304592 +307566 +294823 +305638 +305879 +305552 +305840 +304209 +123201 +305389 +136914 +305014 +305424 +305143 +281801 +292403 +277673 +286340 +302736 +232765 +304763 +304595 +304666 +148689 +303623 +104525 +304626 +20556 +304614 +304640 +122953 +123936 +291016 +303162 +287330 +255485 +203989 +304139 +3397 +304447 +304553 +302214 +304461 +304523 +301822 +302216 +302767 +302808 +302815 +251258 +299791 +302531 +95979 +178337 +178166 +152203 +189593 +212018 +225166 +302781 +301917 +236553 +301940 +302575 +149675 +151465 +301484 +301292 +301318 +266374 +105549 +222492 +301212 +301213 +300708 +296826 +121653 +181308 +293493 +257845 +274301 +281074 +286365 +286105 +282483 +283200 +230657 +248170 +285106 +281180 +249785 +284185 +279430 +284999 +222868 +278031 +123272 +107210 +177701 +3292 +3270 +95762 +3282 +3220 +3221 +212914 +239676 +276265 +208271 +254557 +272641 +274295 +188678 +267950 +276010 +277916 +277915 +276588 +197874 +267567 +9653 +1180 +260091 +7790 +25285 +4067 +33241 +33100 +275758 +124691 +179823 +273693 +274792 +275615 +250276 +188935 +190006 +232094 +272690 +273567 +273371 +274112 +274728 +265888 +266696 +268631 +268835 +272323 +268754 +135845 +271767 +200022 +256175 +271588 +271778 +122916 +146168 +137906 +232052 +262464 +271264 +269406 +195487 +195486 +270369 +243055 +229151 +271126 +23271 +270973 +271249 +208081 +235413 +119076 +213233 +220644 +271284 +243908 +270984 +246117 +248551 +264073 +255469 +205606 +65123 +263365 +113766 +232698 +270177 +217655 +270752 +5887 +27037 +27630 +265824 +180372 +187571 +256005 +239332 +226080 +235197 +103199 +270650 +270528 +*/ ''' From 631b38d0d0449880630220746d59da3d38f04d00 Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 20:47:42 +0800 Subject: [PATCH 02/11] Update workflow_download.py 1-10 test --- usage/workflow_download.py | 635 ------------------------------------- 1 file changed, 635 deletions(-) diff --git a/usage/workflow_download.py b/usage/workflow_download.py index 0c866331d..f0cf20477 100644 --- a/usage/workflow_download.py +++ b/usage/workflow_download.py @@ -13,641 +13,6 @@ 628546 126 638627 -643308 -592437 -643130 -624151 -494679 -506291 -642026 -639801 -641132 -627137 -638671 -638685 -637736 -458391 -485542 -569092 -620863 -625789 -401727 -637421 -637719 -636721 -628562 -595531 -622722 -628389 -629138 -625243 -627904 -626314 -626220 -626490 -625795 -604109 -604787 -611605 -615389 -620234 -620897 -625759 -226836 -410272 -620677 -620678 -535938 -617912 -612198 -612203 -504833 -224406 -507769 -505203 -419967 -498708 -442179 -158 -584491 -298716 -138145 -565384 -603162 -603163 -603360 -603108 -581947 -594763 -580934 -595981 -595465 -571148 -596436 -588987 -581079 -579404 -564304 -576557 -582099 -432288 -546303 -560580 -582718 -548405 -453056 -509853 -432910 -/* -577637 -433651 -540468 -539382 -258170 -388960 -291029 -392330 -178271 -211921 -394149 -196314 -393906 -269672 -385760 -389781 -384716 -179365 -388563 -390353 -389479 -391645 -74 -391501 -244664 -348856 -374035 -388874 -389278 -389281 -375246 -386945 -339116 -122133 -301716 -180771 -203314 -344326 -258313 -382558 -356177 -380358 -387096 -94774 -385405 -123762 -317107 -150755 -308029 -381424 -149116 -384248 -384234 -382092 -378773 -317492 -348126 -302261 -191991 -371101 -284946 -320243 -309898 -165321 -152327 -125628 -199628 -384044 -383676 -382567 -372785 -161031 -382396 -371322 -368758 -383378 -382752 -381566 -300993 -349251 -381453 -378254 -363851 -379567 -143092 -368607 -379079 -377795 -325295 -318730 -179723 -343898 -263320 -374554 -375619 -377438 -183992 -377158 -376126 -308812 -316811 -376015 -100335 -376555 -374565 -374031 -373226 -368660 -373408 -372723 -372720 -316267 -354998 -372447 -368640 -371794 -369941 -113237 -369387 -370634 -369456 -244090 -5058 -36846 -177959 -221019 -323907 -367530 -367550 -365865 -203268 -361735 -365982 -291210 -258442 -362452 -211666 -146270 -236009 -361955 -601117 -349461 -136433 -362471 -357656 -314459 -362217 -361176 -361995 -354989 -361958 -361268 -349255 -338179 -226789 -137131 -361163 -232088 -360997 -340306 -266701 -350099 -349982 -348168 -231573 -360275 -314460 -360015 -289566 -116093 -147936 -305886 -292414 -354574 -359559 -355588 -358950 -358842 -351384 -353608 -263106 -310185 -356446 -358799 -339685 -357781 -356453 -358501 -358521 -343918 -351841 -216624 -218570 -356989 -88122 -206909 -342923 -85836 -355912 -280579 -301250 -84136 -138139 -306826 -355674 -254338 -355003 -129744 -273002 -355333 -114484 -349689 -307111 -341471 -353553 -205537 -353577 -337574 -349770 -353586 -150716 -330468 -351362 -308620 -352727 -235236 -344291 -76674 -83888 -94778 -305515 -343530 -351587 -346784 -188963 -350786 -349361 -342313 -46552 -90526 -182135 -133899 -347117 -140175 -330778 -348850 -347789 -245807 -348119 -348135 -230547 -345063 -319865 -288551 -346393 -303714 -141796 -346821 -345433 -345437 -319476 -306763 -305888 -344555 -345052 -341978 -342569 -213541 -123525 -345013 -343934 -345026 -77416 -336267 -342328 -342332 -90478 -12985 -94447 -308595 -261943 -298467 -301771 -390371 -338706 -324781 -337364 -339379 -339378 -339115 -339703 -339997 -340838 -340798 -310623 -338838 -340027 -340213 -340343 -340806 -260977 -339981 -1011 -147871 -335744 -279762 -306825 -149080 -139743 -139677 -141194 -187823 -335208 -290898 -335772 -316438 -335492 -182175 -151979 -188409 -332065 -240348 -226250 -332019 -332034 -331438 -325316 -324903 -326272 -330257 -330537 -330293 -326930 -313919 -313959 -308447 -310161 -308584 -308864 -305745 -237187 -148915 -308500 -290815 -304592 -307566 -294823 -305638 -305879 -305552 -305840 -304209 -123201 -305389 -136914 -305014 -305424 -305143 -281801 -292403 -277673 -286340 -302736 -232765 -304763 -304595 -304666 -148689 -303623 -104525 -304626 -20556 -304614 -304640 -122953 -123936 -291016 -303162 -287330 -255485 -203989 -304139 -3397 -304447 -304553 -302214 -304461 -304523 -301822 -302216 -302767 -302808 -302815 -251258 -299791 -302531 -95979 -178337 -178166 -152203 -189593 -212018 -225166 -302781 -301917 -236553 -301940 -302575 -149675 -151465 -301484 -301292 -301318 -266374 -105549 -222492 -301212 -301213 -300708 -296826 -121653 -181308 -293493 -257845 -274301 -281074 -286365 -286105 -282483 -283200 -230657 -248170 -285106 -281180 -249785 -284185 -279430 -284999 -222868 -278031 -123272 -107210 -177701 -3292 -3270 -95762 -3282 -3220 -3221 -212914 -239676 -276265 -208271 -254557 -272641 -274295 -188678 -267950 -276010 -277916 -277915 -276588 -197874 -267567 -9653 -1180 -260091 -7790 -25285 -4067 -33241 -33100 -275758 -124691 -179823 -273693 -274792 -275615 -250276 -188935 -190006 -232094 -272690 -273567 -273371 -274112 -274728 -265888 -266696 -268631 -268835 -272323 -268754 -135845 -271767 -200022 -256175 -271588 -271778 -122916 -146168 -137906 -232052 -262464 -271264 -269406 -195487 -195486 -270369 -243055 -229151 -271126 -23271 -270973 -271249 -208081 -235413 -119076 -213233 -220644 -271284 -243908 -270984 -246117 -248551 -264073 -255469 -205606 -65123 -263365 -113766 -232698 -270177 -217655 -270752 -5887 -27037 -27630 -265824 -180372 -187571 -256005 -239332 -226080 -235197 -103199 -270650 -270528 -*/ ''' From 13b07f25ec383de24f54b1512249a12a36007d20 Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 20:54:01 +0800 Subject: [PATCH 03/11] Update workflow_download.py --- usage/workflow_download.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/usage/workflow_download.py b/usage/workflow_download.py index f0cf20477..3fed5e6c0 100644 --- a/usage/workflow_download.py +++ b/usage/workflow_download.py @@ -3,17 +3,7 @@ # 下方填入你要下载的本子的id，一行一个，每行的首尾可以有空白字符 jm_albums = ''' -id -1207964 -631273 -435689 -643158 -618703 -620808 -628546 126 -638627 - ''' From bad1ba20d9634bab95ca079cf7e4c167e3731a8c Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 21:25:12 +0800 Subject: [PATCH 04/11] Update workflow_download.py jm126 --- usage/workflow_download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usage/workflow_download.py b/usage/workflow_download.py index 3fed5e6c0..4503947eb 100644 --- a/usage/workflow_download.py +++ b/usage/workflow_download.py @@ -3,7 +3,7 @@ # 下方填入你要下载的本子的id，一行一个，每行的首尾可以有空白字符 jm_albums = ''' -126 +jm126 ''' From 64886fb427b5760fc90a005a30632f29e412757e Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 21:29:04 +0800 Subject: [PATCH 05/11] Update workflow_download.py 2222 --- usage/workflow_download.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usage/workflow_download.py b/usage/workflow_download.py index 4503947eb..e80abd8cd 100644 --- a/usage/workflow_download.py +++ b/usage/workflow_download.py @@ -3,7 +3,9 @@ # 下方填入你要下载的本子的id，一行一个，每行的首尾可以有空白字符 jm_albums = ''' -jm126 +jm1207964 +631273 + ''' From 3ccdd5eceb774933bfd3cb8183cbef7d97c9d19b Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 21:58:41 +0800 Subject: [PATCH 06/11] Update workflow_download.py 1-10 b test --- usage/workflow_download.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usage/workflow_download.py b/usage/workflow_download.py index e80abd8cd..164d989fb 100644 --- a/usage/workflow_download.py +++ b/usage/workflow_download.py @@ -3,8 +3,19 @@ # 下方填入你要下载的本子的id，一行一个，每行的首尾可以有空白字符 jm_albums = ''' -jm1207964 +1207964 631273 +435689 +643158 +618703 +620808 +628546 +126 +638627 +643308 +592437 +643130v + ''' From 59796af4a60083654ca8e58d2d64cfbf68a4db5e Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 22:02:59 +0800 Subject: [PATCH 07/11] Update workflow_download.py 1-10 c test --- usage/workflow_download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usage/workflow_download.py b/usage/workflow_download.py index 164d989fb..fe0b87f0e 100644 --- a/usage/workflow_download.py +++ b/usage/workflow_download.py @@ -14,7 +14,7 @@ 638627 643308 592437 -643130v +643130 From 95fe3577601db437a71433a2b33a9675c311be83 Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 22:53:58 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8DJSON=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=88=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B8=85=E7=90=86=E5=87=BD=E6=95=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmcomic/jm_toolkit.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/jmcomic/jm_toolkit.py b/src/jmcomic/jm_toolkit.py index e5eada1f2..47edbc2be 100644 --- a/src/jmcomic/jm_toolkit.py +++ b/src/jmcomic/jm_toolkit.py @@ -3,6 +3,28 @@ from .jm_exception import * + +import json +from jmcomic.jm_exception import JsonResolveFailException + +def clean_response_text(text: str) -> str: + start_idx = text.find('{') + end_idx = text.rfind('}') + 1 + if start_idx == -1 or end_idx <= start_idx: + raise JsonResolveFailException(f"响应文本中未找到有效的JSON内容: {text[:100]}...") + return text[start_idx:end_idx] + +def safe_parse_json(text: str) -> dict: + try: + clean_text = clean_response_text(text) + return json.loads(clean_text) + except json.JSONDecodeError as e: + raise JsonResolveFailException(f"JSON解析失败: {str(e)}, 清理后的文本: {clean_text[:200]}...") from e + + + + + class JmcomicText: pattern_jm_domain = compile(r'https://([\w.-]+)') pattern_jm_pa_id = [ From f1f6bc200c8e81b8a04263c82ddd1d9af9e3b6d4 Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 22:55:13 +0800 Subject: [PATCH 09/11] Update jm_toolkit.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加修复JSON解析失败问题（添加清理函数）更改描述 --- src/jmcomic/jm_toolkit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmcomic/jm_toolkit.py b/src/jmcomic/jm_toolkit.py index 47edbc2be..de8b2d2fa 100644 --- a/src/jmcomic/jm_toolkit.py +++ b/src/jmcomic/jm_toolkit.py @@ -3,7 +3,7 @@ from .jm_exception import * - +#修复JSON解析失败问题（添加清理函数） import json from jmcomic.jm_exception import JsonResolveFailException From 9e8b2db7e29dcf47aa9c393a296415ce60cd60f4 Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 23:03:10 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8DJSON=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=88=E6=9B=BF=E6=8D=A22=E5=A4=84?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=80=BB=E8=BE=91=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmcomic/jm_client_impl.py | 47 ++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/src/jmcomic/jm_client_impl.py b/src/jmcomic/jm_client_impl.py index be29b9a81..5f86d65d3 100644 --- a/src/jmcomic/jm_client_impl.py +++ b/src/jmcomic/jm_client_impl.py @@ -222,7 +222,7 @@ def append_params_to_url(self, url, params): # noinspection PyMethodMayBeStatic def decode(self, url: str): - if not JmModuleConfig.FLAG_DECODE_URL_WHEN_LOGGING or '/search/' not in url: + if not JmModuleConfig.FLAG_DECODE_URL_WHEN_LOGGING 或 '/search/' not 在 url: return url from urllib.parse import unquote @@ -233,7 +233,7 @@ def decode(self, url: str): class JmHtmlClient(AbstractJmClient): client_key = 'html' - func_to_cache = ['search', 'fetch_detail_entity'] + func_to_cache = ['search'， 'fetch_detail_entity'] API_SEARCH = '/search/photos' API_CATEGORY = '/albums' @@ -252,7 +252,10 @@ def add_favorite_album(self, data=data, ) - res = resp.json() + # 替换原有的 res = resp.json()，用安全解析函数清理非JSON内容 + from jmcomic.jm_toolkit import safe_parse_json + res = safe_parse_json(resp.text) + if res['status'] != 1: msg = parse_unicode_escape_text(res['msg']) @@ -465,8 +468,8 @@ def update_request_with_specify_domain(self, kwargs: dict, domain: Optional[str] if is_image: return - latest_headers = kwargs.get('headers', None) - base_headers = self.get_meta_data('headers', None) or JmModuleConfig.new_html_headers(domain) + latest_headers = kwargs.get('headers'， 无) + base_headers = self.get_meta_data('headers'， 无) 或 JmModuleConfig.new_html_headers(domain) base_headers.update(latest_headers or {}) kwargs['headers'] = base_headers @@ -490,7 +493,7 @@ def album_comment(self, comment, originator='', status='true', - comment_id=None, + comment_id=无, **kwargs, ) -> JmAlbumCommentResp: data = { @@ -515,7 +518,7 @@ def album_comment(self, resp = self.post('/ajax/album_comment', data=data) ret = JmAlbumCommentResp(resp) - jm_log('album.comment', f'{video_id}: [{comment}] ← ({ret.model().cid})') + jm_log('album.comment'， f'{video_id}: [{comment}] ← ({ret.model().cid})') return ret @@ -732,7 +735,7 @@ def fetch_scramble_id(self, photo_id): scramble_id = PatternTool.match_or_default(resp.text, JmcomicText.pattern_html_album_scramble_id, - None, + 无, ) if scramble_id is None: jm_log('api.scramble', f'未匹配到scramble_id，响应文本：{resp.text}') @@ -1019,7 +1022,11 @@ def req_api_domain_server(self, url): while text and not text[0].isascii(): text = text[1:] res_json = JmCryptoTool.decode_resp_data(text, '', JmMagicConstants.API_DOMAIN_SERVER_SECRET) - res_data = json_loads(res_json) + + # 替换原有的 json_loads，用安全解析函数清理非JSON内容 + from jmcomic.jm_toolkit import safe_parse_json + res_data = safe_parse_json(res_json) + # 检查返回值 if not res_data.get('Server', None): @@ -1044,7 +1051,7 @@ def update_api_domain(self): if new_server_list is None: continue old_server_list = JmModuleConfig.DOMAIN_API_LIST - jm_log('api.update_domain.success', + jm_log('api.update_domain.success'， f'获取到最新的API域名，替换jmcomic内置域名：(new){new_server_list} ---→ (old){old_server_list}' ) # 更新域名 @@ -1110,7 +1117,7 @@ def __init__(self, future, after_done_callback): def result(self): if not self.done: - result = self.future.result() + result = self.future。result() self._result = result self.done = True self.future = None # help gc @@ -1120,8 +1127,8 @@ def result(self): def __init__(self, client: JmcomicClient, - max_workers=None, - executors=None, + max_workers=无， + executors=无, ): self.client = client self.route_notimpl_method_to_internal_client(client) @@ -1171,7 +1178,7 @@ def get_future(self, cache_key, task): # after future done, remove it from future_dict. # cache depends on self.client instead of self.future_dict future = self.FutureWrapper(self.executors.submit(task), - after_done_callback=lambda: self.future_dict.pop(cache_key, None) + after_done_callback=lambda: self.future_dict。pop(cache_key, 无) ) self.future_dict[cache_key] = future @@ -1180,8 +1187,8 @@ def get_future(self, cache_key, task): def get_photo_detail(self, photo_id, fetch_album=True, fetch_scramble_id=True) -> JmPhotoDetail: photo_id = JmcomicText.parse_to_jm_id(photo_id) client: JmcomicClient = self.client - futures = [None, None, None] - results = [None, None, None] + futures = [None， None， None] + results = [None， None, None] # photo_detail photo_future = self.get_future(f'photo_{photo_id}', @@ -1197,19 +1204,19 @@ def get_photo_detail(self, photo_id, fetch_album=True, fetch_scramble_id=True) - lambda: client.get_album_detail(photo_id)) futures[1] = album_future else: - results[1] = None + results[1] = 无 # fetch_scramble_id - if fetch_scramble_id and isinstance(client, JmApiClient): + if fetch_scramble_id 和 isinstance(client, JmApiClient): client: JmApiClient - scramble_future = self.get_future(f'scramble_id_{photo_id}', + scramble_future = self.get_future(f'scramble_id_{photo_id}'， lambda: client.get_scramble_id(photo_id)) futures[2] = scramble_future else: results[2] = '' # wait finish - for i, f in enumerate(futures): + for i, f 在 enumerate(futures): if f is None: continue results[i] = f.result() From 232844df34c273b3b9544dc3161a2d6d44c8d09b Mon Sep 17 00:00:00 2001 From: RSLN-creator <3316399314@qq.com> Date: Mon, 8 Sep 2025 23:10:10 +0800 Subject: [PATCH 11/11] Update workflow_download.py --- usage/workflow_download.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/usage/workflow_download.py b/usage/workflow_download.py index fe0b87f0e..155de6030 100644 --- a/usage/workflow_download.py +++ b/usage/workflow_download.py @@ -3,19 +3,7 @@ # 下方填入你要下载的本子的id，一行一个，每行的首尾可以有空白字符 jm_albums = ''' -1207964 -631273 -435689 -643158 -618703 -620808 -628546 -126 -638627 -643308 -592437 -643130 - +id '''