2024.08.21 patch.03

logic_ohli24.py

@@ -67,7 +67,7 @@ logger = P.logger
 class LogicOhli24(LogicModuleBase):
     db_default = {
         "ohli24_db_version": "1.1",
-        "ohli24_url": "https://a18.ohli24.com",
+        "ohli24_url": "https://a21.ohli24.com",
         "ohli24_download_path": os.path.join(
             path_data, P.package_name, "ohli24"
         ),
@@ -724,6 +724,7 @@ class LogicOhli24(LogicModuleBase):
                 "_show_time",
                 "_release_year",
                 "_drawing",
+                "_character_design"
             ]
             description_dict = {
                 "원제": "_otit",
@@ -745,8 +746,10 @@ class LogicOhli24(LogicModuleBase):
                 "개봉일": "_opening_date",
                 "런타임": "_run_time",
                 "작화": "_drawing",
+                "캐릭터디자인": "_character_design"
             }
 
+
             list_body_li = tree.xpath('//ul[@class="list-body"]/li')
             # logger.debug(f"list_body_li:: {list_body_li}")
             episodes = []
@@ -1208,7 +1211,7 @@ class Ohli24QueueEntity(FfmpegQueueEntity):
     # Get episode info from OHLI24 site
     def make_episode_info(self):
         try:
-            base_url = "https://a18.ohli24.com"
+            base_url = "https://a24.ohli24.com"
             base_url = P.ModelSetting.get("ohli24_url")
             iframe_url = ""
 
@@ -1232,28 +1235,23 @@ class Ohli24QueueEntity(FfmpegQueueEntity):
             )
             # logger.debug(text)
             soup1 = BeautifulSoup(text, "lxml")
-            pattern = re.compile(r"url : \"\.\.(.*)\"")
+            # pattern = re.compile(r"url : \"\.\.(.*)\"")
-            script = soup1.find("script", text=pattern)
+            # script = soup1.find("script", text=pattern)
-
-            if script:
-                match = pattern.search(script.text)
-                if match:
-                    iframe_url = match.group(1)
-                    logger.info("iframe_url::> %s", iframe_url)
-
-            # try:
-            #     iframe_url = soup1.find("iframe")["src"]
-            # except:
             #
-            #     pattern = r"\.\.\/(.*stream.php.*)"
+            # if script:
-            #
+            #     match = pattern.search(script.text)
-            #     match = re.search(pattern, text, re.MULTILINE)
             #     if match:
-            #         print(match)
+            #         iframe_url = match.group(1)
-            #         matched_line = match.group(0)
+            #         logger.info("iframe_url::> %s", iframe_url)
-            #         print(matched_line)
+            pattern = r"<iframe src=\"(.*?)\" allowfullscreen>"
-            #     iframe_url = "https://ohli24.org/"
+
-            iframe_src = f'{P.ModelSetting.get("ohli24_url")}{iframe_url}'
+            match = re.search(pattern, text)
+            if match:
+                iframe_src = match.group(1)
+                logger.debug(f"iframe_src:::> {iframe_src}")
+
+
+            # iframe_src = f'{P.ModelSetting.get("ohli24_url")}{iframe_url}'
 
             iframe_html = LogicOhli24.get_html(
                 iframe_src, headers=headers, timeout=600