Compare commits

..

No commits in common. "c9537a996371217c675d1ae374e9b7853f1d4164" and "a1e9dd02327eccbf5888c1a3ae086c5991a46e78" have entirely different histories.

2 changed files with 15 additions and 19 deletions

View File

@ -141,12 +141,15 @@ public class TaskManager
TrangaTask newTask; TrangaTask newTask;
if (task == TrangaTask.Task.UpdateKomgaLibrary) if (task == TrangaTask.Task.UpdateKomgaLibrary)
{ {
newTask = new TrangaTask(task, null, null, reoccurrence); newTask = new TrangaTask(task, null, null, reoccurrence, language);
logger?.WriteLine(this.GetType().ToString(), $"Removing old {task}-Task.");
//Only one UpdateKomgaLibrary Task //Check if same task already exists
_allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateKomgaLibrary); // ReSharper disable once SimplifyLinqExpressionUseAll readabilty
if (!_allTasks.Any(trangaTask => trangaTask.task == task))
{
_allTasks.Add(newTask); _allTasks.Add(newTask);
} }
}
else else
{ {
if(connectorName is null) if(connectorName is null)

View File

@ -227,7 +227,6 @@ function GetSettingsClick(){
}); });
GetKomgaTask().then(json => { GetKomgaTask().then(json => {
settingKomgaTime.value = json[0].reoccurrence;
if(json.length > 0) if(json.length > 0)
settingKomgaConfigured.innerText = "✅"; settingKomgaConfigured.innerText = "✅";
else else
@ -236,17 +235,11 @@ function GetSettingsClick(){
} }
function UpdateKomgaSettings(){ function UpdateKomgaSettings(){
if(settingKomgaUser.value != "" && settingKomgaPass != ""){
var auth = utf8_to_b64(`${settingKomgaUser.value}:${settingKomgaPass.value}`); var auth = utf8_to_b64(`${settingKomgaUser.value}:${settingKomgaPass.value}`);
console.log(auth); console.log(auth);
if(settingKomgaUrl.value != "")
UpdateSettings("", settingKomgaUrl.value, auth); UpdateSettings("", settingKomgaUrl.value, auth);
else
UpdateSettings("", settingKomgaUrl.placeholder, auth);
}
CreateTask("UpdateKomgaLibrary", settingKomgaTime.value, "","",""); CreateTask("UpdateKomgaLibrary", settingKomgaTime.value, "","","");
setTimeout(() => GetSettingsClick(), 100); setTimeout(() => GetSettingsClick(), 500);
} }
function utf8_to_b64( str ) { function utf8_to_b64( str ) {
@ -265,7 +258,7 @@ function ShowRunningTasks(event){
}); });
if(json.length > 0){ if(json.length > 0){
tagTaskPopup.style.display = "block"; tagTaskPopup.style.display = "block";
tagTaskPopup.style.left = `${tagTasksRunning.offsetLeft - 20}px`; tagTaskPopup.style.left = `${event.client - 20}px`;
} }
}); });
@ -282,7 +275,7 @@ function ShowQueuedTasks(event){
}); });
if(json.length > 0){ if(json.length > 0){
tagTaskPopup.style.display = "block"; tagTaskPopup.style.display = "block";
tagTaskPopup.style.left = `${tagTasksQueued.offsetLeft- 20}px`; tagTaskPopup.style.left = `${event.clientX - 20}px`;
} }
}); });
} }
@ -298,7 +291,7 @@ function ShowAllTasks(event){
}); });
if(json.length > 0){ if(json.length > 0){
tagTaskPopup.style.display = "block"; tagTaskPopup.style.display = "block";
tagTaskPopup.style.left = `${tagTasksTotal.offsetLeft - 20}px`; tagTaskPopup.style.left = `${event.clientX - 20}px`;
} }
}); });
} }