commit

data/kakao_cookie.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 
-CLIENT_ID = 2155768539
+# CLIENT_ID = 2155768539
+CLIENT_ID = 3437754656
 
 @dataclass
 class Cookie:
@@ -8,18 +9,17 @@ class Cookie:
     userID: str
     ant: str
 
-COOKIES = [
-    Cookie(name="ithi", userID="twnu7577d258564215", ant="MFivJ2uk0eyBd7G28D0_4WSk3QXdpHXxp1rkDaNXdCU~"),#ok
-    Cookie(name="ym", userID="twnu18c780bce30104", ant=""),
-    Cookie(name="83", userID="twnud41942de09830d", ant=""),
-    Cookie(name="bjl", userID="twnuf8429dee79c3d3", ant=""), #ok
-    Cookie(name="yy", userID="twnucbb3bdfce95b85", ant=""),
-    Cookie(name="hk", userID="twnuf622dd45e496ea", ant="ypc2JaDoKwfgghdheiFRCJvBjWid78M9djJooqOeMnY~"),
-    Cookie(name="aa", userID="twnuc0728a46c25738", ant=""), #ok
-    Cookie(name="bb", userID="twnu407ef7f1a046fd", ant="pSQPuFHTEVSztUuDcP4eboMqyY5La0Hb5JRWYILj1z8~"),
-    Cookie(name="wn", userID="twnu7322f207fb75ab", ant="4q3ArCVX_yx5fTq0kWWCanc60SXEnUU3QyuF0wys8Hc~")
-]
+COOKIE = Cookie(name="ithi", userID="koru685bfca187016d", ant="6omfFxw3u2ksAbZDZmLY8sFsQcGARzqc1lrRv-fiblg~")
 
-COOKIE_NAME = 'ithi'
-URL_TYPE = '1' # 1, 3, 7, m, p
-TASK_TYPE = 'dc' # d, c
+# search Network -> JS -> _app-... -> open in Sources panel
+#  case 0:
+#                             if (r = t.userId,
+#                             o = t.episodeId,
+#                             i = t.timestamp,
+#                             s = t.nonce,
+#                             u = t.aid,
+#                             l = t.zid,
+#                             window.crypto && window.crypto.subtle) {
+#                                 e.next = 4;
+#                                 break
+#                             }

data/kakao_request.py

@@ -10,20 +10,20 @@ class KakaoRequest:
     def get_episode_headers(self, ant): 
         return {
             "Accept": "application/json, text/plain, */*",
-            "Accept-Encoding": "gzip, deflate, br",
-            "Accept-Language": "zht",
+            "Accept-Encoding": "gzip, deflate, br, zstd",
+            "Accept-Language": "ko",
             "Cache-Control": "no-cache",
             "Cookie": f"theme=dark; _kp_collector={self.app_id}; atn={ant}",
             "Dnt": "1",
-            "Origin": "https://tw.kakaowebtoon.com",
+            "Origin": "https://webtoon.kakao.com/",
             "Pragma": "no-cache",
-            "Referer": "https://tw.kakaowebtoon.com/",
+            "Referer": "https://webtoon.kakao.com/",
             "Sec-Ch-Ua": '"Not A(Brand";v="99", "Microsoft Edge";v="121", "Chromium";v="121"',
             "Sec-Ch-Ua-Mobile": "?0",
             "Sec-Ch-Ua-Platform": '"Windows"',
-            "Sec-Fetch-Dest": "empty",
-            "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-site",
+            "Sec-Fetch-Dest": "script",
+            "Sec-Fetch-Mode": "no-cors",
+            "Sec-Fetch-Site": "cross-site",
             "Sec-Gpc": "1",
             "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
         }

data/path_constant.py

@@ -3,6 +3,7 @@ from pathlib import Path
 
 DOWNLOAD_DIR = Path('E:/') / 'Webtoon'
 NETWORK_DIR = Path('//TRUENAS') / 'Media' / 'Webtoon'
+NETWORK_DIR = Path(r'\\TRUENAS\Media\Webtoon')
 TEMP_DOWNLOAD_DIR = Path('E:/') / 'Temp_Webtoon'
 
 DOWNLOAD_LIST_TXT = Path(DOWNLOAD_DIR) / 'download.txt'

data/special_list.py

@@ -1,62 +1,94 @@
 WEBTOON_NOT_PROCESSED = [
     '陷阱', # 完结
+    '情侶破壞者', # 完结
+    '我獨自升級', # 完结
     '8級魔法師再臨', # 完结
+    '婚姻這門生意', # 完结
     '婚姻這門生意[18+]', # 完结
-    '守護女主角哥哥的方法', # KakaoTW完结
-    '轉生後變成天才', # KakaoTW完结
-    '兩個繼承人', # KakaoTW完结
-    '患上不出道就會死的病', # KakaoTW完结
-    '無法品味的男人', # KakaoTW完结
-    '摘下偽善男主角的面具', # KakaoTW完结
-    '皇家婚姻', # KakaoTW完结
-    '鐵血家族獵犬的重生', # KakaoTW完结
-    '重生百次的最強玩家', # KakaoTW完结
-    '我獨自升級', # KakaoTW完结
-    '結局創造者', # 停更
-    '黑影之夜', # 季休
-    '狂魔重生記', # 季休
-    '在魔法學院偽裝教師', # 季休
-    '兔子與黑豹的共生關係', # 付费 / 季休
-    '成為家人的方法', # YDS下载后续
+    '惡女重生', # 本篇完结 2394 
+    '試著改變故事類型吧', # 本篇完结 2494
+    '皇家婚姻', # 本篇完结 2952
+    '關於你的愛', # 完结
+    'Netkama Punch!!!', # 完结
+    '守護女主角哥哥的方法', # 腰斩
+    '唯一的希望', # 季休
+    '轉生後變成天才', # 季休
+    "地下城見聞錄", # 季休
+    "符文之子", # 季休 4129
+    '兩個繼承人', # KakaoTW完结 두 명의 상속인
+    '成為家人的方法', # 在kakaopage连载 가족이 되는 방법
+    '同情的形態', # 동정의 형태
 ]
 
 WEBTOON_18_BONUS = [
     '婚姻這門生意[18+]'
 ]
 
