v2.3.1 yt-dlp 패키지명 변경 대응

README.md

@@ -133,6 +133,9 @@ API를 제공합니다. 다른 플러그인에서 동영상 정보나 다운로
 물론 해당 정보가 없으면 null입니다.
 
 ## Changelog
+v2.3.1
+* yt-dlp 패키지명 변경 대응
+
 v2.3.0
 * youtube-dlc를 yt-dlp로 변경  
   youtube-dlc가 2개월 넘게 커밋이 없어서 youtube-dlc의 포크 프로젝트인 yt-dlp로 변경했습니다.  

info.json

@@ -1 +1 @@
-{"description": "\uc720\ud29c\ube0c, \ub124\uc774\ubc84TV \ub4f1 \ub3d9\uc601\uc0c1 \uc0ac\uc774\ud2b8\uc5d0\uc11c \ub3d9\uc601\uc0c1 \ub2e4\uc6b4\ub85c\ub4dc", "name": "youtube-dl", "more": "", "version": "2.3.0", "home": "https://github.com/joyfuI/youtube-dl", "category_name": "vod", "developer": "joyfuI"}
+{"description": "\uc720\ud29c\ube0c, \ub124\uc774\ubc84TV \ub4f1 \ub3d9\uc601\uc0c1 \uc0ac\uc774\ud2b8\uc5d0\uc11c \ub3d9\uc601\uc0c1 \ub2e4\uc6b4\ub85c\ub4dc", "name": "youtube-dl", "more": "", "version": "2.3.1", "home": "https://github.com/joyfuI/youtube-dl", "category_name": "vod", "developer": "joyfuI"}

logic.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-#########################################################
 # python
 import os
 import sys
@@ -18,13 +17,14 @@ from framework.util import Util
 from .plugin import logger, package_name
 from .logic_normal import LogicNormal
 from .model import ModelSetting
-#########################################################
+
 
 class Logic(object):
     db_default = {
         'db_version': '2',
         'youtube_dl_package': '0',
-        'ffmpeg_path': '' if platform.system() != 'Windows' else os.path.join(path_app_root, 'bin', 'Windows', 'ffmpeg.exe'),
+        'ffmpeg_path': '' if platform.system() != 'Windows' else os.path.join(path_app_root, 'bin', 'Windows',
+                                                                              'ffmpeg.exe'),
         'temp_path': os.path.join(path_data, 'download_tmp'),
         'save_path': os.path.join(path_data, 'download'),
         'default_filename': '',
@@ -55,12 +55,14 @@ class Logic(object):
                 import glob2
             except ImportError:
                 logger.debug('glob2 install')
-                logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'install', 'glob2'], universal_newlines=True))
+                logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'install', 'glob2'],
+                                                     universal_newlines=True))
 
             # youtube-dl 업데이트
             youtube_dl = LogicNormal.get_youtube_dl_package(ModelSetting.get('youtube_dl_package'))
             logger.debug('%s upgrade' % youtube_dl)
-            logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'install', '--upgrade', youtube_dl], universal_newlines=True))
+            logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'install', '--upgrade', youtube_dl],
+                                                 universal_newlines=True))
 
             # 편의를 위해 json 파일 생성
             from .plugin import plugin_info
@@ -85,7 +87,8 @@ class Logic(object):
 
             if db_version < 2:
                 logger.debug('youtube-dlc uninstall')
-                logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'uninstall', '-y', 'youtube-dlc'], universal_newlines=True))
+                logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'uninstall', '-y', 'youtube-dlc'],
+                                                     universal_newlines=True))
 
             connect.commit()
             connect.close()

logic_normal.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-#########################################################
 # python
 import traceback
 from datetime import datetime
@@ -10,7 +9,7 @@ from flask import jsonify
 # 패키지
 from .plugin import logger
 from .my_youtube_dl import MyYoutubeDL, Status
-#########################################################
+
 
 class LogicNormal(object):
     youtube_dl_list = []
@@ -18,7 +17,7 @@ class LogicNormal(object):
     @staticmethod
     def get_youtube_dl_package(index=None, import_pkg=False):
         packages = ['youtube-dl', 'yt-dlp']
-        import_name = ['youtube_dl', 'youtube_dlc']
+        import_name = ['youtube_dl', 'yt_dlp']
         if import_pkg:
             return import_name if index is None else import_name[int(index)]
         else:
