commit

main.py

@@ -1,65 +1,50 @@
 import argparse
 
 from converter.converter import WebtoonConverter
-from data.kakao_cookie import COOKIE_NAME, COOKIES, TASK_TYPE, URL_TYPE
-from data.special_list import KAKAO_1, KAKAO_3, KAKAO_7, KAKAO_PAY, WEBTOON_NOT_PROCESSED, KAKAO_ONLY_MAIN_ACCOUNT
-from data.path_constant import DOWNLOAD_DIR, DOWNLOAD_LIST_TXT
-from downloaders.bomtoon import Bomtoon
+from data.kakao_cookie import COOKIE
+from data.special_list import WEBTOON_NOT_PROCESSED
+from data.path_constant import DOWNLOAD_DIR, DOWNLOAD_LIST_TXT, TEMP_DOWNLOAD_DIR, TEMP_DOWNLOAD_LIST_TXT
 from downloaders.kakao_webtoon import KakaoWebtoon
-from prerequisite import get_download_list
+from helper.get_kakao_list import get_kakao_id_list
+from helper.prerequisite import get_download_list
 from downloaders.webtoon_com import Webtoon
 
-DOWNLOAD_WEBTOON = True
+DOWNLOAD_WEBTOON = False
 CONVERT_ALL = False
 
+task = 'dc'
+kakao_list = ""
+
+kakao_ids = get_kakao_id_list(kakao_list)
+
 valid_cookies = []
 new_webtoons = []
 
-def set_valid_cookie():
-    global valid_cookies
-    for cookie in COOKIES:
-        if cookie.name == COOKIE_NAME:
-            print(cookie.name)
-            valid_cookies.append(cookie)
-
-def get_kakao_urls(inputs):   
-    result = []
-    if '1' in inputs:
-        result += KAKAO_1
-    if '3' in inputs:
-        result += KAKAO_3
-    if '7' in inputs:
-        result += KAKAO_7
-    if 'm' in inputs:
-        result += KAKAO_ONLY_MAIN_ACCOUNT
-    if 'p' in inputs:
-        result += KAKAO_PAY
-    return result
-
 def download():
-    if len(valid_cookies) > 0:
-        url_list = get_download_list(DOWNLOAD_LIST_TXT)
-        
-        for url in url_list:
-            webtoon = None
-            if 'tw.kakaowebtoon.com' in url: 
-                webtoon_id = url.split('/')[-1]
-                for cookie in valid_cookies:
-                    if webtoon_id in get_kakao_urls(URL_TYPE):
-                        webtoon = KakaoWebtoon(webtoon_id, cookie)
-                        webtoon.download_webtoon(url, DOWNLOAD_DIR)
-            elif DOWNLOAD_WEBTOON and 'www.webtoons.com' in url:
-                webtoon_id = url.split('=')[1]
-                webtoon = Webtoon(webtoon_id)
-                webtoon.download_webtoon(url, DOWNLOAD_DIR)
-            elif 'www.bomtoon.tw' in url:
-                webtoon_id = url.split('/')[-1]
-                webtoon = Bomtoon(webtoon_id)
-                webtoon.download_webtoon(url, DOWNLOAD_DIR)
-            if webtoon is not None and webtoon.new_webtoon != "":
-                new_webtoons.append(webtoon.new_webtoon)
+    url_list = get_download_list(DOWNLOAD_LIST_TXT)
+    
+    for url in url_list:
+        webtoon = None
+        if 'webtoon.kakao.com' in url: 
+            webtoon_id = url.split('/')[-1]
+            if webtoon_id in kakao_ids:
+                webtoon = KakaoWebtoon(webtoon_id, COOKIE)
+                webtoon.download_webtoon(url, DOWNLOAD_DIR)    
+        elif DOWNLOAD_WEBTOON and 'www.webtoons.com' in url:
+            webtoon_id = url.split('=')[1]
+            webtoon = Webtoon(webtoon_id)
+            webtoon.download_webtoon(url, DOWNLOAD_DIR)
+        if webtoon is not None and webtoon.new_webtoon != "":
+            new_webtoons.append(webtoon.new_webtoon)
     print(new_webtoons)
 
+    # temp_url_list = get_download_list(TEMP_DOWNLOAD_LIST_TXT)
+    # for temp_url in temp_url_list:
+    #     if 'webtoon.kakao.com' in temp_url: 
+    #         webtoon_id = temp_url.split('/')[-1]
+    #         webtoon = KakaoWebtoon(webtoon_id, COOKIE)
+    #         webtoon.download_webtoon(temp_url, TEMP_DOWNLOAD_DIR)  
+
 def convert():
     for webtoon_path in DOWNLOAD_DIR.iterdir():
         if len(new_webtoons) > 0:
@@ -87,13 +72,21 @@ def main():
         convert()
     
 if __name__ == "__main__":
-    set_valid_cookie()
-    
-    task = TASK_TYPE
-
     if 'd' in task:
         download()
     if 'c' in task:
+        # new_webtoons.append('1995青春報告')
+        # new_webtoons.append('Unsleep')
+        # new_webtoons.append('鬼夜曲')
+        # new_webtoons.append('Backlight')
+        # new_webtoons.append('鄰居是公會成員')
+        # new_webtoons.append('No Moral')
+        # new_webtoons.append('披薩外送員與黃金宮')
+        # new_webtoons.append('PAYBACK')
+        # new_webtoons.append('融冰曲線')
+        # new_webtoons.append('夢龍傳')
+        # new_webtoons.append('棋子的世界')
+        # new_webtoons.append('監禁倉庫')
+        # new_webtoons.append('易地思之')
         convert()
-    print('MyWebtoon')
-
+    print('MyWebtoon')