Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-06-01 04:34:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

CB7 Support (#241)

Browse Source 
* Added CB7 file extension support
This commit is contained in:
Joseph Milazzo 2021-06-01 08:37:46 -05:00 committed by GitHub
parent aaad82cb7a
commit ce35c4f84a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
API/Controllers/ReaderController.cs
View File

@ -244,7 +244,7 @@ namespace API.Controllers
} }
/// <summary> /// <summary>
/// Returns the next logical volume from the series. /// Returns the next logical chapter from the series.
/// </summary> /// </summary>
/// <param name="seriesId"></param> /// <param name="seriesId"></param>
/// <param name="volumeId"></param> /// <param name="volumeId"></param>
@ -254,7 +254,6 @@ namespace API.Controllers
public async Task<ActionResult<int>> GetNextChapter(int seriesId, int volumeId, int currentChapterId) public async Task<ActionResult<int>> GetNextChapter(int seriesId, int volumeId, int currentChapterId)
{ {
var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); 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 volumes = await _unitOfWork.SeriesRepository.GetVolumesDtoAsync(seriesId, user.Id);
var currentVolume = await _unitOfWork.SeriesRepository.GetVolumeAsync(volumeId); var currentVolume = await _unitOfWork.SeriesRepository.GetVolumeAsync(volumeId);
@ -306,7 +305,7 @@ namespace API.Controllers
} }
/// <summary> /// <summary>
/// Returns the previous logical volume from the series. /// Returns the previous logical chapter from the series.
/// </summary> /// </summary>
/// <param name="seriesId"></param> /// <param name="seriesId"></param>
/// <param name="volumeId"></param> /// <param name="volumeId"></param>
@ -340,6 +339,6 @@ namespace API.Controllers
} }
return Ok(-1); return Ok(-1);
} }
} }
} }

7
API/Parser/Parser.cs
View File

@ -9,7 +9,7 @@ namespace API.Parser
{ {
public static class 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 BookFileExtensions = @"\.epub";
public static readonly string ImageFileExtensions = @"^(\.png|\.jpeg|\.jpg)"; public static readonly string ImageFileExtensions = @"^(\.png|\.jpeg|\.jpg)";
public static readonly Regex FontSrcUrlRegex = new Regex("(src:url\\(\"?'?)([a-z0-9/\\._]+)(\"?'?\\))", RegexOptions.IgnoreCase | RegexOptions.Compiled); 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( new Regex(
@"(?<Series>.*)(\b|_|)(S(?<Volume>\d+))", @"(?<Series>.*)(\b|_|)(S(?<Volume>\d+))",
RegexOptions.IgnoreCase | RegexOptions.Compiled), 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(
// @"(?<Series>.*)( |_|-)(?:Episode)(?: |_)(?<Volume>\d+(-\d+)?)",
// RegexOptions.IgnoreCase | RegexOptions.Compiled),
}; };
private static readonly Regex[] MangaSeriesRegex = new[] private static readonly Regex[] MangaSeriesRegex = new[]