projectdx/anime_downloader
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2022.01.31 anilife 버그 픽스 (.02. 기타)

Browse Source
This commit is contained in:
projectdx
2023-01-31 18:21:25 +09:00
parent 548902e095
commit ab343b92b7
4 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
logic_anilife.py
View File

@@ -76,15 +76,16 @@ class LogicAniLife(LogicModuleBase):
"anilife_auto_make_season_folder": "True", "anilife_auto_make_season_folder": "True",
"anilife_finished_insert": "[완결]", "anilife_finished_insert": "[완결]",
"anilife_max_ffmpeg_process_count": "1", "anilife_max_ffmpeg_process_count": "1",
"anilife_order_desc": "False", "anilife_order_desc": "True",
"anilife_auto_start": "False", "anilife_auto_start": "False",
"anilife_interval": "* 5 * * *", "anilife_interval": "* 5 * * *",
"anilife_auto_mode_all": "False", "anilife_auto_mode_all": "False",
"anilife_auto_code_list": "all", "anilife_auto_code_list": "",
"anilife_current_code": "", "anilife_current_code": "",
"anilife_uncompleted_auto_enqueue": "False", "anilife_uncompleted_auto_enqueue": "False",
"anilife_image_url_prefix_series": "", "anilife_image_url_prefix_series": "",
"anilife_image_url_prefix_episode": "", "anilife_image_url_prefix_episode": "",
"anilife_discord_notify": "True",
} }
current_headers = None current_headers = None
@@ -166,7 +167,7 @@ class LogicAniLife(LogicModuleBase):
async def get_html_playwright( async def get_html_playwright(
url: str, url: str,
headless: bool = False, headless: bool = False,
referer: str = None, referer: str = "",
engine: str = "chrome", engine: str = "chrome",
stealth: bool = False, stealth: bool = False,
) -> str: ) -> str:
@@ -951,9 +952,9 @@ class LogicAniLife(LogicModuleBase):
if params is not None: if params is not None:
code = params["data_code"] code = params["data_code"]
logger.debug(f"params: {code}") logger.debug(f"params: {code}")
ret = LogicOhli24.add_whitelist(code) ret = LogicAniLife.add_whitelist(code)
else: else:
ret = LogicOhli24.add_whitelist() ret = LogicAniLife.add_whitelist()
return jsonify(ret) return jsonify(ret)
except Exception as e: except Exception as e:
logger.error("Exception:%s", e) logger.error("Exception:%s", e)
@@ -1153,6 +1154,9 @@ class LogicAniLife(LogicModuleBase):
"episode": episodes, "episode": episodes,
} }
if not P.ModelSetting.get_bool("anilife_order_desc"):
data["episode"] = list(reversed(data["episode"]))
data["list_order"] = "desc"
return data return data
except Exception as e: except Exception as e:

19
templates/anime_downloader_anilife_category.html
View File

@@ -36,7 +36,7 @@
<div id="anime_category" class="btn-group" role="group" aria-label="Basic example"> <div id="anime_category" class="btn-group" role="group" aria-label="Basic example">
<button id="ing" type="button" class="btn btn-success">방영중</button> <button id="ing" type="button" class="btn btn-success">방영중</button>
<button id="theater" type="button" class="btn btn-primary">극장판</button> <button id="theater" type="button" class="btn btn-primary">극장판</button>
<button id="complete_anilist" type="button" class="btn btn-dark">완결</button> <!-- <button id="complete_anilist" type="button" class="btn btn-dark">완결</button>-->
<button id="top20" type="button" class="btn btn-grey">Top20</button> <button id="top20" type="button" class="btn btn-grey">Top20</button>
</div> </div>
<form id="airing_list_form"> <form id="airing_list_form">
@@ -294,7 +294,7 @@
tmp += '<img class="card-img-top" src="' + data.anime_list[i].image_link + '" />' tmp += '<img class="card-img-top" src="' + data.anime_list[i].image_link + '" />'
tmp += '<div class="card-body">' tmp += '<div class="card-body">'
tmp += '<h5 class="card-title">' + data.anime_list[i].title + "</h5>" tmp += '<h5 class="card-title">' + data.anime_list[i].title + "</h5>"
tmp += '<p class="card-text">' + data.anime_list[i].code + "</p>" // tmp += '<p class="card-text">' + data.anime_list[i].code + "</p>"
tmp += tmp +=
'<a href="./request?code=' + '<a href="./request?code=' +
data.anime_list[i].code + data.anime_list[i].code +
@@ -390,23 +390,20 @@
}) })
$("#anime_category #complete_anilist").on("click", function () { $("#anime_category #complete_anilist").on("click", function () {
// {#console.log(this.id)#} // let spinner = document.getElementById("spinner")
let spinner = document.getElementById("spinner") // spinner.style.visibility = "visible"
spinner.style.visibility = "visible"
get_anime_list("fin", 1) get_anime_list("fin", 1)
}) })
$("#anime_category #theater").on("click", function () { $("#anime_category #theater").on("click", function () {
// {#console.log(this.id)#} // let spinner = document.getElementById("spinner")
let spinner = document.getElementById("spinner") // spinner.style.visibility = "visible"
spinner.style.visibility = "visible"
get_anime_list("theater", 1) get_anime_list("theater", 1)
}) })
$("#anime_category #top20").on("click", function () { $("#anime_category #top20").on("click", function () {
// {#console.log(this.id)#} // let spinner = document.getElementById("spinner")
let spinner = document.getElementById("spinner") // spinner.style.visibility = "visible"
spinner.style.visibility = "visible"
get_anime_list("top20", 1) get_anime_list("top20", 1)
}) })