@@ -26,7 +25,12 @@ class LogicNormal(object):
 
     @staticmethod
     def get_youtube_dl_version():
+        try:
             return MyYoutubeDL.get_version()
+        except Exception as e:
+            logger.error('Exception:%s', e)
+            logger.error(traceback.format_exc())
+            return '패키지 임포트 실패'
 
     @staticmethod
     def get_default_filename():
@@ -136,15 +140,19 @@ class LogicNormal(object):
             data['status_str'] = youtube_dl.status.name
             data['status_ko'] = str(youtube_dl.status)
             data['end_time'] = ''
-            data['extractor'] = youtube_dl.info_dict['extractor'] if youtube_dl.info_dict['extractor'] is not None else ''
-            data['title'] = youtube_dl.info_dict['title'] if youtube_dl.info_dict['title'] is not None else youtube_dl.url
+            data['extractor'] = youtube_dl.info_dict['extractor'] if \
+                youtube_dl.info_dict['extractor'] is not None else ''
+            data['title'] = youtube_dl.info_dict['title'] if \
+                youtube_dl.info_dict['title'] is not None else youtube_dl.url
             data['uploader'] = youtube_dl.info_dict['uploader'] if youtube_dl.info_dict['uploader'] is not None else ''
-            data['uploader_url'] = youtube_dl.info_dict['uploader_url'] if youtube_dl.info_dict['uploader_url'] is not None else ''
+            data['uploader_url'] = youtube_dl.info_dict['uploader_url'] if \
+                youtube_dl.info_dict['uploader_url'] is not None else ''
             data['downloaded_bytes_str'] = ''
             data['total_bytes_str'] = ''
             data['percent'] = '0'
             data['eta'] = youtube_dl.progress_hooks['eta'] if youtube_dl.progress_hooks['eta'] is not None else ''
-            data['speed_str'] = LogicNormal.human_readable_size(youtube_dl.progress_hooks['speed'], '/s') if youtube_dl.progress_hooks['speed'] is not None else ''
+            data['speed_str'] = LogicNormal.human_readable_size(youtube_dl.progress_hooks['speed'], '/s') if \
+                youtube_dl.progress_hooks['speed'] is not None else ''
             if youtube_dl.status == Status.READY:  # 다운로드 전
                 data['start_time'] = ''
                 data['download_time'] = ''
@@ -154,10 +162,14 @@ class LogicNormal(object):
                 else:
                     download_time = youtube_dl.end_time - youtube_dl.start_time
                     data['end_time'] = youtube_dl.end_time.strftime('%m-%d %H:%M:%S')
-                if None not in (youtube_dl.progress_hooks['downloaded_bytes'], youtube_dl.progress_hooks['total_bytes']):   # 둘 다 값이 있으면
-                    data['downloaded_bytes_str'] = LogicNormal.human_readable_size(youtube_dl.progress_hooks['downloaded_bytes'])
+                if None not in (youtube_dl.progress_hooks['downloaded_bytes'],
+                                youtube_dl.progress_hooks['total_bytes']):  # 둘 다 값이 있으면
+                    data['downloaded_bytes_str'] = LogicNormal.human_readable_size(
+                        youtube_dl.progress_hooks['downloaded_bytes']
+                    )
                     data['total_bytes_str'] = LogicNormal.human_readable_size(youtube_dl.progress_hooks['total_bytes'])
-                    data['percent'] = '%.2f' % (float(youtube_dl.progress_hooks['downloaded_bytes']) / float(youtube_dl.progress_hooks['total_bytes']) * 100)
+                    data['percent'] = '%.2f' % (float(youtube_dl.progress_hooks['downloaded_bytes'])
+                                                / float(youtube_dl.progress_hooks['total_bytes']) * 100)
                 data['start_time'] = youtube_dl.start_time.strftime('%m-%d %H:%M:%S')
                 data['download_time'] = '%02d:%02d' % (download_time.seconds / 60, download_time.seconds % 60)
             return data

model.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-#########################################################
 # python
 import traceback
 import os
@@ -14,7 +13,7 @@ from framework.util import Util
 from .plugin import logger, package_name
 
 app.config['SQLALCHEMY_BINDS'][package_name] = 'sqlite:///%s' % (os.path.join(path_data, 'db', '%s.db' % package_name))
