2022.11.12 (01. bug fixed)

This commit is contained in:
2022-11-12 23:47:21 +09:00
parent b0fa6c4bda
commit e7bb53c33b
12 changed files with 2522 additions and 1074 deletions

View File

@@ -1,130 +1,175 @@
{% extends "base.html" %}
{% block content %}
<div>
{{ macros.m_button_group([['reset_btn', '초기화'], ['delete_completed_btn', '완료 목록 삭제'], ['go_ffmpeg_btn', 'Go FFMPEG']])}}
{{ macros.m_row_start('0') }}
{{ macros.m_row_end() }}
{{ macros.m_hr_head_top() }}
{{ macros.m_row_start('0') }}
{{ macros.m_col(1, macros.m_strong('Idx')) }}
{{ macros.m_col(2, macros.m_strong('CreatedTime')) }}
{{ macros.m_col(4, macros.m_strong('Filename')) }}
{{ macros.m_col(3, macros.m_strong('Status')) }}
{{ macros.m_col(2, macros.m_strong('Action')) }}
{{ macros.m_row_end() }}
{{ macros.m_hr_head_bottom() }}
<div id="download_list_div"></div>
</div> <!--전체-->
<table id="result_table" class="table table-sm tableRowHover">
<thead class="thead-dark">
<tr>
<th style="width:5%; text-align:center;">IDX</th>
<th style="width:8%; text-align:center;">Plugin</th>
<th style="width:10%; text-align:center;">시작시간</th>
<th style="width:20%; text-align:center;">파일명</th>
<th style="width:8%; text-align:center;">상태</th>
<th style="width:15%; text-align:center;">진행률</th>
<th style="width:5%; text-align:center;">길이</th>
<th style="width:5%; text-align:center;">PF</th>
<th style="width:8%; text-align:center;">배속</th>
<th style="width:8%; text-align:center;">진행시간</th>
<th style="width:8%; text-align:center;">Action</th>
</tr>
</thead>
<tbody id="list"></tbody>
</table>
<script type="text/javascript">
var package_name = "{{arg['package_name'] }}";
var sub = "{{arg['sub'] }}";
var current_data = null;
socket = io.connect(window.location.protocol + "//" + document.domain + ":" + location.port + "/" + package_name + '/' + sub);
$(document).ready(function(){
});
var socket = io.connect(window.location.href);
socket.on('start', function(data){
on_start();
});
socket.on('list_refresh', function(data){
on_start()
});
socket.on('status', function(data){
on_status(data)
});
function on_start() {
$.ajax({
url: '/' + package_name + '/ajax/' + sub + '/entity_list',
type: "POST",
cache: false,
data: {},
dataType: "json",
success: function (data) {
make_download_list(data)
}
socket.on('on_start', function(data){
document.getElementById("log").innerHTML += data.data;
document.getElementById("log").scrollTop = document.getElementById("log").scrollHeight;
document.getElementById("log").style.visibility = 'visible';
$('#loading').hide();
});
}
function on_status(data) {
//console.log(data)
tmp = document.getElementById("progress_"+data.entity_id)
if (tmp != null) {
document.getElementById("progress_"+data.entity_id).style.width = data.ffmpeg_percent+ '%';
document.getElementById("progress_"+data.entity_id+"_label").innerHTML = data.ffmpeg_status_kor + "(" + data.ffmpeg_percent + "%)" + ' ' + ((data.ffmpeg_arg != null)?data.ffmpeg_arg.data.current_speed:'')
}
}
function make_download_list(data) {
str = '';
for (i in data) {
str += m_row_start();
str += m_col(1, data[i].entity_id);
str += m_col(2, data[i].created_time);
str += m_col(4, (data[i].filename != null) ? data[i].filename : '');
label = data[i].ffmpeg_status_kor
if (data[i].ffmpeg_percent != 0) {
label += '(' + data[i].ffmpeg_percent + '%)'
socket.on('add', function(data){
str = make_item(data);
if (current_data == null || current_data.length == 0) {
current_data = Array();
$("#list").html(str);
} else {
$("#list").html($("#list").html() + str);
}
tmp = m_progress('progress_'+data[i].entity_id, data[i].ffmpeg_percent, label)
str += m_col(3, tmp);
tmp = m_button('program_cancel_btn', '취소', [{'key':'id', 'value':data[i].entity_id}]);
tmp = m_button_group(tmp)
str += m_col(2, tmp)
str += m_row_end();
if (i != data.length -1) str += m_hr(0);
}
document.getElementById("download_list_div").innerHTML = str;
}
current_data.push(data);
});
$("body").on('click', '#program_cancel_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'cancel', 'entity_id':entity_id}
queue_command(send_data)
});
socket.on('status_change', function(data) {
button_html(data);
});
$("body").on('click', '#reset_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'reset', 'entity_id':-1}
queue_command(send_data)
});
socket.on('status', function(data){
status_html(data);
});
$("body").on('click', '#delete_completed_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'delete_completed', 'entity_id':-1}
queue_command(send_data)
});
socket.on('last', function(data){
status_html(data);
button_html(data);
});
function queue_command(data) {
$.ajax({
url: '/' + package_name + '/ajax/' + sub + '/queue_command',
type: "POST",
cache: false,
data: data,
dataType: "json",
success: function (ret) {
if (ret.ret == 'notify') {
$.notify('<strong>'+ ret.log +'</strong>', {type: 'warning'});
globalSendCommand('list', null, null, null, function(data) {
current_data = data;
$("#list").html('');
console.log(data)
if (data.length == 0) {
str = "<tr><td colspan='10'><h4>작업이 없습니다.</h4><td><tr>";
} else {
str = ''
for(i in data) {
str += make_item(data[i]);
}
on_start();
}
$("#list").html(str);
});
}
$("body").on('click', '#go_ffmpeg_btn', function(e){
e.preventDefault();
$(location).attr('href', '/ffmpeg')
});
</script>
{% endblock %}
$("body").on('click', '#stop_btn', function(e){
e.stopPropagation();
e.preventDefault();
globalSendCommand('stop', $(this).data('idx'), null, null, function(ret){
refresh_item(ret.data);
});
});
function refresh_item(data) {
$('#tr1_'+data.idx).html(make_item1(data));
$('#collapse_'+data.idx).html(make_item2(data));
}
function make_item(data) {
str = '<tr id="tr1_'+data.idx+'" style="cursor: pointer;" data-toggle="collapse" data-target="#collapse_'+ data.idx + '" aria-expanded="true" >';
str += make_item1(data);
str += '</tr>';
str += '<tr class="collapse tableRowHoverOff" style="cursor: pointer;" id="collapse_' + data.idx + '">';
str += make_item2(data);
str += '</tr>';
return str;
}
function make_item1(data) {
//console.log(data);
str = '';
str += '<td scope="col" style="width:5%; text-align:center;">'+ data.idx + '</td>';
str += '<td scope="col" style="width:8%; text-align:center;">'+ data.callback_id + '</td>';
str += '<td scope="col" style="width:10%; text-align:center;">'+ data.start_time + '</td>';
str += '<td scope="col" style="width:20%; text-align:center;">'+ data.filename + '</td>';
str += '<td id="status_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.status_kor + '</td>';
var visi = 'hidden';
if (parseInt(data.percent) > 0) {
visi = 'visible';
}
str += '<td scope="col" style="width:20%; text-align:center;"><div class="progress"><div id="progress_'+data.idx+'" class="progress-bar" style="visibility: '+visi+'; width:'+data.percent+'%">'+data.percent +'%</div></div></td>';
str += '<td scope="col" style="width:5%; text-align:center;">'+ data.duration_str + '</td>';
str += '<td id="current_pf_count_'+data.idx+'" scope="col" style="width:5%; text-align:center;">'+ data.current_pf_count + '</td>';
str += '<td id="current_speed_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.current_speed + '</td>';
str += '<td id="download_time_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.download_time + '</td>';
str += '<td id="button_'+data.idx+'" scope="col" style="width:8%; text-align:center;">';
if (data.status_str == 'DOWNLOADING') {
str += j_button('stop_btn', '중지', {'idx':data.idx}, 'danger', false, false);
}
str += '</td>'
return str;
}
function make_item2(data) {
str = '';
str += '<td colspan="11">';
str += '<div id="detail_'+data.idx+'">';
str += get_detail(data);
str += '</div>';
str += '</td>';
return str
}
function get_detail(data) {
var str = j_row_info('URL', data.url);
str += j_row_info('임시경로', data.temp_fullpath);
str += j_row_info('저장경로', data.save_fullpath);
str += j_row_info('진행률(current/total)', data.percent+ '% (' + data.current_duration + ' / ' + data.duration + ')');
str += j_row_info('현재 비트레이트', data.current_bitrate);
str += j_row_info('종료시간', data.end_time);
str += j_row_info('허용 Packet Fail 수', data.max_pf_count);
str += j_row_info('파일 Exist', data.exist);
if (data.status_str == 'COMPLETED') {
str += j_row_info('파일 크기', data.filesize_str);
str += j_row_info('다운 속도', data.download_speed);
}
return str;
}
function button_html(data) {
//console.log(data)
str = '';
if (data.status_str == 'DOWNLOADING') {
str = j_button('stop_btn', '중지', {'idx':data.idx}, 'danger', false, false);
}
$("#button_" + data.idx).html(str);
}
function status_html(data) {
var progress = document.getElementById("progress_" + data.idx);
progress.style.width = data.percent+ '%';
progress.innerHTML = data.percent+ '%';
progress.style.visibility = 'visible';
document.getElementById("status_" + data.idx).innerHTML = data.status_kor;
document.getElementById("current_pf_count_" + data.idx).innerHTML = data.current_pf_count;
document.getElementById("current_speed_" + data.idx).innerHTML = data.current_speed;
document.getElementById("download_time_" + data.idx).innerHTML = data.download_time;
document.getElementById("detail_" + data.idx).innerHTML = get_detail(data);
}
</script>
{% endblock %}

View File

@@ -57,11 +57,7 @@
<form id="screen_movie_list_form">
<div id="screen_movie_list" class="container"></div>
</form>
<div class="text-center">
<div id="spinner" class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
<form id="program_auto_form">
<div id="episode_list"></div>
</form>
@@ -132,35 +128,44 @@
}
$.ajax({
url: url,
type: "POST",
data: data,
cache: false,
dataType: "json",
success: (ret) => {
current_screen_movie_data = ret
console.log('ret::>', ret)
if (current_screen_movie_data !== '') {
if (type === "ing") {
make_airing_list(ret.data, page)
observer.observe();
} else if (type === "fin") {
make_screen_movie_list(ret.data, page)
observer.observe();
} else if (type === "theater") {
make_screen_movie_list(ret.data, page)
observer.observe();
} else {
make_screen_movie_list(ret.data, page)
url: url,
type: "POST",
data: data,
cache: false,
dataType: "json",
success: (ret) => {
if (ret.ret === "error") {
$.notify("<strong>분석 실패</strong><br>" + ret.log, {
type: "warning",
});
return false;
}
div_visible = true
console.log(div_visible)
current_screen_movie_data = ret
console.log('ret::>', ret)
if (current_screen_movie_data !== '') {
if (type === "ing") {
make_airing_list(ret.data, page)
observer.observe();
} else if (type === "fin") {
make_screen_movie_list(ret.data, page)
observer.observe();
} else if (type === "theater") {
make_screen_movie_list(ret.data, page)
observer.observe();
} else {
make_screen_movie_list(ret.data, page)
}
div_visible = true
console.log(div_visible)
}
dismissLoadingScreen()
next_page = page + 1
}
dismissLoadingScreen()
next_page = page + 1
}
})
)
}
function make_airing_list(data, page) {

View File

@@ -1,131 +1,175 @@
{% extends "base.html" %}
{% block content %}
<div>
{{ macros.m_button_group([['reset_btn', '초기화'], ['delete_completed_btn', '완료 목록 삭제'], ['go_ffmpeg_btn', 'Go FFMPEG']])}}
{{ macros.m_row_start('0') }}
{{ macros.m_row_end() }}
{{ macros.m_hr_head_top() }}
{{ macros.m_row_start('0') }}
{{ macros.m_col(1, macros.m_strong('Idx')) }}
{{ macros.m_col(2, macros.m_strong('CreatedTime')) }}
{{ macros.m_col(4, macros.m_strong('Filename')) }}
{{ macros.m_col(3, macros.m_strong('Status')) }}
{{ macros.m_col(2, macros.m_strong('Action')) }}
{{ macros.m_row_end() }}
{{ macros.m_hr_head_bottom() }}
<div id="download_list_div"></div>
</div> <!--전체-->
<table id="result_table" class="table table-sm tableRowHover">
<thead class="thead-dark">
<tr>
<th style="width:5%; text-align:center;">IDX</th>
<th style="width:8%; text-align:center;">Plugin</th>
<th style="width:10%; text-align:center;">시작시간</th>
<th style="width:20%; text-align:center;">파일명</th>
<th style="width:8%; text-align:center;">상태</th>
<th style="width:15%; text-align:center;">진행률</th>
<th style="width:5%; text-align:center;">길이</th>
<th style="width:5%; text-align:center;">PF</th>
<th style="width:8%; text-align:center;">배속</th>
<th style="width:8%; text-align:center;">진행시간</th>
<th style="width:8%; text-align:center;">Action</th>
</tr>
</thead>
<tbody id="list"></tbody>
</table>
<script type="text/javascript">
var package_name = "{{arg['package_name'] }}";
var sub = "{{arg['sub'] }}";
var current_data = null;
socket = io.connect(window.location.protocol + "//" + document.domain + ":" + location.port + "/" + package_name + '/' + sub);
$(document).ready(function(){
});
var socket = io.connect(window.location.href);
socket.on('start', function(data){
on_start();
});
socket.on('list_refresh', function(data){
on_start()
});
socket.on('status', function(data){
console.log(data);
on_status(data)
});
function on_start() {
$.ajax({
url: '/' + package_name + '/ajax/' + sub + '/entity_list',
type: "POST",
cache: false,
data: {},
dataType: "json",
success: function (data) {
make_download_list(data)
}
socket.on('on_start', function(data){
document.getElementById("log").innerHTML += data.data;
document.getElementById("log").scrollTop = document.getElementById("log").scrollHeight;
document.getElementById("log").style.visibility = 'visible';
$('#loading').hide();
});
}
function on_status(data) {
//console.log(data)
tmp = document.getElementById("progress_"+data.entity_id)
if (tmp != null) {
document.getElementById("progress_"+data.entity_id).style.width = data.ffmpeg_percent+ '%';
document.getElementById("progress_"+data.entity_id+"_label").innerHTML = data.ffmpeg_status_kor + "(" + data.ffmpeg_percent + "%)" + ' ' + ((data.ffmpeg_arg != null)?data.ffmpeg_arg.data.current_speed:'')
}
}
function make_download_list(data) {
str = '';
for (i in data) {
str += m_row_start();
str += m_col(1, data[i].entity_id);
str += m_col(2, data[i].created_time);
str += m_col(4, (data[i].filename != null) ? data[i].filename : '');
label = data[i].ffmpeg_status_kor
if (data[i].ffmpeg_percent != 0) {
label += '(' + data[i].ffmpeg_percent + '%)'
socket.on('add', function(data){
str = make_item(data);
if (current_data == null || current_data.length == 0) {
current_data = Array();
$("#list").html(str);
} else {
$("#list").html($("#list").html() + str);
}
tmp = m_progress('progress_'+data[i].entity_id, data[i].ffmpeg_percent, label)
str += m_col(3, tmp);
tmp = m_button('program_cancel_btn', '취소', [{'key':'id', 'value':data[i].entity_id}]);
tmp = m_button_group(tmp)
str += m_col(2, tmp)
str += m_row_end();
if (i != data.length -1) str += m_hr(0);
}
document.getElementById("download_list_div").innerHTML = str;
}
current_data.push(data);
});
$("body").on('click', '#program_cancel_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'cancel', 'entity_id':entity_id}
queue_command(send_data)
});
socket.on('status_change', function(data) {
button_html(data);
});
$("body").on('click', '#reset_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'reset', 'entity_id':-1}
queue_command(send_data)
});
socket.on('status', function(data){
status_html(data);
});
$("body").on('click', '#delete_completed_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'delete_completed', 'entity_id':-1}
queue_command(send_data)
});
socket.on('last', function(data){
status_html(data);
button_html(data);
});
function queue_command(data) {
$.ajax({
url: '/' + package_name + '/ajax/' + sub + '/queue_command',
type: "POST",
cache: false,
data: data,
dataType: "json",
success: function (ret) {
if (ret.ret == 'notify') {
$.notify('<strong>'+ ret.log +'</strong>', {type: 'warning'});
globalSendCommand('list', null, null, null, function(data) {
current_data = data;
$("#list").html('');
console.log(data)
if (data.length == 0) {
str = "<tr><td colspan='10'><h4>작업이 없습니다.</h4><td><tr>";
} else {
str = ''
for(i in data) {
str += make_item(data[i]);
}
on_start();
}
$("#list").html(str);
});
}
$("body").on('click', '#go_ffmpeg_btn', function(e){
e.preventDefault();
$(location).attr('href', '/ffmpeg')
});
</script>
{% endblock %}
$("body").on('click', '#stop_btn', function(e){
e.stopPropagation();
e.preventDefault();
globalSendCommand('stop', $(this).data('idx'), null, null, function(ret){
refresh_item(ret.data);
});
});
function refresh_item(data) {
$('#tr1_'+data.idx).html(make_item1(data));
$('#collapse_'+data.idx).html(make_item2(data));
}
function make_item(data) {
str = '<tr id="tr1_'+data.idx+'" style="cursor: pointer;" data-toggle="collapse" data-target="#collapse_'+ data.idx + '" aria-expanded="true" >';
str += make_item1(data);
str += '</tr>';
str += '<tr class="collapse tableRowHoverOff" style="cursor: pointer;" id="collapse_' + data.idx + '">';
str += make_item2(data);
str += '</tr>';
return str;
}
function make_item1(data) {
//console.log(data);
str = '';
str += '<td scope="col" style="width:5%; text-align:center;">'+ data.idx + '</td>';
str += '<td scope="col" style="width:8%; text-align:center;">'+ data.callback_id + '</td>';
str += '<td scope="col" style="width:10%; text-align:center;">'+ data.start_time + '</td>';
str += '<td scope="col" style="width:20%; text-align:center;">'+ data.filename + '</td>';
str += '<td id="status_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.status_kor + '</td>';
var visi = 'hidden';
if (parseInt(data.percent) > 0) {
visi = 'visible';
}
str += '<td scope="col" style="width:20%; text-align:center;"><div class="progress"><div id="progress_'+data.idx+'" class="progress-bar" style="visibility: '+visi+'; width:'+data.percent+'%">'+data.percent +'%</div></div></td>';
str += '<td scope="col" style="width:5%; text-align:center;">'+ data.duration_str + '</td>';
str += '<td id="current_pf_count_'+data.idx+'" scope="col" style="width:5%; text-align:center;">'+ data.current_pf_count + '</td>';
str += '<td id="current_speed_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.current_speed + '</td>';
str += '<td id="download_time_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.download_time + '</td>';
str += '<td id="button_'+data.idx+'" scope="col" style="width:8%; text-align:center;">';
if (data.status_str == 'DOWNLOADING') {
str += j_button('stop_btn', '중지', {'idx':data.idx}, 'danger', false, false);
}
str += '</td>'
return str;
}
function make_item2(data) {
str = '';
str += '<td colspan="11">';
str += '<div id="detail_'+data.idx+'">';
str += get_detail(data);
str += '</div>';
str += '</td>';
return str
}
function get_detail(data) {
var str = j_row_info('URL', data.url);
str += j_row_info('임시경로', data.temp_fullpath);
str += j_row_info('저장경로', data.save_fullpath);
str += j_row_info('진행률(current/total)', data.percent+ '% (' + data.current_duration + ' / ' + data.duration + ')');
str += j_row_info('현재 비트레이트', data.current_bitrate);
str += j_row_info('종료시간', data.end_time);
str += j_row_info('허용 Packet Fail 수', data.max_pf_count);
str += j_row_info('파일 Exist', data.exist);
if (data.status_str == 'COMPLETED') {
str += j_row_info('파일 크기', data.filesize_str);
str += j_row_info('다운 속도', data.download_speed);
}
return str;
}
function button_html(data) {
//console.log(data)
str = '';
if (data.status_str == 'DOWNLOADING') {
str = j_button('stop_btn', '중지', {'idx':data.idx}, 'danger', false, false);
}
$("#button_" + data.idx).html(str);
}
function status_html(data) {
var progress = document.getElementById("progress_" + data.idx);
progress.style.width = data.percent+ '%';
progress.innerHTML = data.percent+ '%';
progress.style.visibility = 'visible';
document.getElementById("status_" + data.idx).innerHTML = data.status_kor;
document.getElementById("current_pf_count_" + data.idx).innerHTML = data.current_pf_count;
document.getElementById("current_speed_" + data.idx).innerHTML = data.current_speed;
document.getElementById("download_time_" + data.idx).innerHTML = data.download_time;
document.getElementById("detail_" + data.idx).innerHTML = get_detail(data);
}
</script>
{% endblock %}

View File

@@ -1,4 +1,5 @@
{% extends "base.html" %} {% block content %}
<div id="anime_downloader_wrapper">
<div id="preloader">
<div class='demo'>
<!-- <div class="loader-inner">-->
@@ -30,6 +31,7 @@
<div id="episode_list"></div>
</form>
</div>
</div>
<!--전체-->
<script src="{{ url_for('.static', filename='js/sjva_ui14.js') }}"></script>
@@ -171,6 +173,14 @@
tmp += m_button("add_queue_btn", "다운로드 추가", [
{key: "idx", value: i},
]);
tmp += j_button('insert_download_btn', '다운로드 추가', {
code: data.episode[i]._id,
});
tmp += j_button(
'force_insert_download_btn',
'다운로드 추가 (DB무시)',
{code: data.episode[i]._id}
);
// tmp += '<button id="play_video" name="play_video" class="btn btn-sm btn-outline-primary" data-idx="'+i+'">바로보기</button>';
tmp += "</div>";
str += m_col(12, tmp);
@@ -316,6 +326,20 @@
});
</script>
<style>
#anime_downloader_wrapper {
font-family: NanumSquareNeo, system-ui, -apple-system, Segoe UI, Roboto, Helvetica Neue, Noto Sans, Liberation Sans, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
}
body {
background-image: linear-gradient(90deg, #33242c, #263341, #17273a);
}
#anime_downloader_wrapper {
color: #d6eaf8;
}
button.code-button {
min-width: 82px !important;
}
@@ -413,6 +437,20 @@
opacity: 1;
}
.card {
border: none;
box-shadow: inset 1px 1px hsl(0deg 0% 100% / 20%), inset -1px -1px hsl(0deg 0% 100% / 10%), 1px 3px 24px -1px rgb(0 0 0 / 15%);
background-color: transparent;
background-image: linear-gradient(125deg, hsla(0, 0%, 100%, .3), hsla(0, 0%, 100%, .2) 70%);
backdrop-filter: blur(5px);
}
.card.border-light {
border-radius: 30px 10px;
--bs-border-opacity: 1;
border-color: rgba(var(--bs-light-rgb), var(--bs-border-opacity)) !important;
}
#airing_list {
display: none;
}
@@ -544,6 +582,23 @@
}
.circle {
width: 100%;
height: 100%;
position: absolute;
}
.circle .inner {
width: 100%;
height: 100%;
border-radius: 100%;
border: 5px solid rgba(0, 255, 170, 0.7);
border-right: none;
border-top: none;
backgroudn-clip: padding;
box-shadow: inset 0px 0px 10px rgba(0, 255, 170, 0.15);
}
.loader-inner {
bottom: 0;
height: 60px;

View File

@@ -1,66 +1,68 @@
{% extends "base.html" %} {% block content %}
<!--<div id="preloader"></div>-->
<div id="preloader" class="loader">
<div class="loader-inner">
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
<div class="loader-line-wrap">
<div class="loader-line"></div>
<div id="anime_downloader_wrapper">
<div id="preloader" class="loader">
<div class="loader-inner">
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
<div class="loader-line-wrap">
<div class="loader-line"></div>
</div>
</div>
</div>
</div>
<div id="yommi_wrapper">
<div class="input-group mb-2">
<input
id="input_search"
type="search"
class="form-control rounded"
placeholder="Search"
aria-label="Search"
aria-describedby="search-addon"
/>
<button id="btn_search" type="button" class="btn btn-primary">
search
</button>
<div id="yommi_wrapper">
<div class="input-group mb-2">
<input
id="input_search"
type="search"
class="form-control rounded"
placeholder="Search"
aria-label="Search"
aria-describedby="search-addon"
/>
<button id="btn_search" type="button" class="btn btn-primary">
search
</button>
</div>
<div
id="anime_category"
class="btn-group"
role="group"
aria-label="Linkkf Button"
>
<button id="ing" type="button" class="btn btn-success">방영중</button>
<button id="movie" type="button" class="btn btn-primary">극장판</button>
<button id="complete_anilist" type="button" class="btn btn-dark">완결</button>
<button id="top_view" type="button" class="btn btn-yellow">Top</button>
</div>
<form id="airing_list_form">
<div id="airing_list"></div>
</form>
<form id="screen_movie_list_form">
<div id="screen_movie_list" class="container"></div>
</form>
{# <div class="text-center">#}
{# <div id="spinner" class="spinner-border" role="status">#}
{# <span class="sr-only">Loading...</span>#}
{# </div>#}
{# </div>#}
<form id="program_auto_form">
<div id="episode_list"></div>
</form>
</div>
<div
id="anime_category"
class="btn-group"
role="group"
aria-label="Linkkf Button"
>
<button id="ing" type="button" class="btn btn-success">방영중</button>
<button id="movie" type="button" class="btn btn-primary">극장판</button>
<button id="complete_anilist" type="button" class="btn btn-dark">완결</button>
<button id="top_view" type="button" class="btn btn-yellow">Top</button>
</div>
<form id="airing_list_form">
<div id="airing_list"></div>
</form>
<form id="screen_movie_list_form">
<div id="screen_movie_list" class="container"></div>
</form>
{# <div class="text-center">#}
{# <div id="spinner" class="spinner-border" role="status">#}
{# <span class="sr-only">Loading...</span>#}
{# </div>#}
{# </div>#}
<form id="program_auto_form">
<div id="episode_list"></div>
</form>
</div>
<!--전체-->
@@ -467,7 +469,7 @@
case "ing":
console.log("ing.....")
{#spinner_loading.style.display = "block";#}
{#spinner_loading.style.display = "block";#}
current_cate = "ing";
get_anime_list(1, "ing");
break;
@@ -782,6 +784,20 @@
></script>
<style>
#anime_downloader_wrapper {
font-family: NanumSquareNeo, system-ui, -apple-system, Segoe UI, Roboto, Helvetica Neue, Noto Sans, Liberation Sans, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
}
body {
background-image: linear-gradient(90deg, #33242c, #263341, #17273a);
}
#anime_downloader_wrapper {
color: #d6eaf8;
}
button.code-button {
min-width: 82px !important;
}

View File

@@ -1,131 +1,175 @@
{% extends "base.html" %}
{% block content %}
<div>
{{ macros.m_button_group([['reset_btn', '초기화'], ['delete_completed_btn', '완료 목록 삭제'], ['go_ffmpeg_btn', 'Go FFMPEG']])}}
{{ macros.m_row_start('0') }}
{{ macros.m_row_end() }}
{{ macros.m_hr_head_top() }}
{{ macros.m_row_start('0') }}
{{ macros.m_col(1, macros.m_strong('Idx')) }}
{{ macros.m_col(2, macros.m_strong('CreatedTime')) }}
{{ macros.m_col(4, macros.m_strong('Filename')) }}
{{ macros.m_col(3, macros.m_strong('Status')) }}
{{ macros.m_col(2, macros.m_strong('Action')) }}
{{ macros.m_row_end() }}
{{ macros.m_hr_head_bottom() }}
<div id="download_list_div"></div>
</div> <!--전체-->
<table id="result_table" class="table table-sm tableRowHover">
<thead class="thead-dark">
<tr>
<th style="width:5%; text-align:center;">IDX</th>
<th style="width:8%; text-align:center;">Plugin</th>
<th style="width:10%; text-align:center;">시작시간</th>
<th style="width:20%; text-align:center;">파일명</th>
<th style="width:8%; text-align:center;">상태</th>
<th style="width:15%; text-align:center;">진행률</th>
<th style="width:5%; text-align:center;">길이</th>
<th style="width:5%; text-align:center;">PF</th>
<th style="width:8%; text-align:center;">배속</th>
<th style="width:8%; text-align:center;">진행시간</th>
<th style="width:8%; text-align:center;">Action</th>
</tr>
</thead>
<tbody id="list"></tbody>
</table>
<script type="text/javascript">
var package_name = "{{arg['package_name'] }}";
var sub = "{{arg['sub'] }}";
var current_data = null;
socket = io.connect(window.location.protocol + "//" + document.domain + ":" + location.port + "/" + package_name + '/' + sub);
$(document).ready(function(){
});
var socket = io.connect(window.location.href);
socket.on('start', function(data){
on_start();
});
socket.on('list_refresh', function(data){
on_start()
});
socket.on('status', function(data){
console.log(data);
on_status(data)
});
function on_start() {
$.ajax({
url: '/' + package_name + '/ajax/' + sub + '/entity_list',
type: "POST",
cache: false,
data: {},
dataType: "json",
success: function (data) {
make_download_list(data)
}
socket.on('on_start', function(data){
document.getElementById("log").innerHTML += data.data;
document.getElementById("log").scrollTop = document.getElementById("log").scrollHeight;
document.getElementById("log").style.visibility = 'visible';
$('#loading').hide();
});
}
function on_status(data) {
//console.log(data)
tmp = document.getElementById("progress_"+data.entity_id)
if (tmp != null) {
document.getElementById("progress_"+data.entity_id).style.width = data.ffmpeg_percent+ '%';
document.getElementById("progress_"+data.entity_id+"_label").innerHTML = data.ffmpeg_status_kor + "(" + data.ffmpeg_percent + "%)" + ' ' + ((data.ffmpeg_arg != null)?data.ffmpeg_arg.data.current_speed:'')
}
}
function make_download_list(data) {
str = '';
for (i in data) {
str += m_row_start();
str += m_col(1, data[i].entity_id);
str += m_col(2, data[i].created_time);
str += m_col(4, (data[i].filename != null) ? data[i].filename : '');
label = data[i].ffmpeg_status_kor
if (data[i].ffmpeg_percent != 0) {
label += '(' + data[i].ffmpeg_percent + '%)'
socket.on('add', function(data){
str = make_item(data);
if (current_data == null || current_data.length == 0) {
current_data = Array();
$("#list").html(str);
} else {
$("#list").html($("#list").html() + str);
}
tmp = m_progress('progress_'+data[i].entity_id, data[i].ffmpeg_percent, label)
str += m_col(3, tmp);
tmp = m_button('program_cancel_btn', '취소', [{'key':'id', 'value':data[i].entity_id}]);
tmp = m_button_group(tmp)
str += m_col(2, tmp)
str += m_row_end();
if (i != data.length -1) str += m_hr(0);
}
document.getElementById("download_list_div").innerHTML = str;
}
current_data.push(data);
});
$("body").on('click', '#program_cancel_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'cancel', 'entity_id':entity_id}
queue_command(send_data)
});
socket.on('status_change', function(data) {
button_html(data);
});
$("body").on('click', '#reset_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'reset', 'entity_id':-1}
queue_command(send_data)
});
socket.on('status', function(data){
status_html(data);
});
$("body").on('click', '#delete_completed_btn', function(e){
e.preventDefault();
entity_id = $(this).data('id')
send_data = {'command':'delete_completed', 'entity_id':-1}
queue_command(send_data)
});
socket.on('last', function(data){
status_html(data);
button_html(data);
});
function queue_command(data) {
$.ajax({
url: '/' + package_name + '/ajax/' + sub + '/queue_command',
type: "POST",
cache: false,
data: data,
dataType: "json",
success: function (ret) {
if (ret.ret == 'notify') {
$.notify('<strong>'+ ret.log +'</strong>', {type: 'warning'});
globalSendCommand('list', null, null, null, function(data) {
current_data = data;
$("#list").html('');
console.log(data)
if (data.length == 0) {
str = "<tr><td colspan='10'><h4>작업이 없습니다.</h4><td><tr>";
} else {
str = ''
for(i in data) {
str += make_item(data[i]);
}
on_start();
}
$("#list").html(str);
});
}
$("body").on('click', '#go_ffmpeg_btn', function(e){
e.preventDefault();
$(location).attr('href', '/ffmpeg')
});
</script>
{% endblock %}
$("body").on('click', '#stop_btn', function(e){
e.stopPropagation();
e.preventDefault();
globalSendCommand('stop', $(this).data('idx'), null, null, function(ret){
refresh_item(ret.data);
});
});
function refresh_item(data) {
$('#tr1_'+data.idx).html(make_item1(data));
$('#collapse_'+data.idx).html(make_item2(data));
}
function make_item(data) {
str = '<tr id="tr1_'+data.idx+'" style="cursor: pointer;" data-toggle="collapse" data-target="#collapse_'+ data.idx + '" aria-expanded="true" >';
str += make_item1(data);
str += '</tr>';
str += '<tr class="collapse tableRowHoverOff" style="cursor: pointer;" id="collapse_' + data.idx + '">';
str += make_item2(data);
str += '</tr>';
return str;
}
function make_item1(data) {
//console.log(data);
str = '';
str += '<td scope="col" style="width:5%; text-align:center;">'+ data.idx + '</td>';
str += '<td scope="col" style="width:8%; text-align:center;">'+ data.callback_id + '</td>';
str += '<td scope="col" style="width:10%; text-align:center;">'+ data.start_time + '</td>';
str += '<td scope="col" style="width:20%; text-align:center;">'+ data.filename + '</td>';
str += '<td id="status_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.status_kor + '</td>';
var visi = 'hidden';
if (parseInt(data.percent) > 0) {
visi = 'visible';
}
str += '<td scope="col" style="width:20%; text-align:center;"><div class="progress"><div id="progress_'+data.idx+'" class="progress-bar" style="visibility: '+visi+'; width:'+data.percent+'%">'+data.percent +'%</div></div></td>';
str += '<td scope="col" style="width:5%; text-align:center;">'+ data.duration_str + '</td>';
str += '<td id="current_pf_count_'+data.idx+'" scope="col" style="width:5%; text-align:center;">'+ data.current_pf_count + '</td>';
str += '<td id="current_speed_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.current_speed + '</td>';
str += '<td id="download_time_'+data.idx+'" scope="col" style="width:8%; text-align:center;">'+ data.download_time + '</td>';
str += '<td id="button_'+data.idx+'" scope="col" style="width:8%; text-align:center;">';
if (data.status_str == 'DOWNLOADING') {
str += j_button('stop_btn', '중지', {'idx':data.idx}, 'danger', false, false);
}
str += '</td>'
return str;
}
function make_item2(data) {
str = '';
str += '<td colspan="11">';
str += '<div id="detail_'+data.idx+'">';
str += get_detail(data);
str += '</div>';
str += '</td>';
return str
}
function get_detail(data) {
var str = j_row_info('URL', data.url);
str += j_row_info('임시경로', data.temp_fullpath);
str += j_row_info('저장경로', data.save_fullpath);
str += j_row_info('진행률(current/total)', data.percent+ '% (' + data.current_duration + ' / ' + data.duration + ')');
str += j_row_info('현재 비트레이트', data.current_bitrate);
str += j_row_info('종료시간', data.end_time);
str += j_row_info('허용 Packet Fail 수', data.max_pf_count);
str += j_row_info('파일 Exist', data.exist);
if (data.status_str == 'COMPLETED') {
str += j_row_info('파일 크기', data.filesize_str);
str += j_row_info('다운 속도', data.download_speed);
}
return str;
}
function button_html(data) {
//console.log(data)
str = '';
if (data.status_str == 'DOWNLOADING') {
str = j_button('stop_btn', '중지', {'idx':data.idx}, 'danger', false, false);
}
$("#button_" + data.idx).html(str);
}
function status_html(data) {
var progress = document.getElementById("progress_" + data.idx);
progress.style.width = data.percent+ '%';
progress.innerHTML = data.percent+ '%';
progress.style.visibility = 'visible';
document.getElementById("status_" + data.idx).innerHTML = data.status_kor;
document.getElementById("current_pf_count_" + data.idx).innerHTML = data.current_pf_count;
document.getElementById("current_speed_" + data.idx).innerHTML = data.current_speed;
document.getElementById("download_time_" + data.idx).innerHTML = data.download_time;
document.getElementById("detail_" + data.idx).innerHTML = get_detail(data);
}
</script>
{% endblock %}

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %} {% block content %}
<!--<div id="preloader"></div>-->
<div id="preloader" class="loader">
<div class="loader-inner">
<div class="loader-line-wrap">
@@ -53,11 +53,7 @@
<form id="screen_movie_list_form">
<div id="screen_movie_list" class="container"></div>
</form>
<div class="text-center">
<div id="spinner" class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
<form id="program_auto_form">
<div id="episode_list"></div>
</form>
@@ -139,24 +135,24 @@
cache: false,
dataType: "json",
success: (ret) => {
current_screen_movie_data = ret
let current_screen_movie_data = ret
console.log('ret::>', ret)
if (current_screen_movie_data !== '') {
if (type === "ing") {
make_airing_list(ret.data, page)
observer.observe();
{#observer.observe();#}
} else if (type === "fin") {
make_screen_movie_list(ret.data, page)
observer.observe();
{#observer.observe();#}
} else if (type === "theater") {
make_screen_movie_list(ret.data, page)
observer.observe();
{#observer.observe();#}
} else {
make_screen_movie_list(ret.data, page)
}
div_visible = true
console.log(div_visible)
{#div_visible = true#}
{#console.log(div_visible)#}
}
next_page = page + 1
}
@@ -341,7 +337,6 @@
// }
$("#input_search").keydown(function (key) {
if (key.keyCode === 13) {
// alert("엔터키를 눌렀습니다.");
$("#btn_search").trigger("click");
}
})