18
templates/anime_downloader_anilife_request.html
View File

@@ -184,15 +184,21 @@
} }
$(function () { $(function () {
console.log(params.wr_id) // console.log(params.wr_id)
console.log(findGetParameter('wr_id')) // console.log("{{arg['anilife_current_code']}}")
console.log(params.code) // console.log(findGetParameter('wr_id'))
if (params.code === '') { // console.log(params.code)
if (params.code === '' || params.code == null) {
// console.log('null')
dismissLoadingScreen()
return false;
} else { } else {
console.log('here')
document.getElementById("code").value = params.code document.getElementById("code").value = params.code
document.getElementById("analysis_btn").click(); document.getElementById("analysis_btn").click();
return; return true;
} }
if ("{{arg['anilife_current_code']}}" !== "") { if ("{{arg['anilife_current_code']}}" !== "") {
@@ -215,7 +221,7 @@
// 값이 공백이 아니면 분석 버튼 계속 누름 // 값이 공백이 아니면 분석 버튼 계속 누름
// {#document.getElementById("analysis_btn").click();#} // {#document.getElementById("analysis_btn").click();#}
} else { } else {
return false;
} }
}) })

8
templates/anime_downloader_anilife_setting.html
View File

@@ -7,7 +7,7 @@
<nav> <nav>
{{ macros.m_tab_head_start() }} {{ macros.m_tab_head_start() }}
{{ macros.m_tab_head2('normal', '일반', true) }} {{ macros.m_tab_head2('normal', '일반', true) }}
{{ macros.m_tab_head2('auto', '홈화면 자동', false) }} {{ macros.m_tab_head2('auto', '자동 설정', false) }}
{{ macros.m_tab_head2('action', '기타', false) }} {{ macros.m_tab_head2('action', '기타', false) }}
{{ macros.m_tab_head_end() }} {{ macros.m_tab_head_end() }}
</nav> </nav>
@@ -28,9 +28,9 @@
{{ macros.m_tab_content_start('auto', false) }} {{ macros.m_tab_content_start('auto', false) }}
{{ macros.setting_global_scheduler_sub_button(arg['scheduler'], arg['is_running']) }} {{ macros.setting_global_scheduler_sub_button(arg['scheduler'], arg['is_running']) }}
{{ macros.setting_input_text('anilife_interval', '스케쥴링 실행 정보', value=arg['anilife_interval'], col='3', desc=['Inverval(minute 단위)이나 Cron 설정']) }} {{ macros.setting_input_text('anilife_interval', '스케쥴링 실행 정보', value=arg['anilife_interval'], col='3', desc=['Interval(minute 단위)이나 Cron 설정']) }}
{{ macros.setting_checkbox('anilife_auto_start', '시작시 자동실행', value=arg['anilife_auto_start'], desc='On : 시작시 자동으로 스케쥴러에 등록됩니다.') }} {{ macros.setting_checkbox('anilife_auto_start', '시작시 자동실행', value=arg['anilife_auto_start'], desc='On : 시작시 자동으로 스케쥴러에 등록 됩니다.') }}
{{ macros.setting_input_textarea('anilife_auto_code_list', '자동 다운로드할 작품 코드', desc=['all 입력시 모두 받기', '구분자 | 또는 엔터'], value=arg['anilife_auto_code_list'], row='10') }} {{ macros.setting_input_textarea('anilife_auto_code_list', '자동 다운로드할 작품 코드', desc=['구분자 | 또는 엔터'], value=arg['anilife_auto_code_list'], row='10') }}
{{ macros.setting_checkbox('anilife_auto_mode_all', '에피소드 모두 받기', value=arg['anilife_auto_mode_all'], desc=['On : 이전 에피소드를 모두 받습니다.', 'Off : 최신 에피소드만 받습니다.']) }} {{ macros.setting_checkbox('anilife_auto_mode_all', '에피소드 모두 받기', value=arg['anilife_auto_mode_all'], desc=['On : 이전 에피소드를 모두 받습니다.', 'Off : 최신 에피소드만 받습니다.']) }}
{{ macros.m_tab_content_end() }} {{ macros.m_tab_content_end() }}