glax/Tranga
2
0
Fork 0
Code Issues Pull Requests Releases 25 Activity

Compare commits

base: glax:1be10b310dad1ae1de9bf3a6e212c1448fda69f8
Branches Tags
glax:master
glax:Server-V2
glax:asuratoon
glax:cuttingedge
glax:cuttingedge-merge-ServerV2
glax:dev
glax:1.5
glax:1.4.2
glax:1.4.1
glax:1.4
glax:v1.3
glax:v1.2
glax:1.1.1
glax:1.1
glax:1.0
glax:0.7
glax:0.6.2
glax:0.6.1
glax:0.6
glax:0.5.1
glax:0.5
glax:0.4.1
glax:0.4
glax:0.3.3
glax:0.3.2
glax:0.3.1
glax:0.3
glax:0.2.2
glax:0.2.1
glax:v0.2
glax:v0.1
..
compare: glax:fcd81f03b3bff1549173aa0300929806d55a1d5f
Branches Tags
glax:master
glax:Server-V2
glax:asuratoon
glax:cuttingedge
glax:cuttingedge-merge-ServerV2
glax:dev
glax:1.5
glax:1.4.2
glax:1.4.1
glax:1.4
glax:v1.3
glax:v1.2
glax:1.1.1
glax:1.1
glax:1.0
glax:0.7
glax:0.6.2
glax:0.6.1
glax:0.6
glax:0.5.1
glax:0.5
glax:0.4.1
glax:0.4
glax:0.3.3
glax:0.3.2
glax:0.3.1
glax:0.3
glax:0.2.2
glax:0.2.1
glax:v0.2
glax:v0.1

No commits in common. "1be10b310dad1ae1de9bf3a6e212c1448fda69f8" and "fcd81f03b3bff1549173aa0300929806d55a1d5f" have entirely different histories.
1be10b310d ... fcd81f03b3

2 changed files with 9 additions and 19 deletions
Show Stats Expand all files Collapse all files

14
Tranga/Connector.cs
View File

@ -82,13 +82,10 @@ 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(volumeNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray(); aCh.volumeNumber.Equals(volume, StringComparison.InvariantCultureIgnoreCase)).ToArray();
}
} }
else if (chapterRegex.IsMatch(searchTerm)) else if (chapterRegex.IsMatch(searchTerm))
@ -103,13 +100,10 @@ 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(chapterNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray(); aCh.chapterNumber.Equals(chapter, StringComparison.InvariantCultureIgnoreCase)).ToArray();
}
} }
else else
{ {

14
Tranga/TaskManager.cs
View File

@ -207,10 +207,7 @@ 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,
@ -266,12 +263,11 @@ 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!);
foreach(TrangaTask rTask in _allTasks.Where(mTask => _allTasks.RemoveWhere(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;
} }