Compare commits
2 Commits
fcd81f03b3
...
1be10b310d
Author | SHA1 | Date | |
---|---|---|---|
1be10b310d | |||
a0469f3145 |
@ -82,10 +82,13 @@ public abstract class Connector
|
|||||||
Convert.ToInt32(aCh.volumeNumber) >= start &&
|
Convert.ToInt32(aCh.volumeNumber) >= start &&
|
||||||
Convert.ToInt32(aCh.volumeNumber) <= end).ToArray();
|
Convert.ToInt32(aCh.volumeNumber) <= end).ToArray();
|
||||||
}
|
}
|
||||||
else if(singleResultRegex.IsMatch(volume))
|
else if (singleResultRegex.IsMatch(volume))
|
||||||
|
{
|
||||||
|
string volumeNumber = singleResultRegex.Match(volume).Value;
|
||||||
return availableChapters.Where(aCh =>
|
return availableChapters.Where(aCh =>
|
||||||
aCh.volumeNumber is not null &&
|
aCh.volumeNumber is not null &&
|
||||||
aCh.volumeNumber.Equals(volume, StringComparison.InvariantCultureIgnoreCase)).ToArray();
|
aCh.volumeNumber.Equals(volumeNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (chapterRegex.IsMatch(searchTerm))
|
else if (chapterRegex.IsMatch(searchTerm))
|
||||||
@ -100,10 +103,13 @@ public abstract class Connector
|
|||||||
Convert.ToInt32(aCh.chapterNumber) >= start &&
|
Convert.ToInt32(aCh.chapterNumber) >= start &&
|
||||||
Convert.ToInt32(aCh.chapterNumber) <= end).ToArray();
|
Convert.ToInt32(aCh.chapterNumber) <= end).ToArray();
|
||||||
}
|
}
|
||||||
else if(singleResultRegex.IsMatch(chapter))
|
else if (singleResultRegex.IsMatch(chapter))
|
||||||
|
{
|
||||||
|
string chapterNumber = singleResultRegex.Match(chapter).Value;
|
||||||
return availableChapters.Where(aCh =>
|
return availableChapters.Where(aCh =>
|
||||||
aCh.chapterNumber is not null &&
|
aCh.chapterNumber is not null &&
|
||||||
aCh.chapterNumber.Equals(chapter, StringComparison.InvariantCultureIgnoreCase)).ToArray();
|
aCh.chapterNumber.Equals(chapterNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -207,7 +207,10 @@ public class TaskManager
|
|||||||
logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
|
logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
|
||||||
_allTasks.Remove(removeTask);
|
_allTasks.Remove(removeTask);
|
||||||
if (removeTask.GetType() == typeof(DownloadChapterTask))
|
if (removeTask.GetType() == typeof(DownloadChapterTask))
|
||||||
|
{
|
||||||
|
_runningDownloadChapterTasks[(DownloadChapterTask)removeTask].Cancel();
|
||||||
_runningDownloadChapterTasks.Remove((DownloadChapterTask)removeTask);
|
_runningDownloadChapterTasks.Remove((DownloadChapterTask)removeTask);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public TrangaTask? AddTask(TrangaTask.Task taskType, string? connectorName, string? internalId,
|
public TrangaTask? AddTask(TrangaTask.Task taskType, string? connectorName, string? internalId,
|
||||||
@ -263,11 +266,12 @@ public class TaskManager
|
|||||||
_allTasks.RemoveWhere(mTask =>
|
_allTasks.RemoveWhere(mTask =>
|
||||||
mTask.GetType() == typeof(DownloadNewChaptersTask) &&
|
mTask.GetType() == typeof(DownloadNewChaptersTask) &&
|
||||||
((DownloadNewChaptersTask)mTask).publication.internalId == publicationId &&
|
((DownloadNewChaptersTask)mTask).publication.internalId == publicationId &&
|
||||||
((DownloadNewChaptersTask)mTask).connectorName == connectorName!);
|
((DownloadNewChaptersTask)mTask).connectorName == connectorName);
|
||||||
_allTasks.RemoveWhere(mTask =>
|
foreach(TrangaTask rTask in _allTasks.Where(mTask =>
|
||||||
mTask.GetType() == typeof(DownloadChapterTask) &&
|
mTask.GetType() == typeof(DownloadChapterTask) &&
|
||||||
((DownloadChapterTask)mTask).publication.internalId == publicationId &&
|
((DownloadChapterTask)mTask).publication.internalId == publicationId &&
|
||||||
((DownloadChapterTask)mTask).connectorName == connectorName!);
|
((DownloadChapterTask)mTask).connectorName == connectorName))
|
||||||
|
DeleteTask(rTask);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user