-#########################################################
+
 
 class ModelSetting(db.Model):
     __tablename__ = '%s_setting' % package_name

my_youtube_dl.py

@@ -10,8 +10,6 @@ import json
 from datetime import datetime
 from enum import Enum
 
-# third-party
-
 # sjva 공용, 패키지
 import framework.common.celery as celery_shutil
 from .plugin import logger

plugin.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
-#########################################################
 # python
 import os
 import sys
 import traceback
 import subprocess
-import json
 
 # third-party
 from flask import Blueprint, request, render_template, redirect, jsonify, abort
@@ -20,19 +18,23 @@ package_name = __name__.split('.')[0]
 logger = get_logger(package_name)
 from .logic import Logic
 from .logic_normal import LogicNormal
-YOUTUBE_DL_PACKAGE = LogicNormal.get_youtube_dl_package(Logic.db_default['youtube_dl_package'], import_pkg=True)
 from .model import ModelSetting
 
+YOUTUBE_DL_PACKAGE = LogicNormal.get_youtube_dl_package(Logic.db_default['youtube_dl_package'], import_pkg=True)
+
 #########################################################
 # 플러그인 공용
 #########################################################
-blueprint = Blueprint(package_name, package_name, url_prefix='/%s' % package_name, template_folder=os.path.join(os.path.dirname(__file__), 'templates'))
+blueprint = Blueprint(package_name, package_name, url_prefix='/%s' % package_name,
+                      template_folder=os.path.join(os.path.dirname(__file__), 'templates'),
+                      static_folder=os.path.join(os.path.dirname(__file__), 'static'))
 if ModelSetting.get_bool('activate_cors'):
     try:
         from flask_cors import CORS
     except ImportError:
         logger.debug('flask-cors install')
-        logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'install', 'flask-cors'], universal_newlines=True))
+        logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'install', 'flask-cors'],
+                                             universal_newlines=True))
         from flask_cors import CORS
     CORS(blueprint, resources={r"/youtube-dl/api/*": {"origins": "*"}})
 
@@ -45,7 +47,7 @@ menu = {
 }
 
 plugin_info = {
-    'version': '2.3.0',
+    'version': '2.3.1',
     'name': 'youtube-dl',
     'category_name': 'vod',
     'developer': 'joyfuI',
@@ -54,14 +56,17 @@ plugin_info = {
     'more': ''
 }
 
+
 def plugin_load():
     Logic.plugin_load()
     global YOUTUBE_DL_PACKAGE
     YOUTUBE_DL_PACKAGE = LogicNormal.get_youtube_dl_package(ModelSetting.get('youtube_dl_package'), import_pkg=True)
 
+
 def plugin_unload():
     Logic.plugin_unload()
 
+
 #########################################################
 # WEB Menu
 #########################################################
@@ -69,11 +74,15 @@ def plugin_unload():
 def home():
     return redirect('/%s/list' % package_name)
 
+
 @blueprint.route('/<sub>')
 @login_required
 def first_menu(sub):
     try:
-        arg = {'package_name': package_name}
+        arg = {
+            'package_name': package_name,
+            'template_name': '%s_%s' % (package_name, sub)
+        }
 
         if sub == 'setting':
             arg.update(ModelSetting.to_dict())
@@ -99,6 +108,7 @@ def first_menu(sub):
         logger.error(traceback.format_exc())
     return render_template('sample.html', title='%s - %s' % (package_name, sub))
 
+
 #########################################################
 # For UI
 #########################################################
@@ -168,6 +178,7 @@ def ajax(sub):
         logger.error('Exception:%s', e)
         logger.error(traceback.format_exc())
 
+
 #########################################################
 # API
 #########################################################
@@ -309,8 +320,10 @@ def api(sub):
             if youtube_dl.key != key:
                 return LogicNormal.abort(ret, 4)  # 키가 일치하지 않음
             ret['status'] = youtube_dl.status.name
-            ret['start_time'] = youtube_dl.start_time.strftime('%Y-%m-%dT%H:%M:%S') if youtube_dl.start_time is not None else None
-            ret['end_time'] = youtube_dl.end_time.strftime('%Y-%m-%dT%H:%M:%S') if youtube_dl.end_time is not None else None
+            ret['start_time'] = youtube_dl.start_time.strftime('%Y-%m-%dT%H:%M:%S') if \
+                youtube_dl.start_time is not None else None
+            ret['end_time'] = youtube_dl.end_time.strftime('%Y-%m-%dT%H:%M:%S') if \
+                youtube_dl.end_time is not None else None
             ret['temp_path'] = youtube_dl.temp_path
             ret['save_path'] = youtube_dl.save_path
             return jsonify(ret)
@@ -320,6 +333,7 @@ def api(sub):
         abort(500)  # 500 에러(서버 오류)
     abort(404)  # 404 에러(페이지 없음)
 
+
 #########################################################
 # socketio
 #########################################################

static/youtube-dl_download.js

@@ -0,0 +1,48 @@
+"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');
+    }).catch(() => {
+        notify('다운로드 요청 실패', 'danger');
+    });
+});

