Compare commits
No commits in common. "358c9b511a22c5d8fca34afaec26f3af01a48d34" and "88c109adee63a245742b4bc566a612cd5bc120e9" have entirely different histories.
358c9b511a
...
88c109adee
@ -51,11 +51,6 @@ function DeleteData(uri){
|
||||
});
|
||||
}
|
||||
|
||||
async function Ping(){
|
||||
let ret = await GetData(`${apiUri}/Ping`);
|
||||
return ret;
|
||||
}
|
||||
|
||||
async function GetAvailableControllers(){
|
||||
var uri = apiUri + "/Connectors";
|
||||
let json = await GetData(uri);
|
||||
|
@ -20,11 +20,6 @@
|
||||
<img id="settingscog" src="media/settings-cogwheel.svg" height="100%" alt="settingscog">
|
||||
</topbar>
|
||||
<viewport>
|
||||
<div id="loaderdiv">
|
||||
<blur-background></blur-background>
|
||||
<div id="loader"></div>
|
||||
<p id="loaderText">Check your Settings > API-URI</p>
|
||||
</div>
|
||||
<content>
|
||||
<div id="addPublication">
|
||||
<p>+</p>
|
||||
@ -114,18 +109,6 @@
|
||||
</publication-information>
|
||||
</publication-viewer>
|
||||
</popup>
|
||||
|
||||
<popup id="jobStatusView">
|
||||
<blur-background id="blurBackgroundJobStatus" onclick="jobStatusView.style.display= 'none';"></blur-background>
|
||||
<popup-window>
|
||||
<div>
|
||||
<div id="jobStatusRunning" style="border-right: 1px solid gray;"></div>
|
||||
</div>
|
||||
<div>
|
||||
<div id="jobStatusWaiting" style="border-left: 1px solid gray;"></div>
|
||||
</div>
|
||||
</popup-window>
|
||||
</popup>
|
||||
</viewport>
|
||||
|
||||
<footer>
|
||||
|
@ -1,5 +1,4 @@
|
||||
let runningJobs = [];
|
||||
let waitingJobs = [];
|
||||
let jobs = [];
|
||||
let notificationConnectorTypes = [];
|
||||
let libraryConnectorTypes = [];
|
||||
let selectedManga;
|
||||
@ -42,40 +41,28 @@ const newMangaTitle = document.querySelector("#newMangaTitle");
|
||||
const newMangaResult = document.querySelector("#newMangaResult");
|
||||
const jobsRunningTag = document.querySelector("#jobsRunningTag");
|
||||
const jobsQueuedTag = document.querySelector("#jobsQueuedTag");
|
||||
const loaderdiv = document.querySelector('#loaderdiv');
|
||||
const jobStatusView = document.querySelector("#jobStatusView");
|
||||
const jobStatusRunning = document.querySelector("#jobStatusRunning");
|
||||
const jobStatusWaiting = document.querySelector("#jobStatusWaiting");
|
||||
|
||||
function Setup(){
|
||||
Ping().then((ret) => {
|
||||
loaderdiv.style.display = 'none';
|
||||
|
||||
GetAvailableNotificationConnectors().then((json) => {
|
||||
json.forEach(connector => {
|
||||
notificationConnectorTypes[connector.Key] = connector.Value;
|
||||
});
|
||||
GetAvailableNotificationConnectors().then((json) => {
|
||||
json.forEach(connector => {
|
||||
notificationConnectorTypes[connector.Key] = connector.Value;
|
||||
});
|
||||
});
|
||||
|
||||
GetAvailableLibraryConnectors().then((json) => {
|
||||
json.forEach(connector => {
|
||||
libraryConnectorTypes[connector.Key] = connector.Value;
|
||||
});
|
||||
GetAvailableLibraryConnectors().then((json) => {
|
||||
json.forEach(connector => {
|
||||
libraryConnectorTypes[connector.Key] = connector.Value;
|
||||
});
|
||||
|
||||
GetAvailableControllers().then((json) => {
|
||||
json.forEach(connector => {
|
||||
var option = document.createElement('option');
|
||||
option.value = connector;
|
||||
option.innerText = connector;
|
||||
newMangaConnector.appendChild(option);
|
||||
});
|
||||
});
|
||||
|
||||
GetAvailableControllers().then((json) => {
|
||||
json.forEach(connector => {
|
||||
var option = document.createElement('option');
|
||||
option.value = connector;
|
||||
option.innerText = connector;
|
||||
newMangaConnector.appendChild(option);
|
||||
});
|
||||
|
||||
UpdateJobs();
|
||||
setInterval(() => {
|
||||
UpdateJobs();
|
||||
}, 1000);
|
||||
});
|
||||
}
|
||||
Setup();
|
||||
@ -128,7 +115,7 @@ function GetNewMangaItems(){
|
||||
//Returns a new "Publication" Item to display in the jobs section
|
||||
function CreateManga(manga, connector){
|
||||
var mangaElement = document.createElement('publication');
|
||||
mangaElement.id = GetValidSelector(manga.internalId);
|
||||
mangaElement.setAttribute("id", manga.internalId);
|
||||
var mangaImage = document.createElement('img');
|
||||
mangaImage.src = GetCoverUrl(manga.internalId);
|
||||
mangaElement.appendChild(mangaImage);
|
||||
@ -344,13 +331,17 @@ function UpdateSettings(){
|
||||
}
|
||||
|
||||
OpenSettings();
|
||||
Setup();
|
||||
}
|
||||
|
||||
function utf8_to_b64(str) {
|
||||
return window.btoa(unescape(encodeURIComponent( str )));
|
||||
}
|
||||
|
||||
|
||||
UpdateJobs();
|
||||
setInterval(() => {
|
||||
UpdateJobs();
|
||||
}, 1000);
|
||||
function UpdateJobs(){
|
||||
GetMonitorJobs().then((json) => {
|
||||
ResetContent();
|
||||
@ -363,120 +354,16 @@ function UpdateJobs(){
|
||||
tasksContent.appendChild(mangaView);
|
||||
});
|
||||
});
|
||||
|
||||
GetWaitingJobs().then((json) => {
|
||||
jobsQueuedTag.innerText = json.length;
|
||||
|
||||
var nowWaitingJobs = [];
|
||||
|
||||
json.forEach(job => {
|
||||
if(!waitingJobs.includes(GetValidSelector(job.id))){
|
||||
var jobDom = createJob(job);
|
||||
jobStatusWaiting.appendChild(jobDom);
|
||||
}
|
||||
nowWaitingJobs.push(GetValidSelector(job.id));
|
||||
});
|
||||
waitingJobs = nowWaitingJobs;
|
||||
});
|
||||
|
||||
jobStatusWaiting.childNodes.forEach(child => {
|
||||
if(!waitingJobs.includes(child.id))
|
||||
jobStatusWaiting.removeChild(child);
|
||||
});
|
||||
|
||||
GetRunningJobs().then((json) => {
|
||||
console.log("Running");
|
||||
console.log(json);
|
||||
jobsRunningTag.innerText = json.length;
|
||||
|
||||
var nowRunningJobs = [];
|
||||
|
||||
json.forEach(job => {
|
||||
if(!runningJobs.includes(GetValidSelector(job.id))){
|
||||
var jobDom = createJob(job);
|
||||
jobStatusRunning.appendChild(jobDom);
|
||||
}
|
||||
nowRunningJobs.push(GetValidSelector(job.id));
|
||||
UpdateJobProgress(job.id);
|
||||
});
|
||||
|
||||
runningJobs = nowRunningJobs;
|
||||
});
|
||||
|
||||
jobStatusRunning.childNodes.forEach(child => {
|
||||
if(!runningJobs.includes(child.id))
|
||||
jobStatusRunning.removeChild(child);
|
||||
GetWaitingJobs().then((json) => {
|
||||
console.log("Waiting");
|
||||
console.log(json);
|
||||
jobsQueuedTag.innerText = json.length;
|
||||
});
|
||||
}
|
||||
|
||||
function createJob(jobjson){
|
||||
var manga;
|
||||
if(jobjson.chapter != null)
|
||||
manga = jobjson.chapter.parentManga;
|
||||
else if(jobjson.manga != null)
|
||||
manga = jobjson.manga;
|
||||
else return null;
|
||||
|
||||
|
||||
var wrapper = document.createElement("div");
|
||||
wrapper.className = "jobWrapper";
|
||||
wrapper.id = GetValidSelector(jobjson.id);
|
||||
|
||||
var image = document.createElement("img");
|
||||
image.className = "jobImage";
|
||||
image.src = GetCoverUrl(manga.internalId);
|
||||
wrapper.appendChild(image);
|
||||
|
||||
var title = document.createElement("span");
|
||||
title.className = "jobTitle";
|
||||
if(jobjson.chapter != null)
|
||||
title.innerText = `${manga.sortName} - ${jobjson.chapter.fileName}`;
|
||||
else if(jobjson.manga != null)
|
||||
title.innerText = manga.sortName;
|
||||
wrapper.appendChild(title);
|
||||
|
||||
var progressBar = document.createElement("progress");
|
||||
progressBar.className = "jobProgressBar";
|
||||
progressBar.id = `jobProgressBar${GetValidSelector(jobjson.id)}`;
|
||||
wrapper.appendChild(progressBar);
|
||||
|
||||
var progressSpan = document.createElement("span");
|
||||
progressSpan.className = "jobProgressSpan";
|
||||
progressSpan.id = `jobProgressSpan${GetValidSelector(jobjson.id)}`;
|
||||
progressSpan.innerText = "0% 00:00:00";
|
||||
wrapper.appendChild(progressSpan);
|
||||
|
||||
var cancelSpan = document.createElement("span");
|
||||
cancelSpan.className = "jobCancel";
|
||||
cancelSpan.innerText = "Cancel";
|
||||
cancelSpan.addEventListener("click", () => CancelJob(jobjson.id));
|
||||
wrapper.appendChild(cancelSpan);
|
||||
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
function ShowJobQueue(){
|
||||
jobStatusView.style.display = "initial";
|
||||
}
|
||||
|
||||
function UpdateJobProgress(jobId){
|
||||
GetProgress(jobId).then((json) => {
|
||||
var progressBar = document.querySelector(`#jobProgressBar${GetValidSelector(jobId)}`);
|
||||
var progressSpan = document.querySelector(`#jobProgressSpan${GetValidSelector(jobId)}`);
|
||||
if(progressBar != null && json.progress != 0){
|
||||
progressBar.value = json.progress;
|
||||
}
|
||||
if(progressSpan != null){
|
||||
var percentageStr = "0%";
|
||||
var timeleftStr = "00:00:00";
|
||||
if(json.progress != 0){
|
||||
percentageStr = Intl.NumberFormat("en-US", { style: "percent"}).format(json.progress);
|
||||
timeleftStr = json.timeRemaining.split('.')[0];
|
||||
}
|
||||
progressSpan.innerText = `${percentageStr} ${timeleftStr}`;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function GetValidSelector(str){
|
||||
var clean = [...str.matchAll(/[a-zA-Z0-9]*-*_*/g)];
|
||||
return clean.join('');
|
||||
}
|
@ -148,7 +148,7 @@ content {
|
||||
}
|
||||
|
||||
#settingsPopup{
|
||||
z-index: 300;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
#settingsPopup popup-content{
|
||||
@ -507,123 +507,4 @@ footer-tag-popup::before{
|
||||
left: 0;
|
||||
bottom: -17px;
|
||||
border-radius: 0 0 0 5px;
|
||||
}
|
||||
|
||||
#loaderdiv {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 200;
|
||||
}
|
||||
|
||||
#loader {
|
||||
border: 16px solid transparent;
|
||||
border-top: 16px solid var(--secondary-color);
|
||||
border-bottom: 16px solid var(--primary-color);
|
||||
border-radius: 50%;
|
||||
width: 120px;
|
||||
height: 120px;
|
||||
animation: spin 2s linear infinite;
|
||||
position: absolute;
|
||||
left: calc(50% - 60px);
|
||||
top: calc(50% - 120px);
|
||||
z-index: 201;
|
||||
}
|
||||
|
||||
#loaderText {
|
||||
position: relative;
|
||||
margin: 0 auto;
|
||||
top: calc(50% + 80px);
|
||||
z-index: 201;
|
||||
text-align: center;
|
||||
color: var(--second-background-color);
|
||||
font-size: 20pt;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
#jobStatusView {
|
||||
z-index: 50;
|
||||
}
|
||||
|
||||
#jobStatusView > popup-window {
|
||||
top: 80px;
|
||||
width: 50%;
|
||||
max-height: calc(100% - 140px);
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: nowrap;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#jobStatusView > popup-window > div {
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
width: 50%;
|
||||
margin: 0;
|
||||
max-height: 100%;
|
||||
}
|
||||
|
||||
#jobStatusView > popup-window > div > div {
|
||||
overflow-x: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-wrap: nowrap;
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.jobWrapper {
|
||||
width: 90%;
|
||||
margin: 2px 5%;
|
||||
height: 100px;
|
||||
position: relative;
|
||||
flex-shrink: 0;
|
||||
background-color: rgba(187,187,187,0.4);
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.jobWrapper > .jobImage {
|
||||
height: 90%;
|
||||
width: 20%;
|
||||
left: 5px;
|
||||
object-fit: contain;
|
||||
position: absolute;
|
||||
top: 5%;
|
||||
}
|
||||
|
||||
.jobWrapper > .jobTitle {
|
||||
position: absolute;
|
||||
left: calc(20% + 10px);
|
||||
top: 5px;
|
||||
}
|
||||
|
||||
.jobWrapper > .jobProgressBar {
|
||||
position: absolute;
|
||||
left: calc(20% + 10px);
|
||||
bottom: calc(12pt + 10px);
|
||||
width: calc(80% - 20px);
|
||||
height: 10px;
|
||||
}
|
||||
|
||||
.jobWrapper > .jobProgressSpan {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
bottom: calc(12pt + 20px);
|
||||
width: 60%;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.jobWrapper > .jobCancel {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
bottom: 5px;
|
||||
font-size: 12pt;
|
||||
color: var(--secondary-color);
|
||||
cursor: pointer;
|
||||
}
|
Loading…
Reference in New Issue
Block a user