-KAKAO_ONLY_MAIN_ACCOUNT = [
-    '152', # 骷髏士兵卷土重來
-    '167', # 試著改變故事類型吧 P
-    '222', # 成為我筆下男主角的妻子
-    '247', # 領主夫人罷工中
-    '322', # 婚姻這門生意 P
-    '330', # 同情的形態 P
-    '399', # 噬魔法師
-    '424', # 地下城見聞錄
-    '587', # Pickmeup
-    '591', # 武當奇俠
-    '736', # Boss大人請振作
-    '784', # 永遠的謊言
-    '787', # 魔法師的校園生存法則
-    '862', # 符文之子
-]
+KAKAO_TO_TW = {
+    "나 혼자만 레벨업": "我獨自升級",
+    "해골병사는 던전을 지키지 못했다":"骷髏士兵卷土重來",
+    "악역의 엔딩은 죽음뿐": "反派角色只有死亡結局",
+    "악녀는 두 번 산다": "惡女重生",
+    "장르를 바꿔보도록 하겠습니다": "試著改變故事類型吧",
+    "무당기협": "武當奇俠",
+    "내 남자 주인공의 아내가 되었다": "成為我筆下男主角的妻子",
+    "빌어먹을 환생":"轉生後變成天才",
+    "로열 메리지": "皇家婚姻",
+    "상냥한 남자주인공의 가면을 벗기면":"摘下偽善男主角的面具",
+    "맛볼 수 없는 남자": "無法品味的男人",
+    "데뷔 못 하면 죽는 병 걸림":"患上不出道就會死的病",
+    "여보, 나 파업할게요": "領主夫人罷工中",
+    "던전 견문록": "地下城見聞錄",
+    "픽 미 업!": "Pick me up!",
+    "철혈검가 사냥개의 회귀": "鐵血家族獵犬的重生",
+    "만렙 플레이어의 100번째 회귀": "重生百次的最強玩家",
+    "룬의 아이들": "符文之子"
+}
 
-KAKAO_1 = [
-    '41'
-]
+KAKAO_1 = {
+    "2358", # 骷髏士兵卷土重來
+}
 
-KAKAO_3 = [
-    '303', # 天才詐欺犯的雙重身分
-]
+KAKAO_3 = {
+    "2830", # 成為我筆下男主角的妻子
+}
 
-KAKAO_7 = [
-    '41', # 反派角色只有死亡結局
-    '116', # 惡女重生
-    '200', # 暴君就該配惡女
-    '233', # 少女賭神愛黛兒
-]
+KAKAO_C = {
+}
 
-KAKAO_PAY = [
-    '230', # 兔子與黑豹的共生關係 
-    '516', # 結局創造者
-]
+KAKAO_W = {
+    "2383", # 反派角色只有死亡結局
+    "2499", # 武當奇俠
+    "2977", # 摘下偽善男主角的面具
+    "3008", # 患上不出道就會死的病
+    "3205", # Pick me up!
+    "3455", # 鐵血家族獵犬的重生
+    "3786", # 重生百次的最強玩家
+}
+
+KAKAO_P = {
+    "2998", # 無法品味的男人
+    "3024", # 領主夫人罷工中
+}
+
+BOMTOON = {
+    "Netkama Punch!!!", # done
+    "關於你的愛", # done
+    "PAYBACK", # every 10 days
+    "披薩外送員與黃金宮", # every 10 days
+    "No Moral", # every 10 days
+    "1995青春報告", # weekly
+    "Backlight", # weekly
+    "Unsleep", # weekly
+    "鄰居是公會成員", # weekly
+    "鬼夜曲", # weekly
+    "監禁倉庫", # pending 
+    "棋子的世界", # pending
+    "易地思之", # pending 
+    "夢龍傳", # pending 
+    "融冰曲線", # pending 
+    
+}
+
+BOMTOON_TEMP = {
+}

data/webtoon_request.py

@@ -21,19 +21,3 @@ def get_webtoon_headers():
     "Upgrade-Insecure-Requests": "1",
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
 }
-
-def get_bomtoon_headers():
-    return {
-        "Accept": "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8",
-        "Accept-Encoding": "gzip, deflate, br, zstd",
-        "Accept-Language": "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7,zh-CN;q=0.6,zh;q=0.5",
-        "Priority": "i",
-        "Referer": "https://www.bomtoon.tw/",
-        "Sec-Ch-Ua": '"Not_A Brand";v="8", "Chromium";v="126", "Google Chrome";v="126"',
-        "Sec-Ch-Ua-Mobile": "?0",
-        "Sec-Ch-Ua-Platform": '"Windows"',
-        "Sec-Fetch-Dest": "image",
-        "Sec-Fetch-Mode": "no-cors",
-        "Sec-Fetch-Site": "cross-site",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36",
-    }