static/youtube-dl_list.css

@@ -0,0 +1,26 @@
+.row > div {
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+
+.row {
+    align-items: center;
+    word-break: break-all;
+}
+
+.row > div:nth-child(odd) {
+    text-align: right;
+}
+
+.row > div:nth-child(even) {
+    text-align: left;
+}
+
+.cursor-pointer {
+    cursor: pointer;
+}
+
+.info-padding {
+    padding-left: 10px;
+    padding-top: 3px;
+}

static/youtube-dl_list.js

@@ -0,0 +1,139 @@
+"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);
+    }
+    list_tbody.innerHTML = str;
+});
+
+// 전체 중지
+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();
+    });
+});
+
+// 중지
+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({
+            index: target.dataset.index
+        })
+    }).then(response => response.json()).then(() => {
+        location.reload();
+    });
+});
+
+function make_item(data) {
+    let str = `<tr id="item_${data.index}" class="cursor-pointer" aria-expanded="true" data-toggle="collapse" data-target="#collapse_${data.index}">`;
+    str += get_item(data);
+    str += '</tr>';
+    str += `<tr id="collapse_${data.index}" class="collapse tableRowHoverOff">`;
+    str += '<td colspan="9">';
+    str += `<div id="detail_${data.index}">`;
+    str += get_detail(data);
+    str += '</div>';
+    str += '</td>';
+    str += '</tr>';
+    return str;
+}
+
+function get_item(data) {
+    let str = `<td>${data.index + 1}</td>`;
+    str += `<td>${data.plugin}</td>`;
+    str += `<td>${data.start_time}</td>`;
+    str += `<td>${data.extractor}</td>`;
+    str += `<td>${data.title}</td>`;
+    str += `<td>${data.status_ko}</td>`;
+    let visi = 'hidden';
+    if (parseInt(data.percent) > 0 && data.status_str !== 'STOP') {
+        visi = 'visible';
+    }
+    str += `<td><div class="progress"><div class="progress-bar" style="visibility: ${visi}; width: ${data.percent}%">${data.percent}%</div></div></td>`;
+    str += `<td>${data.download_time}</td>`;
+    str += '<td class="tableRowHoverOff">';
+    if (data.status_str === 'START' || data.status_str === 'DOWNLOADING' || data.status_str === 'FINISHED') {
+        str += `<button class="align-middle btn btn-outline-danger btn-sm youtubeDl-stop" data-index="${data.index}">중지</button>`;
+    }
+    str += '</td>';
+    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('', '<b>현재 다운로드 중인 파일에 대한 정보</b>');
+        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 = '<div class="row">';
+    const link = (left === 'URL' || left === '업로더');
+    str += '<div class="col-sm-2">';
+    str += `<b>${left}</b>`;
+    str += '</div>';
+    str += '<div class="col-sm-10">';
+    str += '<div class="input-group col-sm-9">';
+    str += '<span class="text-left info-padding">';
+    if (link) {
+        str += `<a href="${option}" target="_blank">`;
+    }
+    str += right;
+    if (link) {
+        str += '</a>';
+    }
+    str += '</span></div></div></div>';
+    return str;
+}
+
+function status_html(data) {
+    document.getElementById(`item_${data.index}`).innerHTML = get_item(data);
+    document.getElementById(`detail_${data.index}`).innerHTML = get_detail(data);
+}

static/youtube-dl_setting.js

