evan/deemixer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed downloading related issues

Browse Source 
- Fixed album cover download and saving
- Fixed download list initialization on reload
- Adjusted download object layout
This commit is contained in:
RemixDev 2020-04-14 12:58:31 +02:00
parent 5e7e53c30a
commit 8a3aaf9aba
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/css/style.css
View File

@ -265,7 +265,6 @@ div#download_tab{
#download_list > .download_object .download_info_status{ #download_list > .download_object .download_info_status{
margin-left: 8px; margin-left: 8px;
width: 80px; width: 80px;
text-align: right;
} }
#download_list.slim > .download_object .download_info img{ #download_list.slim > .download_object .download_info img{
display: none; display: none;
@ -277,7 +276,7 @@ div#download_tab{
display: inline-block; display: inline-block;
} }
#download_list.slim > .download_object .download_info_data{ #download_list.slim > .download_object .download_info_data{
width: calc(80% - 8px); width: calc(80% - 16px);
display: inline-block; display: inline-block;
padding-left: 0px; padding-left: 0px;
} }
@ -389,6 +388,10 @@ p, .tracks_table td.breakline{
display: flex; display: flex;
align-items:center; align-items:center;
} }
.secondary-text .material-icons{
font-size: 17px !important;
margin-left: 4px;
}
button{ button{
font-family : inherit; font-family : inherit;
font-weight: 600; font-weight: 600;

17
public/js/downloadList.js
View File

@ -2,6 +2,14 @@ var queueList = {}
var queue = [] var queue = []
socket.on("init_downloadQueue", function(data){ socket.on("init_downloadQueue", function(data){
if (data.currentItem){
addToQueue(data['queueList'][data.currentItem])
$('#bar_' + data.currentItem).removeClass('indeterminate').addClass('determinate')
$('#bar_' + data.currentItem).css('width', data['queueList'][data.currentItem].progress + '%')
if (queueList[data.currentItem].failed >= 1){
$("#download_"+data.currentItem+" .download_info_status").append(`<span class="secondary-text inline-flex"><span class="download_slim_separator">(</span><span class="queue_failed">${queueList[data.currentItem].failed}</span><i class="material-icons">error_outline</i><span class="download_slim_separator">)</span></span>`)
}
}
data['queue'].forEach(item=>{ data['queue'].forEach(item=>{
addToQueue(data['queueList'][item]) addToQueue(data['queueList'][item])
}) })
@ -19,7 +27,7 @@ function addToQueue(queueItem){
<span class="secondary-text">${queueItem.artist}</span> <span class="secondary-text">${queueItem.artist}</span>
</div> </div>
<div class="download_info_status"> <div class="download_info_status">
<span class="download_line"><span class="queue_downloaded">0</span>/${queueItem.size}</span> <span class="download_line"><span class="queue_downloaded">${queueItem.downloaded + queueItem.failed}</span>/${queueItem.size}</span>
</div> </div>
</div> </div>
<div class="download_bar"> <div class="download_bar">
@ -75,7 +83,7 @@ socket.on("finishDownload", function(uuid){
delete queueList[uuid] delete queueList[uuid]
} }
if (queue.length <= 0){ if (queue.length <= 0){
toast('All downloads completed!', 'all_done') toast('All downloads completed!', 'done_all')
} }
} }
}) })
@ -90,12 +98,13 @@ socket.on("updateQueue", function(update){
if (update.uuid && queue.indexOf(update.uuid) > -1){ if (update.uuid && queue.indexOf(update.uuid) > -1){
if (update.downloaded){ if (update.downloaded){
queueList[update.uuid].downloaded++ queueList[update.uuid].downloaded++
$("#download_"+update.uuid+" .queue_downloaded").text(queueList[update.uuid].downloaded) $("#download_"+update.uuid+" .queue_downloaded").text(queueList[update.uuid].downloaded + queueList[update.uuid].failed)
} }
if (update.failed){ if (update.failed){
queueList[update.uuid].failed++ queueList[update.uuid].failed++
$("#download_"+update.uuid+" .queue_downloaded").text(queueList[update.uuid].downloaded + queueList[update.uuid].failed)
if (queueList[update.uuid].failed == 1){ if (queueList[update.uuid].failed == 1){
$("#download_"+update.uuid+" .download_info_status").append(`<span class="secondary-text"><span class="download_slim_separator">(</span><span class="queue_failed">1</span> <i class="material-icons">error_outline</i><span class="download_slim_separator">)</span></span>`) $("#download_"+update.uuid+" .download_info_status").append(`<span class="secondary-text inline-flex"><span class="download_slim_separator">(</span><span class="queue_failed">1</span> <i class="material-icons">error_outline</i><span class="download_slim_separator">)</span></span>`)
}else{ }else{
$("#download_"+update.uuid+" .queue_failed").text(queueList[update.uuid].failed) $("#download_"+update.uuid+" .queue_failed").text(queueList[update.uuid].failed)
} }