diff --git a/API/Controllers/ReaderController.cs b/API/Controllers/ReaderController.cs index 5a9022c0b..a18851f34 100644 --- a/API/Controllers/ReaderController.cs +++ b/API/Controllers/ReaderController.cs @@ -244,7 +244,7 @@ namespace API.Controllers } /// - /// Returns the next logical volume from the series. + /// Returns the next logical chapter from the series. /// /// /// @@ -254,7 +254,6 @@ namespace API.Controllers public async Task> GetNextChapter(int seriesId, int volumeId, int currentChapterId) { var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); - //if (user == null) return // TODO: Need to have GetUSerByUsernameAsync checks to throw not authorized (401) if it is null all throughout code var volumes = await _unitOfWork.SeriesRepository.GetVolumesDtoAsync(seriesId, user.Id); var currentVolume = await _unitOfWork.SeriesRepository.GetVolumeAsync(volumeId); @@ -306,7 +305,7 @@ namespace API.Controllers } /// - /// Returns the previous logical volume from the series. + /// Returns the previous logical chapter from the series. /// /// /// @@ -340,6 +339,6 @@ namespace API.Controllers } return Ok(-1); } - + } } \ No newline at end of file diff --git a/API/Parser/Parser.cs b/API/Parser/Parser.cs index 83dbd8ebb..e5c9226b3 100644 --- a/API/Parser/Parser.cs +++ b/API/Parser/Parser.cs @@ -9,7 +9,7 @@ namespace API.Parser { public static class Parser { - public static readonly string ArchiveFileExtensions = @"\.cbz|\.zip|\.rar|\.cbr|\.tar.gz|\.7zip|\.7z"; + public static readonly string ArchiveFileExtensions = @"\.cbz|\.zip|\.rar|\.cbr|\.tar.gz|\.7zip|\.7z|.cb7"; public static readonly string BookFileExtensions = @"\.epub"; public static readonly string ImageFileExtensions = @"^(\.png|\.jpeg|\.jpg)"; public static readonly Regex FontSrcUrlRegex = new Regex("(src:url\\(\"?'?)([a-z0-9/\\._]+)(\"?'?\\))", RegexOptions.IgnoreCase | RegexOptions.Compiled); @@ -53,11 +53,6 @@ namespace API.Parser new Regex( @"(?.*)(\b|_|)(S(?\d+))", RegexOptions.IgnoreCase | RegexOptions.Compiled), - // Umineko no Naku Koro ni - Episode 3 - Banquet of the Golden Witch #02.cbz (this case is too limited, most other cases shouldn't parse out) - // new Regex( - // @"(?.*)( |_|-)(?:Episode)(?: |_)(?\d+(-\d+)?)", - // RegexOptions.IgnoreCase | RegexOptions.Compiled), - }; private static readonly Regex[] MangaSeriesRegex = new[]