diff --git a/main.py b/main.py
index 8b41c54..527a63c 100644
--- a/main.py
+++ b/main.py
@@ -137,12 +137,12 @@ class LogicMain(LogicModuleBase):
preferredcodec=preferredcodec,
preferredquality=preferredquality,
proxy=ModelSetting.get("proxy"),
- ffmpeg_path=ModelSetting.get("ffmpeg_path")
- if req.form["ffmpeg_path"] != "ffmpeg"
- else None,
+ ffmpeg_path=ModelSetting.get("ffmpeg_path"),
)
youtube_dl.start()
LogicMain.socketio_emit("add", youtube_dl)
+ ret["ret"] = "info"
+ ret["msg"] = "분석중..."
elif sub == "thumbnail":
youtube_dl = LogicMain.thumbnail(
@@ -153,12 +153,12 @@ class LogicMain(LogicModuleBase):
save_path=ModelSetting.get("save_path"),
all_thumbnails=req.form["all_thumbnails"],
proxy=ModelSetting.get("proxy"),
- ffmpeg_path=ModelSetting.get("ffmpeg_path")
- if req.form["ffmpeg_path"] != "ffmpeg"
- else None,
+ ffmpeg_path=ModelSetting.get("ffmpeg_path"),
)
youtube_dl.start()
LogicMain.socketio_emit("add", youtube_dl)
+ ret["ret"] = "info"
+ ret["msg"] = "분석중..."
elif sub == "sub":
youtube_dl = LogicMain.sub(
@@ -171,12 +171,12 @@ class LogicMain(LogicModuleBase):
sub_lang=req.form["sub_lang"],
auto_sub=req.form["auto_sub"],
proxy=ModelSetting.get("proxy"),
- ffmpeg_path=ModelSetting.get("ffmpeg_path")
- if req.form["ffmpeg_path"] != "ffmpeg"
- else None,
+ ffmpeg_path=ModelSetting.get("ffmpeg_path"),
)
youtube_dl.start()
LogicMain.socketio_emit("add", youtube_dl)
+ ret["ret"] = "info"
+ ret["msg"] = "분석중..."
elif sub == "list":
ret["data"] = []
diff --git a/static/youtube-dl_download.js b/static/youtube-dl_download.js
index 0bae84b..f7ec53d 100644
--- a/static/youtube-dl_download.js
+++ b/static/youtube-dl_download.js
@@ -1,51 +1,69 @@
'use strict';
-const url = document.getElementById('url');
-const preset = document.getElementById('preset');
-const format = document.getElementById('format');
-const postprocessor = document.getElementById('postprocessor');
-const download_btn = document.getElementById('download_btn');
-
-// 프리셋 변경
-preset.addEventListener('change', () => {
- if (preset.value !== '_custom') {
- format.value = preset.value;
- }
-});
-format.addEventListener('input', () => {
- preset.value = '_custom';
-});
-
-// 후처리 변경
-postprocessor.addEventListener('change', () => {
- const select = postprocessor.selectedOptions[0];
- if (select.parentElement.label === '오디오 추출') {
- preset.value = 'bestaudio/best';
- format.value = preset.value;
- }
-});
-
-// 다운로드
-download_btn.addEventListener('click', (event) => {
- event.preventDefault();
- if (!url.value.startsWith('http')) {
- notify('URL을 입력하세요.', 'warning');
- return;
- }
-
- fetch(`/${package_name}/ajax/download`, {
- method: 'POST',
- cache: 'no-cache',
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
- },
- body: get_formdata('#download'),
- })
- .then((response) => response.json())
- .then(() => {
- notify('분석중..', 'info');
+(() => {
+ const post_ajax = (url, data) => {
+ const loading = document.getElementById('loading');
+ if (loading) {
+ loading.style.display = 'block';
+ }
+ return fetch(`/${package_name}/ajax${url}`, {
+ method: 'POST',
+ cache: 'no-cache',
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+ },
+ body: new URLSearchParams(data),
})
- .catch(() => {
- notify('다운로드 요청 실패', 'danger');
- });
-});
+ .then((response) => response.json())
+ .then((ret) => {
+ if (ret.msg) {
+ notify(ret.msg, ret.ret);
+ }
+ return ret;
+ })
+ .catch(() => {
+ notify('요청 실패', 'danger');
+ })
+ .finally(() => {
+ if (loading) {
+ loading.style.display = 'none';
+ }
+ });
+ };
+
+ const url = document.getElementById('url');
+ const preset = document.getElementById('preset');
+ const format = document.getElementById('format');
+ const postprocessor = document.getElementById('postprocessor');
+ const download_btn = document.getElementById('download_btn');
+
+ // 프리셋 변경
+ preset.addEventListener('change', () => {
+ if (preset.value !== '_custom') {
+ format.value = preset.value;
+ }
+ });
+ format.addEventListener('input', () => {
+ preset.value = '_custom';
+ });
+
+ // 후처리 변경
+ postprocessor.addEventListener('change', () => {
+ const select = postprocessor.selectedOptions[0];
+ if (select.parentElement.label === '오디오 추출') {
+ preset.value = 'bestaudio/best';
+ format.value = preset.value;
+ }
+ });
+
+ // 다운로드
+ download_btn.addEventListener('click', (event) => {
+ event.preventDefault();
+ if (!url.value.startsWith('http')) {
+ notify('URL을 입력하세요.', 'warning');
+ return;
+ }
+
+ post_ajax('/download', get_formdata('#download'));
+ });
+})();
diff --git a/static/youtube-dl_list.js b/static/youtube-dl_list.js
index 116275b..61b7583 100644
--- a/static/youtube-dl_list.js
+++ b/static/youtube-dl_list.js
@@ -1,152 +1,155 @@
'use strict';
-const all_stop_btn = document.getElementById('all_stop_btn');
-const list_tbody = document.getElementById('list_tbody');
-
-// 소켓
-const socket = io.connect(`${location.origin}/${package_name}`);
-socket.on('add', (data) => {
- list_tbody.innerHTML += make_item(data);
-});
-socket.on('status', (data) => {
- status_html(data);
-});
-
-// 목록 불러오기
-fetch(`/${package_name}/ajax/list`, {
- method: 'POST',
- cache: 'no-cache',
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
- },
-})
- .then((response) => response.json())
- .then((data) => {
- let str = '';
- for (const item of data) {
- str += make_item(item);
+(() => {
+ const post_ajax = (url, data) => {
+ const loading = document.getElementById('loading');
+ if (loading) {
+ loading.style.display = 'block';
}
- list_tbody.innerHTML = str;
+ return fetch(`/${package_name}/ajax${url}`, {
+ method: 'POST',
+ cache: 'no-cache',
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+ },
+ body: new URLSearchParams(data),
+ })
+ .then((response) => response.json())
+ .then((ret) => {
+ if (ret.msg) {
+ notify(ret.msg, ret.ret);
+ }
+ return ret;
+ })
+ .catch(() => {
+ notify('요청 실패', 'danger');
+ })
+ .finally(() => {
+ if (loading) {
+ loading.style.display = 'none';
+ }
+ });
+ };
+
+ const all_stop_btn = document.getElementById('all_stop_btn');
+ const list_tbody = document.getElementById('list_tbody');
+
+ const get_item = (data) => {
+ let str = `| ${data.index + 1} | `;
+ str += `${data.plugin} | `;
+ str += `${data.start_time} | `;
+ str += `${data.extractor} | `;
+ str += `${data.title} | `;
+ str += `${data.status_ko} | `;
+ let visi = 'hidden';
+ if (parseInt(data.percent) > 0 && data.status_str !== 'STOP') {
+ visi = 'visible';
+ }
+ str += ` | `;
+ str += `${data.download_time} | `;
+ str += '';
+ if (
+ data.status_str === 'START' ||
+ data.status_str === 'DOWNLOADING' ||
+ data.status_str === 'FINISHED'
+ ) {
+ str += ``;
+ }
+ str += ' | ';
+ return str;
+ };
+
+ const info_html = (left, right, option) => {
+ let str = '';
+ const link = left === 'URL' || left === '업로더';
+ str += '
';
+ str += `${left}`;
+ str += '
';
+ str += '
`;
+ str += get_item(data);
+ str += '
';
+ str += ``;
+ str += '| ';
+ str += ` `;
+ str += get_detail(data);
+ str += ' ';
+ str += ' | ';
+ str += '
';
+ return str;
+ };
+
+ const status_html = (data) => {
+ document.getElementById(`item_${data.index}`).innerHTML = get_item(data);
+ document.getElementById(`detail_${data.index}`).innerHTML =
+ get_detail(data);
+ };
+
+ // 소켓
+ const socket = io.connect(`${location.origin}/${package_name}`);
+ socket.on('add', (data) => {
+ list_tbody.innerHTML += make_item(data);
+ });
+ socket.on('status', (data) => {
+ status_html(data);
});
-// 전체 중지
-all_stop_btn.addEventListener('click', (event) => {
- event.preventDefault();
- fetch(`/${package_name}/ajax/all_stop`, {
- method: 'POST',
- cache: 'no-cache',
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
- },
- })
- .then((response) => response.json())
- .then(() => {
- location.reload();
- });
-});
+ const reload_list = async () => {
+ const { data } = await post_ajax('/list');
+ list_tbody.innerHTML = data.map((item) => make_item(item)).join('');
+ };
-// 중지
-list_tbody.addEventListener('click', (event) => {
- event.preventDefault();
- const target = event.target;
- if (!target.classList.contains('youtubeDl-stop')) {
- return;
- }
- fetch(`/${package_name}/ajax/stop`, {
- method: 'POST',
- cache: 'no-cache',
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
- },
- body: new URLSearchParams({
+ // 전체 중지
+ all_stop_btn.addEventListener('click', (event) => {
+ event.preventDefault();
+ post_ajax('/all_stop').then(reload_list);
+ });
+
+ // 중지
+ list_tbody.addEventListener('click', (event) => {
+ event.preventDefault();
+ const target = event.target;
+ if (!target.classList.contains('youtubeDl-stop')) {
+ return;
+ }
+ post_ajax('/stop', {
index: target.dataset.index,
- }),
- })
- .then((response) => response.json())
- .then(() => {
- location.reload();
- });
-});
+ }).then(reload_list);
+ });
-function make_item(data) {
- let str = ``;
- str += get_item(data);
- str += '
';
- str += ``;
- str += '| ';
- str += ` `;
- str += get_detail(data);
- str += ' ';
- str += ' | ';
- str += '
';
- return str;
-}
-
-function get_item(data) {
- let str = `${data.index + 1} | `;
- str += `${data.plugin} | `;
- str += `${data.start_time} | `;
- str += `${data.extractor} | `;
- str += `${data.title} | `;
- str += `${data.status_ko} | `;
- let visi = 'hidden';
- if (parseInt(data.percent) > 0 && data.status_str !== 'STOP') {
- visi = 'visible';
- }
- str += ` | `;
- str += `${data.download_time} | `;
- str += '';
- if (
- data.status_str === 'START' ||
- data.status_str === 'DOWNLOADING' ||
- data.status_str === 'FINISHED'
- ) {
- str += ``;
- }
- str += ' | ';
- return str;
-}
-
-function get_detail(data) {
- let str = info_html('URL', data.url, data.url);
- str += info_html('업로더', data.uploader, data.uploader_url);
- str += info_html('임시폴더', data.temp_path);
- str += info_html('저장폴더', data.save_path);
- str += info_html('종료시간', data.end_time);
- if (data.status_str === 'DOWNLOADING') {
- str += info_html('', '현재 다운로드 중인 파일에 대한 정보');
- str += info_html('파일명', data.filename);
- str += info_html(
- '진행률(current/total)',
- `${data.percent}% (${data.downloaded_bytes_str} / ${data.total_bytes_str})`
- );
- str += info_html('남은 시간', `${data.eta}초`);
- str += info_html('다운 속도', data.speed_str);
- }
- return str;
-}
-
-function info_html(left, right, option) {
- let str = '';
- const link = left === 'URL' || left === '업로더';
- str += '
';
- str += `${left}`;
- str += '
';
- str += '