glax/Tranga-Website
1
0
Fork 0
Code Issues Pull Requests Releases Activity

TaskManager AddTask make better use of GetTasksMatching and GetTasksMatching easier usage

Browse Source
This commit is contained in:
glax 2023-06-27 22:59:23 +02:00
parent b88890817e
commit cbdd305b69
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Tranga/TaskManager.cs
View File

@ -123,32 +123,27 @@ public class TaskManager
public void AddTask(TrangaTask newTask) public void AddTask(TrangaTask newTask)
{ {
logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
switch (newTask.task) switch (newTask.task)
{ {
case TrangaTask.Task.UpdateLibraries: case TrangaTask.Task.UpdateLibraries:
//Only one UpdateKomgaLibrary Task //Only one UpdateKomgaLibrary Task
logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task."); logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task.");
_allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries); if (GetTasksMatching(newTask).FirstOrDefault() is { } exists)
_allTasks.Remove(exists);
_allTasks.Add(newTask); _allTasks.Add(newTask);
ExportDataAndSettings();
break; break;
case TrangaTask.Task.MonitorPublication: default:
MonitorPublicationTask mpt = (MonitorPublicationTask)newTask; if (!GetTasksMatching(newTask).Any())
if(!GetTasksMatching(mpt.task, mpt.connectorName, internalId:mpt.publication.internalId).Any()) {
_allTasks.Add(newTask); logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
else
logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
break;
case TrangaTask.Task.DownloadChapter:
DownloadChapterTask dct = (DownloadChapterTask)newTask;
if(!GetTasksMatching(dct.task, dct.connectorName, internalId:dct.publication.internalId, chapterSortNumber:dct.chapter.sortNumber).Any())
_allTasks.Add(newTask); _allTasks.Add(newTask);
ExportDataAndSettings();
}
else else
logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}"); logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
break; break;
} }
ExportDataAndSettings();
} }
public void DeleteTask(TrangaTask removeTask) public void DeleteTask(TrangaTask removeTask)
@ -166,6 +161,24 @@ public class TaskManager
DeleteTask(childTask); DeleteTask(childTask);
} }
public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask mTask)
{
switch (mTask.task)
{
case TrangaTask.Task.UpdateLibraries:
return GetTasksMatching(TrangaTask.Task.UpdateLibraries);
case TrangaTask.Task.DownloadChapter:
DownloadChapterTask dct = (DownloadChapterTask)mTask;
return GetTasksMatching(TrangaTask.Task.DownloadChapter, connectorName: dct.connectorName,
internalId: dct.publication.internalId);
case TrangaTask.Task.MonitorPublication:
MonitorPublicationTask mpt = (MonitorPublicationTask)mTask;
return GetTasksMatching(TrangaTask.Task.MonitorPublication, connectorName: mpt.connectorName,
internalId: mpt.publication.internalId);
}
return Array.Empty<TrangaTask>();
}
public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterSortNumber = null) public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterSortNumber = null)
{ {
switch (taskType) switch (taskType)