@@ -0,0 +1,32 @@
+"use strict";
+
+const ffmpeg_version_btn = document.getElementById('ffmpeg_version_btn');
+const ffmpeg_path = document.getElementById('ffmpeg_path');
+const modal_title = document.getElementById('modal_title');
+const modal_body = document.getElementById('modal_body');
+
+// FFmpeg 버전확인
+ffmpeg_version_btn.addEventListener('click', (event) => {
+    event.preventDefault();
+    let ffmpeg = ffmpeg_path.value;
+    if (ffmpeg.length === 0) {
+        ffmpeg = 'ffmpeg';
+    }
+
+    fetch(`/${package_name}/ajax/ffmpeg_version`, {
+        method: 'POST',
+        cache: 'no-cache',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+        },
+        body: new URLSearchParams({
+            path: ffmpeg
+        })
+    }).then(response => response.json()).then((data) => {
+        modal_title.innerHTML = `${ffmpeg} -version`;
+        modal_body.innerHTML = data;
+        $('#large_modal').modal();
+    }).catch(() => {
+        notify('버전확인 실패', 'danger');
+    });
+});

templates/youtube-dl_download.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% macro setting_select2(id, title, options, col='9', desc=None, value=None) %}
+{% macro my_setting_select(id, title, options, col='9', desc=None, value=None) %}
     {{ macros.setting_top(title) }}
     <div class="input-group col-sm-{{ col }}">
         <select id="{{ id }}" name="{{ id }}" class="form-control form-control-sm">
@@ -31,70 +31,19 @@
 
 {% block content %}
 
-    <div>
+    <form id="download">
         {{ macros.setting_input_text('url', 'URL', placeholder='http:// 주소', desc='유튜브, 네이버TV 등 동영상 주소') }}
         {{ macros.setting_input_text('filename', '파일명', value=arg['filename'], desc='템플릿 규칙은 https://github.com/ytdl-org/youtube-dl/#output-template 참고') }}
         {{ macros.setting_select('preset', '동영상 포맷 프리셋', arg['preset_list'], col='3') }}
         {{ macros.setting_input_text('format', '동영상 포맷', desc=['포맷 지정은 https://github.com/ytdl-org/youtube-dl/#format-selection 참고', '빈칸으로 두면 최고 화질로 다운로드합니다.']) }}
-        {{ setting_select2('postprocessor', '후처리', arg['postprocessor_list'], col='3', desc='다운로드 후 FFmpeg로 후처리합니다.') }}
+        {{ my_setting_select('postprocessor', '후처리', arg['postprocessor_list'], col='3', desc='다운로드 후 FFmpeg로 후처리합니다.') }}
         {{ macros.setting_button([['download_btn', '다운로드']]) }}
-    </div>
+    </form>
 
     <script>
         "use strict";
         const package_name = '{{ arg["package_name"] }}';
-
-        $(function () {
-            // 프리셋 변경
-            $('#preset').change(function () {
-                if ($(this).val() === '_custom') {
-                    return;
-                }
-                $('#format').val($(this).val());
-            });
-            $('#format').change(function () {
-                $('#preset').val('_custom');
-            });
-
-            // 후처리 변경
-            $('#postprocessor').change(function () {
-                if ($(this).find($(`option[value="${$(this).val()}"]`)).parent().attr('label') === '오디오 추출') {
-                    $('#preset').val('bestaudio/best').change();
-                }
-            });
-
-            // 다운로드
-            $('#download_btn').click(function () {
-                let url = $('#url').val();
-                if (url.startsWith('http') === false) {
-                    $.notify('<strong>URL을 입력하세요.</strong>', {
-                        type: 'warning'
-                    });
-                    return false;
-                }
-                $.ajax({
-                    url: `/${package_name}/ajax/download`,
-                    type: 'POST',
-                    cache: false,
-                    data: {
-                        url: url,
-                        filename: $('#filename').val(),
-                        format: $('#format').val(),
-                        postprocessor: $('#postprocessor').val()
-                    },
-                    dataType: 'json'
-                }).done(function () {
-                    $.notify('<strong>분석중..</strong>', {
-                        type: 'info'
-                    });
-                }).fail(function () {
-                    $.notify('<strong>다운로드 요청 실패</strong>', {
-                        type: 'danger'
-                    });
-                });
-                return false;
-            });
-        });
     </script>
+    <script src="{{ url_for('.static', filename='%s.js' % arg['template_name']) }}"></script>
 
 {% endblock %}

templates/youtube-dl_list.html

