Fix taskIds being changed during requests, no workaround this time

This commit is contained in:
2023-06-25 23:56:00 +02:00
parent 0a51e7ad3d
commit 4f01c1166f
3 changed files with 13 additions and 10 deletions

View File

@ -180,7 +180,7 @@ public class TaskManager
{
return _allTasks.Where(mTask =>
mTask is MonitorPublicationTask mpt && mpt.connectorName == connectorName &&
string.Concat(TrangaSettings.CleanIdRex.Matches(mpt.publication.internalId)) == string.Concat(TrangaSettings.CleanIdRex.Matches(internalId)));
mpt.publication.internalId == internalId);
}
else
return _allTasks.Where(tTask =>
@ -200,7 +200,7 @@ public class TaskManager
{
return _allTasks.Where(mTask =>
mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
string.Concat(TrangaSettings.CleanIdRex.Matches(dct.publication.internalId)) == string.Concat(TrangaSettings.CleanIdRex.Matches(internalId)) &&
dct.publication.internalId == internalId &&
dct.chapter.sortNumber == chapterSortNumber);
}
else

View File

@ -16,7 +16,6 @@ public class TrangaSettings
[JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
public HashSet<LibraryManager> libraryManagers { get; }
public HashSet<NotificationManager> notificationManagers { get; }
[JsonIgnore] public static Regex CleanIdRex = new (@"([a-zA-Z0-9]*-*_*)*");
public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager>? libraryManagers,
HashSet<NotificationManager>? notificationManagers)