mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 04:04:19 -04:00
* Took care of some notes in the code * Fixed an issue where Extra might get flagged as special too early, if in a word like Extraordinary * Moved Tag cleanup code into Scanner service. Added a SplitQuery to another heavy API. Refactored Scan loop to remove parallelism and use async instead. * Lots of rework on the codebase to support detailed messages and easier management of message sending. Need to take a break on this work. * Progress is being made, but slowly. Code is broken in this commit. * Progress is being made, but slowly. Code is broken in this commit. * Fixed merge issue * Fixed unit tests * CoverUpdate is now hooked into new ProgressEvent structure * Refactored code to remove custom observables and have everything use standard messages$ * Refactored a ton of instances to NotificationProgressEvent style and tons of the UI to respect that too. UI is still a bit buggy, but wholistically the work is done. * Working much better. Sometimes events come in too fast. Currently cover update progress doesn't display on UI * Fixed unit tests * Removed SignalREvent to minimize internal event types. Updated the UI to use progress bars. Finished SiteThemeService. * Merged metadata refresh progress events and changed library scan events to merge cleaner in the UI * Changed RefreshMetadataProgress to CoverUpdateProgress to reflect the event better. * Theme Cleanup (#1089) * Fixed e-ink theme not properly applying correctly * Fixed some seed changes. Changed card checkboxes to use our themed ones * Fixed recently added carousel not going to recently-added page * Fixed an issue where no results found would show when searching for a library name * Cleaned up list a bit, typeahead dropdown still needs work * Added a TODO to streamline series-card component * Removed ng-lazyload-image module since we don't use it. We use lazysizes * Darken card on hover * Fixing accordion focus style * ux pass updates - Fixed typeahead width - Fixed changelog download buttons - Fixed a select - Fixed various input box-shadows - Fixed all anchors to only have underline on hover - Added navtab hover and active effects * more ux pass - Fixed spacing on theme cards - Fixed some light theme issues - Exposed text-muted-color for theme card subtitle color * UX pass fixes - Changed back to bright green for primary on dark theme - Changed fa icon to black on e-ink * Merged changelog component * Fixed anchor buttons text decoration * Changed nav tabs to have a background color instead of open active state * When user is not authenticated, make sure we set default theme (dark) * Cleanup on carousel * Updated Users tab to use small buttons with icons to align with Library tab * Cleaned up brand to not underline, removed default link underline on hover in dropdown and pill tabs * Fixed collection detail posters not rendering Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> * Bump versions by dotnet-bump-version. * Tweaked some of the emitting code * Some css, but pretty bad. Robbie please save me * Removed a todo * styling update * Only send filename on FileScanProgress * Some console.log spam cleanup * Various updates * Show events widget activity based on activeEvents * progress bar color updates * Code cleanup Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
97 lines
4.4 KiB
C#
97 lines
4.4 KiB
C#
using API.Data.Metadata;
|
|
using API.Entities.Enums;
|
|
|
|
namespace API.Parser
|
|
{
|
|
/// <summary>
|
|
/// This represents all parsed information from a single file
|
|
/// </summary>
|
|
public class ParserInfo
|
|
{
|
|
/// <summary>
|
|
/// Represents the parsed chapters from a file. By default, will be 0 which means nothing could be parsed.
|
|
/// <remarks>The chapters can only be a single float or a range of float ie) 1-2. Mainly floats should be multiples of 0.5 representing specials</remarks>
|
|
/// </summary>
|
|
public string Chapters { get; set; } = "";
|
|
/// <summary>
|
|
/// Represents the parsed series from the file or folder
|
|
/// </summary>
|
|
public string Series { get; set; } = string.Empty;
|
|
/// <summary>
|
|
/// This can be filled in from ComicInfo.xml/Epub during scanning. Will update the SortName field on <see cref="Entities.Series"/>
|
|
/// </summary>
|
|
public string SeriesSort { get; set; } = string.Empty;
|
|
/// <summary>
|
|
/// Represents the parsed volumes from a file. By default, will be 0 which means that nothing could be parsed.
|
|
/// If Volumes is 0 and Chapters is 0, the file is a special. If Chapters is non-zero, then no volume could be parsed.
|
|
/// <example>Beastars Vol 3-4 will map to "3-4"</example>
|
|
/// <remarks>The volumes can only be a single int or a range of ints ie) 1-2. Float based volumes are not supported.</remarks>
|
|
/// </summary>
|
|
public string Volumes { get; set; } = "";
|
|
/// <summary>
|
|
/// Filename of the underlying file
|
|
/// <example>Beastars v01 (digital).cbz</example>
|
|
/// </summary>
|
|
public string Filename { get; init; } = "";
|
|
/// <summary>
|
|
/// Full filepath of the underlying file
|
|
/// <example>C:/Manga/Beastars v01 (digital).cbz</example>
|
|
/// </summary>
|
|
public string FullFilePath { get; set; } = "";
|
|
|
|
/// <summary>
|
|
/// <see cref="MangaFormat"/> that represents the type of the file
|
|
/// <remarks>Mainly used to show in the UI and so caching service knows how to cache for reading.</remarks>
|
|
/// </summary>
|
|
public MangaFormat Format { get; set; } = MangaFormat.Unknown;
|
|
|
|
/// <summary>
|
|
/// This can potentially story things like "Omnibus, Color, Full Contact Edition, Extra, Final, etc"
|
|
/// </summary>
|
|
/// <remarks>Not Used in Database</remarks>
|
|
public string Edition { get; set; } = "";
|
|
|
|
/// <summary>
|
|
/// If the file contains no volume/chapter information or contains Special Keywords <see cref="Parser.MangaSpecialRegex"/>
|
|
/// </summary>
|
|
public bool IsSpecial { get; set; }
|
|
|
|
/// <summary>
|
|
/// Used for specials or books, stores what the UI should show.
|
|
/// <remarks>Manga does not use this field</remarks>
|
|
/// </summary>
|
|
public string Title { get; set; } = string.Empty;
|
|
|
|
/// <summary>
|
|
/// If the ParserInfo has the IsSpecial tag or both volumes and chapters are default aka 0
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public bool IsSpecialInfo()
|
|
{
|
|
return (IsSpecial || (Volumes == "0" && Chapters == "0"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// This will contain any EXTRA comicInfo information parsed from the epub or archive. If there is an archive with comicInfo.xml AND it contains
|
|
/// series, volume information, that will override what we parsed.
|
|
/// </summary>
|
|
public ComicInfo ComicInfo { get; set; }
|
|
|
|
/// <summary>
|
|
/// Merges non empty/null properties from info2 into this entity.
|
|
/// </summary>
|
|
/// <remarks>This does not merge ComicInfo as they should always be the same</remarks>
|
|
/// <param name="info2"></param>
|
|
public void Merge(ParserInfo info2)
|
|
{
|
|
if (info2 == null) return;
|
|
Chapters = string.IsNullOrEmpty(Chapters) || Chapters == "0" ? info2.Chapters: Chapters;
|
|
Volumes = string.IsNullOrEmpty(Volumes) || Volumes == "0" ? info2.Volumes : Volumes;
|
|
Edition = string.IsNullOrEmpty(Edition) ? info2.Edition : Edition;
|
|
Title = string.IsNullOrEmpty(Title) ? info2.Title : Title;
|
|
Series = string.IsNullOrEmpty(Series) ? info2.Series : Series;
|
|
IsSpecial = IsSpecial || info2.IsSpecial;
|
|
}
|
|
}
|
|
}
|