@@ -1,32 +1,14 @@
 {% extends "base.html" %}
 {% block content %}
 
-    <style>
-        .row > div {
-            padding-top: 3px;
-            padding-bottom: 3px;
-        }
-
-        .row {
-            align-items: center;
-            word-break: break-all;
-        }
-
-        .row > div:nth-child(odd) {
-            text-align: right;
-        }
-
-        .row > div:nth-child(even) {
-            text-align: left;
-        }
-    </style>
+    <link rel="stylesheet" href="{{ url_for('.static', filename='%s.css' % arg['template_name']) }}">
 
     {{ macros.m_row_start() }}
     {{ macros.m_button('all_stop_btn', '전체 중지') }}
     {{ macros.m_row_end() }}
     <div class="d-inline-block"></div>
 
-    <table id="result_table" class="table table-sm tableRowHover">
+    <table class="table table-sm tableRowHover">
         <thead>
             <tr>
                 <th style="width: 5%">IDX</th>
@@ -40,145 +22,13 @@
                 <th style="width: 8%">Action</th>
             </tr>
         </thead>
-        <tbody id="list"></tbody>
+        <tbody id="list_tbody"></tbody>
     </table>
 
     <script>
         "use strict";
         const package_name = '{{ arg["package_name"] }}';
-
-        $(function () {
-            let socket = io.connect(`${location.origin}/${package_name}`);
-
-            socket.on('add', function (data) {
-                $('#list').append(make_item(data));
-            });
-
-            socket.on('status', function (data) {
-                status_html(data);
-            });
-
-            $.ajax({
-                url: `/${package_name}/ajax/list`,
-                type: 'POST',
-                cache: false,
-                data: {},
-                dataType: 'json'
-            }).done(function (data) {
-                let str = '';
-                for (let item of data) {
-                    str += make_item(item);
-                }
-                $('#list').html(str);
-            });
-
-            // 전체 중지
-            $('#all_stop_btn').click(function () {
-                $.ajax({
-                    url: `/${package_name}/ajax/all_stop`,
-                    type: 'POST',
-                    cache: false,
-                    data: {},
-                    dataType: 'json'
-                }).done(function () {
-                    location.reload();
-                });
-                return false;
-            });
-
-            // 중지
-            $('#list').on('click', '.youtube-dl_stop', function () {
-                let index = $(this).data('index');
-                $.ajax({
-                    url: `/${package_name}/ajax/stop`,
-                    type: 'POST',
-                    cache: false,
-                    data: {
-                        index: index
-                    },
-                    dataType: 'json'
-                }).done(function () {
-                    location.reload();
-                });
-                return false;
-            });
-        });
-
-        function make_item(data) {
-            let str = `<tr id="item_${data.index}" aria-expanded="true" style="cursor: pointer" data-toggle="collapse" data-target="#collapse_${data.index}">`;
-            str += get_item(data);
-            str += '</tr>';
-            str += `<tr id="collapse_${data.index}" class="collapse tableRowHoverOff" style="cursor: pointer">`;
-            str += '<td colspan="9">';
-            str += `<div id="detail_${data.index}">`;
-            str += get_detail(data);
-            str += '</div>';
-            str += '</td>';
-            str += '</tr>';
-            return str;
-        }
-
-        function get_item(data) {
-            let str = `<td>${data.index + 1}</td>`;
-            str += `<td>${data.plugin}</td>`;
-            str += `<td>${data.start_time}</td>`;
-            str += `<td>${data.extractor}</td>`;
-            str += `<td>${data.title}</td>`;
-            str += `<td>${data.status_ko}</td>`;
-            let visi = 'hidden';
-            if (parseInt(data.percent) > 0 && data.status_str !== 'STOP') {
-                visi = 'visible';
-            }
-            str += `<td><div class="progress"><div class="progress-bar" style="visibility: ${visi}; width: ${data.percent}%">${data.percent}%</div></div></td>`;
-            str += `<td>${data.download_time}</td>`;
-            str += '<td class="tableRowHoverOff">';
-            if (data.status_str === 'START' || data.status_str === 'DOWNLOADING' || data.status_str === 'FINISHED') {
-                str += `<button class="align-middle btn btn-outline-danger btn-sm youtube-dl_stop" data-index="${data.index}">중지</button>`;
-            }
-            str += '</td>';
-            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('', '<b>현재 다운로드 중인 파일에 대한 정보</b>');
-                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 = '<div class="row">';
-            let link = (left === 'URL' || left === '업로더');
-            str += '<div class="col-sm-2">';
-            str += `<b>${left}</b>`;
-            str += '</div>';
-            str += '<div class="col-sm-10">';
-            str += '<div class="input-group col-sm-9">';
-            str += '<span class="text-left" style="padding-left: 10px; padding-top: 3px">';
-            if (link) {
-                str += `<a href="${option}" target="_blank">`;
-            }
-            str += right;
-            if (link) {
-                str += '</a>';
-            }
-            str += '</span></div></div></div>';
-            return str;
-        }
-
-        function status_html(data) {
-            $(`#item_${data.index}`).html(get_item(data));
-            $(`#detail_${data.index}`).html(get_detail(data));
-        }
     </script>
