anime-downloader bug fix 21.
add search routine check download fix
This commit is contained in:
@@ -130,11 +130,14 @@ class LogicOhli24(LogicModuleBase):
|
|||||||
if sub == "analysis":
|
if sub == "analysis":
|
||||||
# code = req.form['code']
|
# code = req.form['code']
|
||||||
code = request.form["code"]
|
code = request.form["code"]
|
||||||
|
|
||||||
|
wr_id = request.form.get("wr_id", None)
|
||||||
|
bo_table = request.form.get("bo_table", None)
|
||||||
data = []
|
data = []
|
||||||
# print(code)
|
# print(code)
|
||||||
# logger.info("code::: %s", code)
|
# logger.info("code::: %s", code)
|
||||||
P.ModelSetting.set("ohli24_current_code", code)
|
P.ModelSetting.set("ohli24_current_code", code)
|
||||||
data = self.get_series_info(code)
|
data = self.get_series_info(code, wr_id, bo_table)
|
||||||
self.current_data = data
|
self.current_data = data
|
||||||
return jsonify({"ret": "success", "data": data, "code": code})
|
return jsonify({"ret": "success", "data": data, "code": code})
|
||||||
elif sub == "anime_list":
|
elif sub == "anime_list":
|
||||||
@@ -142,6 +145,18 @@ class LogicOhli24(LogicModuleBase):
|
|||||||
cate = request.form["type"]
|
cate = request.form["type"]
|
||||||
page = request.form["page"]
|
page = request.form["page"]
|
||||||
|
|
||||||
|
data = self.get_anime_info(cate, page)
|
||||||
|
# self.current_data = data
|
||||||
|
return jsonify(
|
||||||
|
{"ret": "success", "cate": cate, "page": page, "data": data}
|
||||||
|
)
|
||||||
|
elif sub == "complete_list":
|
||||||
|
data = []
|
||||||
|
|
||||||
|
cate = request.form["type"]
|
||||||
|
logger.debug("cate", cate)
|
||||||
|
page = request.form["page"]
|
||||||
|
|
||||||
data = self.get_anime_info(cate, page)
|
data = self.get_anime_info(cate, page)
|
||||||
# self.current_data = data
|
# self.current_data = data
|
||||||
return jsonify(
|
return jsonify(
|
||||||
@@ -208,9 +223,9 @@ class LogicOhli24(LogicModuleBase):
|
|||||||
P.ModelSetting.get_int("ohli24_max_ffmpeg_process_count")
|
P.ModelSetting.get_int("ohli24_max_ffmpeg_process_count")
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_series_info(self, code):
|
def get_series_info(self, code, wr_id, bo_table):
|
||||||
code_type = "c"
|
code_type = "c"
|
||||||
# _code = None
|
|
||||||
try:
|
try:
|
||||||
if (
|
if (
|
||||||
self.current_data is not None
|
self.current_data is not None
|
||||||
@@ -242,7 +257,22 @@ class LogicOhli24(LogicModuleBase):
|
|||||||
url = P.ModelSetting.get("ohli24_url") + "/e/" + code
|
url = P.ModelSetting.get("ohli24_url") + "/e/" + code
|
||||||
else:
|
else:
|
||||||
url = P.ModelSetting.get("ohli24_url") + "/e/" + code
|
url = P.ModelSetting.get("ohli24_url") + "/e/" + code
|
||||||
|
|
||||||
|
if wr_id is not None:
|
||||||
|
# print(len(wr_id))
|
||||||
|
if len(wr_id) > 0:
|
||||||
|
url = (
|
||||||
|
P.ModelSetting.get("ohli24_url")
|
||||||
|
+ "/bbs/board.php?bo_table="
|
||||||
|
+ bo_table
|
||||||
|
+ "&wr_id="
|
||||||
|
+ wr_id
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
pass
|
||||||
|
|
||||||
logger.debug("url:::> %s", url)
|
logger.debug("url:::> %s", url)
|
||||||
|
|
||||||
# self.current_headers = { 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)
|
# self.current_headers = { 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)
|
||||||
# AppleWebKit/537.36 (KHTML, like Gecko) ' 'Chrome/96.0.4664.110 Whale/3.12.129.46 Safari/537.36',
|
# AppleWebKit/537.36 (KHTML, like Gecko) ' 'Chrome/96.0.4664.110 Whale/3.12.129.46 Safari/537.36',
|
||||||
# 'Referer': url }
|
# 'Referer': url }
|
||||||
@@ -265,6 +295,7 @@ class LogicOhli24(LogicModuleBase):
|
|||||||
"_grade",
|
"_grade",
|
||||||
"_total_chapter",
|
"_total_chapter",
|
||||||
"_show_time",
|
"_show_time",
|
||||||
|
"_release_year",
|
||||||
]
|
]
|
||||||
description_dict = {
|
description_dict = {
|
||||||
"원제": "_otit",
|
"원제": "_otit",
|
||||||
@@ -281,6 +312,7 @@ class LogicOhli24(LogicModuleBase):
|
|||||||
"등급": "_grade",
|
"등급": "_grade",
|
||||||
"총화수": "_total_chapter",
|
"총화수": "_total_chapter",
|
||||||
"상영시간": "_show_time",
|
"상영시간": "_show_time",
|
||||||
|
"개봉년도": "_release_year",
|
||||||
}
|
}
|
||||||
|
|
||||||
list_body_li = tree.xpath('//ul[@class="list-body"]/li')
|
list_body_li = tree.xpath('//ul[@class="list-body"]/li')
|
||||||
@@ -391,7 +423,9 @@ class LogicOhli24(LogicModuleBase):
|
|||||||
entity = {}
|
entity = {}
|
||||||
entity["link"] = item.xpath(".//a/@href")[0]
|
entity["link"] = item.xpath(".//a/@href")[0]
|
||||||
entity["code"] = entity["link"].split("/")[-1]
|
entity["code"] = entity["link"].split("/")[-1]
|
||||||
entity["title"] = item.xpath(".//div[@class='post-title']/text()")[0]
|
entity["title"] = item.xpath(".//div[@class='post-title']/text()")[
|
||||||
|
0
|
||||||
|
].strip()
|
||||||
entity["image_link"] = item.xpath(".//div[@class='img-item']/img/@src")[
|
entity["image_link"] = item.xpath(".//div[@class='img-item']/img/@src")[
|
||||||
0
|
0
|
||||||
].replace("..", P.ModelSetting.get("ohli24_url"))
|
].replace("..", P.ModelSetting.get("ohli24_url"))
|
||||||
|
|||||||
Reference in New Issue
Block a user