mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 20:24:27 -04:00
* Updated to net7.0 * Updated GA to .net 7 * Updated System.IO.Abstractions to use New factory. * Converted Regex into SourceGenerator in Parser. * Updated more regex to source generators. * Enabled Nullability and more regex changes throughout codebase. * Parser is 100% GeneratedRegexified * Lots of nullability code * Enabled nullability for all repositories. * Fixed another unit test * Refactored some code around and took care of some todos. * Updating code for nullability and cleaning up methods that aren't used anymore. Refctored all uses of Parser.Normalize() to use new extension * More nullability exercises. 500 warnings to go. * Fixed a bug where custom file uploads for entities wouldn't save in webP. * Nullability is done for all DTOs * Fixed all unit tests and nullability for the project. Only OPDS is left which will be done with an upcoming OPDS enhancement. * Use localization in book service after validating * Code smells * Switched to preview build of swashbuckle for .net7 support * Fixed up merge issues * Disable emulate comic book when on single page reader * Fixed a regression where double page renderer wouldn't layout the images correctly * Updated to swashbuckle which support .net 7 * Fixed a bad GA action * Some code cleanup * More code smells * Took care of most of nullable issues * Fixed a broken test due to having more than one test run in parallel * I'm really not sure why the unit tests are failing or are so extremely slow on .net 7 * Updated all dependencies * Fixed up build and removed hardcoded framework from build scripts. (this merge removes Regex Source generators). Unit tests are completely busted. * Unit tests and code cleanup. Needs shakeout now. * Adjusted Series model since a few fields are not-nullable. Removed dead imports on the project. * Refactored to use Builder pattern for all unit tests. * Switched nullability down to warnings. It wasn't possible to switch due to constraint issues in DB Migration.
74 lines
2.2 KiB
C#
74 lines
2.2 KiB
C#
using System.Collections.Concurrent;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using API.Entities.Enums;
|
|
using API.Extensions;
|
|
using API.Parser;
|
|
using API.Services.Tasks.Scanner;
|
|
|
|
namespace API.Tests.Helpers;
|
|
|
|
public static class ParserInfoFactory
|
|
{
|
|
public static ParserInfo CreateParsedInfo(string series, string volumes, string chapters, string filename, bool isSpecial)
|
|
{
|
|
return new ParserInfo()
|
|
{
|
|
Chapters = chapters,
|
|
Edition = "",
|
|
Format = MangaFormat.Archive,
|
|
FullFilePath = Path.Join(@"/manga/", filename),
|
|
Filename = filename,
|
|
IsSpecial = isSpecial,
|
|
Title = Path.GetFileNameWithoutExtension(filename),
|
|
Series = series,
|
|
Volumes = volumes
|
|
};
|
|
}
|
|
|
|
public static void AddToParsedInfo(IDictionary<ParsedSeries, IList<ParserInfo>> collectedSeries, ParserInfo info)
|
|
{
|
|
var existingKey = collectedSeries.Keys.FirstOrDefault(ps =>
|
|
ps.Format == info.Format && ps.NormalizedName == info.Series.ToNormalized());
|
|
existingKey ??= new ParsedSeries()
|
|
{
|
|
Format = info.Format,
|
|
Name = info.Series,
|
|
NormalizedName = info.Series.ToNormalized()
|
|
};
|
|
if (collectedSeries.GetType() == typeof(ConcurrentDictionary<,>))
|
|
{
|
|
((ConcurrentDictionary<ParsedSeries, IList<ParserInfo>>) collectedSeries).AddOrUpdate(existingKey, new List<ParserInfo>() {info}, (_, oldValue) =>
|
|
{
|
|
oldValue ??= new List<ParserInfo>();
|
|
if (!oldValue.Contains(info))
|
|
{
|
|
oldValue.Add(info);
|
|
}
|
|
|
|
return oldValue;
|
|
});
|
|
}
|
|
else
|
|
{
|
|
if (!collectedSeries.ContainsKey(existingKey))
|
|
{
|
|
collectedSeries.Add(existingKey, new List<ParserInfo>() {info});
|
|
}
|
|
else
|
|
{
|
|
var list = collectedSeries[existingKey];
|
|
if (!list.Contains(info))
|
|
{
|
|
list.Add(info);
|
|
}
|
|
|
|
collectedSeries[existingKey] = list;
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
}
|