+    <script src="{{ url_for('.static', filename='%s.js' % arg['template_name']) }}"></script>
 
 {% endblock %}

templates/youtube-dl_setting.html

@@ -1,11 +1,10 @@
 {% extends "base.html" %}
 {% block content %}
 
-    <div>
     <form id="setting">
         {{ macros.setting_radio('youtube_dl_package', 'youtube-dl', arg['package_list'], value=arg['youtube_dl_package'], desc='사용할 youtube-dl 패키지를 선택합니다. 설정 저장 후 재시작이 필요합니다.') }}
         {{ macros.setting_input_text('youtube_dl_version', 'youtube-dl 버전', value=arg['youtube_dl_version'], disabled=True) }}
-            {{ macros.setting_input_text_and_buttons('ffmpeg_path', 'FFmpeg 경로', [['ffmpeg_version', '버전확인']], value=arg['ffmpeg_path'], placeholder='ffmpeg', desc='SJVA에 내장된 버전 말고 원하는 버전을 사용할 수 있습니다.') }}
+        {{ macros.setting_input_text_and_buttons('ffmpeg_path', 'FFmpeg 경로', [['ffmpeg_version_btn', '버전확인']], value=arg['ffmpeg_path'], placeholder='ffmpeg', desc='SJVA에 내장된 버전 말고 원하는 버전을 사용할 수 있습니다.') }}
         {{ macros.setting_input_text('temp_path', '임시 폴더', value=arg['temp_path'], desc='다운로드 파일이 임시로 저장될 폴더입니다.') }}
         {{ macros.setting_input_text('save_path', '저장 폴더', value=arg['save_path'], desc='정상적으로 완료된 파일이 이동할 폴더입니다.') }}
         {{ macros.setting_input_text('default_filename', '기본 파일명', value=arg['default_filename'], placeholder=arg['DEFAULT_FILENAME'], desc='템플릿 규칙은 https://github.com/ytdl-org/youtube-dl/#output-template 참고') }}
@@ -13,39 +12,11 @@
         {{ macros.setting_checkbox('activate_cors', 'CORS 허용', value=arg['activate_cors'], desc='API로의 크로스 도메인 요청을 허용합니다. 설정 저장 후 재시작이 필요합니다.') }}
         {{ macros.setting_button([['global_setting_save_btn', '저장']]) }}
     </form>
-    </div>
 
     <script>
         "use strict";
         const package_name = '{{ arg["package_name"] }}';
-
-        $(function () {
-            // FFmpeg 버전확인
-            $('#ffmpeg_version').click(function () {
-                let ffmpeg_path = $('#ffmpeg_path').val();
-                if (ffmpeg_path.length === 0) {
-                    ffmpeg_path = 'ffmpeg';
-                }
-                $.ajax({
-                    url: `/${package_name}/ajax/ffmpeg_version`,
-                    type: 'POST',
-                    cache: false,
-                    data: {
-                        path: ffmpeg_path
-                    },
-                    dataType: 'json'
-                }).done(function (data) {
-                    $('#modal_title').html(`${ffmpeg_path} -version`);
-                    $('#modal_body').html(data);
-                    $('#large_modal').modal();
-                }).fail(function () {
-                    $.notify(`<strong>버전확인 실패</strong><br>${ffmpeg_path} -version`, {
-                        type: 'danger'
-                    });
-                });
-                return false;
-            });
-        });
     </script>
+    <script src="{{ url_for('.static', filename='%s.js' % arg['template_name']) }}"></script>
 
 {% endblock %}