AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.NET 7 + Spring Cleaning (#1677)

Browse source 
* 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.
This commit is contained in:
Joe Milazzo 2023-03-05 14:55:13 -06:00 • committed by GitHub
parent 76fe3fd64a
commit 5d1dd7b3f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
283 changed files with 4221 additions and 4593 deletions
Download patch file Download diff file Expand all files Collapse all files

58
API.Tests/Helpers/Builders/ChapterBuilder.cs Normal file
View file

@ -0,0 +1,58 @@
using System.Collections.Generic;
using API.Data;
using API.Entities;
using API.Entities.Enums;
namespace API.Tests.Helpers.Builders;
public class ChapterBuilder : IEntityBuilder<Chapter>
{
private Chapter _chapter;
public Chapter Build() => _chapter;
public ChapterBuilder(string number, string? range=null)
{
_chapter = new Chapter()
{
Range = string.IsNullOrEmpty(range) ? number : range,
Title = string.IsNullOrEmpty(range) ? number : range,
Number = API.Services.Tasks.Scanner.Parser.Parser.MinNumberFromRange(number) + string.Empty,
Files = new List<MangaFile>(),
Pages = 1
};
}
public ChapterBuilder WithAgeRating(AgeRating rating)
{
_chapter.AgeRating = rating;
return this;
}
public ChapterBuilder WithPages(int pages)
{
_chapter.Pages = pages;
return this;
}
public ChapterBuilder WithCoverImage(string cover)
{
_chapter.CoverImage = cover;
return this;
}
public ChapterBuilder WithIsSpecial(bool isSpecial)
{
_chapter.IsSpecial = isSpecial;
return this;
}
public ChapterBuilder WithTitle(string title)
{
_chapter.Title = title;
return this;
}
public ChapterBuilder WithFile(MangaFile file)
{
_chapter.Files ??= new List<MangaFile>();
_chapter.Files.Add(file);
return this;
}
}

6
API.Tests/Helpers/Builders/EntityBuilder.cs Normal file
View file

@ -0,0 +1,6 @@
namespace API.Tests.Helpers.Builders;
public interface IEntityBuilder<out T>
{
public T Build();
}

71
API.Tests/Helpers/Builders/SeriesBuilder.cs Normal file
View file

@ -0,0 +1,71 @@
using System.Collections.Generic;
using System.Linq;
using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
namespace API.Tests.Helpers.Builders;
public class SeriesBuilder : IEntityBuilder<Series>
{
private readonly Series _series;
public Series Build()
{
_series.Pages = _series.Volumes.Sum(v => v.Chapters.Sum(c => c.Pages));
return _series;
}
public SeriesBuilder(string name)
{
_series = new Series()
{
Name = name,
LocalizedName = name.ToNormalized(),
OriginalName = name,
SortName = name,
NormalizedName = name.ToNormalized(),
NormalizedLocalizedName = name.ToNormalized(),
Metadata = new SeriesMetadata(),
Volumes = new List<Volume>()
};
}
public SeriesBuilder WithLocalizedName(string localizedName)
{
_series.LocalizedName = localizedName;
_series.NormalizedLocalizedName = localizedName.ToNormalized();
return this;
}
public SeriesBuilder WithFormat(MangaFormat format)
{
_series.Format = format;
return this;
}
public SeriesBuilder WithVolume(Volume volume)
{
_series.Volumes ??= new List<Volume>();
_series.Volumes.Add(volume);
return this;
}
public SeriesBuilder WithVolumes(List<Volume> volumes)
{
_series.Volumes = volumes;
return this;
}
public SeriesBuilder WithMetadata(SeriesMetadata metadata)
{
_series.Metadata = metadata;
return this;
}
public SeriesBuilder WithPages(int pages)
{
_series.Pages = pages;
return this;
}
}

37
API.Tests/Helpers/Builders/SeriesMetadataBuilder.cs Normal file
View file

@ -0,0 +1,37 @@
using System.Collections.Generic;
using API.Data;
using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
namespace API.Tests.Helpers.Builders;
public class SeriesMetadataBuilder : IEntityBuilder<SeriesMetadata>
{
private SeriesMetadata _seriesMetadata;
public SeriesMetadata Build() => _seriesMetadata;
public SeriesMetadataBuilder()
{
_seriesMetadata = new SeriesMetadata()
{
CollectionTags = new List<CollectionTag>(),
Genres = new List<Genre>(),
Tags = new List<Tag>(),
People = new List<Person>()
};
}
public SeriesMetadataBuilder WithCollectionTag(CollectionTag tag)
{
_seriesMetadata.CollectionTags ??= new List<API.Entities.CollectionTag>();
_seriesMetadata.CollectionTags.Add(tag);
return this;
}
public SeriesMetadataBuilder WithPublicationStatus(PublicationStatus status)
{
_seriesMetadata.PublicationStatus = status;
return this;
}
}

43
API.Tests/Helpers/Builders/VolumeBuilder.cs Normal file
View file

@ -0,0 +1,43 @@
using System.Collections.Generic;
using System.Linq;
using API.Data;
using API.Entities;
namespace API.Tests.Helpers.Builders;
public class VolumeBuilder : IEntityBuilder<Volume>
{
private readonly Volume _volume;
public Volume Build() => _volume;
public VolumeBuilder(string volumeNumber)
{
_volume = DbFactory.Volume(volumeNumber);
}
public VolumeBuilder WithName(string name)
{
_volume.Name = name;
return this;
}
public VolumeBuilder WithNumber(int number)
{
_volume.Number = number;
return this;
}
public VolumeBuilder WithChapters(List<Chapter> chapters)
{
_volume.Chapters = chapters;
return this;
}
public VolumeBuilder WithChapter(Chapter chapter)
{
_volume.Chapters ??= new List<Chapter>();
_volume.Chapters.Add(chapter);
_volume.Pages = _volume.Chapters.Sum(c => c.Pages);
return this;
}
}

10
API.Tests/Helpers/CacheHelperTests.cs
View file

@ -156,6 +156,8 @@ public class CacheHelperTests
var chapter = new Chapter()
{
Number = "1",
Range = "1",
Created = filesystemFile.LastWriteTime.DateTime,
LastModified = filesystemFile.LastWriteTime.DateTime
};
@ -186,6 +188,8 @@ public class CacheHelperTests
var chapter = new Chapter()
{
Number = "1",
Range = "1",
Created = filesystemFile.LastWriteTime.DateTime,
LastModified = filesystemFile.LastWriteTime.DateTime
};
@ -216,6 +220,8 @@ public class CacheHelperTests
var chapter = new Chapter()
{
Number = "1",
Range = "1",
Created = filesystemFile.LastWriteTime.DateTime,
LastModified = filesystemFile.LastWriteTime.DateTime
};
@ -247,6 +253,8 @@ public class CacheHelperTests
var chapter = new Chapter()
{
Number = "1",
Range = "1",
Created = DateTime.Now.Subtract(TimeSpan.FromMinutes(10)),
LastModified = DateTime.Now.Subtract(TimeSpan.FromMinutes(10))
};
@ -277,6 +285,8 @@ public class CacheHelperTests
var chapter = new Chapter()
{
Number = "1",
Range = "1",
Created = DateTime.Now.Subtract(TimeSpan.FromMinutes(10)),
LastModified = DateTime.Now
};

12
API.Tests/Helpers/EntityFactory.cs
View file

@ -4,6 +4,7 @@ using API.Data;
using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
namespace API.Tests.Helpers;
@ -19,7 +20,9 @@ public static class EntityFactory
Name = name,
SortName = name,
LocalizedName = name,
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize(name),
NormalizedName = name.ToNormalized(),
OriginalName = name,
NormalizedLocalizedName = name.ToNormalized(),
Volumes = new List<Volume>(),
Metadata = new SeriesMetadata()
};
@ -38,7 +41,7 @@ public static class EntityFactory
};
}
public static Chapter CreateChapter(string range, bool isSpecial, List<MangaFile> files = null, int pageCount = 0)
public static Chapter CreateChapter(string range, bool isSpecial, List<MangaFile> files = null, int pageCount = 0, string title = null)
{
return new Chapter()
{
@ -47,7 +50,7 @@ public static class EntityFactory
Number = API.Services.Tasks.Scanner.Parser.Parser.MinNumberFromRange(range) + string.Empty,
Files = files ?? new List<MangaFile>(),
Pages = pageCount,
Title = title ?? range
};
}
@ -66,3 +69,6 @@ public static class EntityFactory
return DbFactory.CollectionTag(id, title, summary, promoted);
}
}

5
API.Tests/Helpers/ParserInfoFactory.cs
View file

@ -3,6 +3,7 @@ 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;
@ -29,12 +30,12 @@ public static class ParserInfoFactory
public static void AddToParsedInfo(IDictionary<ParsedSeries, IList<ParserInfo>> collectedSeries, ParserInfo info)
{
var existingKey = collectedSeries.Keys.FirstOrDefault(ps =>
ps.Format == info.Format && ps.NormalizedName == API.Services.Tasks.Scanner.Parser.Parser.Normalize(info.Series));
ps.Format == info.Format && ps.NormalizedName == info.Series.ToNormalized());
existingKey ??= new ParsedSeries()
{
Format = info.Format,
Name = info.Series,
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize(info.Series)
NormalizedName = info.Series.ToNormalized()
};
if (collectedSeries.GetType() == typeof(ConcurrentDictionary<,>))
{

53
API.Tests/Helpers/ParserInfoHelperTests.cs
View file

@ -2,9 +2,11 @@
using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
using API.Helpers;
using API.Parser;
using API.Services.Tasks.Scanner;
using API.Tests.Helpers.Builders;
using Xunit;
namespace API.Tests.Helpers;
@ -21,23 +23,14 @@ public class ParserInfoHelperTests
ParserInfoFactory.AddToParsedInfo(infos, new ParserInfo() {Series = "Darker than Black", Volumes = "1", Format = MangaFormat.Archive});
//AddToParsedInfo(infos, new ParserInfo() {Series = "Darker than Black", Volumes = "1", Format = MangaFormat.Epub});
var series = new Series()
{
Name = "Darker Than Black",
LocalizedName = "Darker Than Black",
OriginalName = "Darker Than Black",
Volumes = new List<Volume>()
{
new Volume()
{
Number = 1,
Name = "1"
}
},
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Darker Than Black"),
Metadata = new SeriesMetadata(),
Format = MangaFormat.Epub
};
var series = new SeriesBuilder("Darker Than Black")
.WithFormat(MangaFormat.Epub)
.WithMetadata(new SeriesMetadata())
.WithVolume(new VolumeBuilder("1")
.WithName("1")
.Build())
.WithLocalizedName("Darker Than Black")
.Build();
Assert.False(ParserInfoHelpers.SeriesHasMatchingParserInfoFormat(series, infos));
}
@ -50,23 +43,15 @@ public class ParserInfoHelperTests
ParserInfoFactory.AddToParsedInfo(infos, new ParserInfo() {Series = "Darker than Black", Volumes = "1", Format = MangaFormat.Archive});
ParserInfoFactory.AddToParsedInfo(infos, new ParserInfo() {Series = "Darker than Black", Volumes = "1", Format = MangaFormat.Epub});
var series = new Series()
{
Name = "Darker Than Black",
LocalizedName = "Darker Than Black",
OriginalName = "Darker Than Black",
Volumes = new List<Volume>()
{
new Volume()
{
Number = 1,
Name = "1"
}
},
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Darker Than Black"),
Metadata = new SeriesMetadata(),
Format = MangaFormat.Epub
};
var series = new SeriesBuilder("Darker Than Black")
.WithFormat(MangaFormat.Epub)
.WithMetadata(new SeriesMetadata())
.WithVolume(new VolumeBuilder("1")
.WithName("1")
.Build())
.WithLocalizedName("Darker Than Black")
.Build();
Assert.True(ParserInfoHelpers.SeriesHasMatchingParserInfoFormat(series, infos));
}

3
API.Tests/Helpers/PersonHelperTests.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using API.Data;
using API.Entities;
using API.Entities.Enums;

47
API.Tests/Helpers/SeriesHelperTests.cs
View file

@ -3,6 +3,7 @@ using System.Linq;
using API.Data;
using API.Entities;
using API.Entities.Enums;
using API.Extensions;
using API.Helpers;
using API.Services.Tasks.Scanner;
using Xunit;
@ -22,21 +23,35 @@ public class SeriesHelperTests
{
Format = MangaFormat.Archive,
Name = "Darker than Black",
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Darker than Black")
NormalizedName = "Darker than Black".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Archive,
Name = "Darker than Black".ToLower(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Darker than Black")
NormalizedName = "Darker than Black".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Archive,
Name = "Darker than Black".ToUpper(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Darker than Black")
NormalizedName = "Darker than Black".ToNormalized()
}));
}
[Fact]
public void FindSeries_ShouldFind_NullName()
{
var series = DbFactory.Series("Darker than Black");
series.OriginalName = null;
series.Format = MangaFormat.Archive;
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Archive,
Name = "Darker than Black",
NormalizedName = "Darker than Black".ToNormalized()
}));
}
@ -50,21 +65,21 @@ public class SeriesHelperTests
{
Format = MangaFormat.Image,
Name = "Darker than Black",
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Darker than Black")
NormalizedName = "Darker than Black".ToNormalized()
}));
Assert.False(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Image,
Name = "Darker than Black".ToLower(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Darker than Black")
NormalizedName = "Darker than Black".ToNormalized()
}));
Assert.False(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Image,
Name = "Darker than Black".ToUpper(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Darker than Black")
NormalizedName = "Darker than Black".ToNormalized()
}));
}
@ -78,28 +93,28 @@ public class SeriesHelperTests
{
Format = MangaFormat.Image,
Name = "Something Random",
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Something Random")
NormalizedName = "Something Random".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Image,
Name = "Something Random".ToLower(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Something Random")
NormalizedName = "Something Random".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Image,
Name = "Something Random".ToUpper(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Something Random")
NormalizedName = "Something Random".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Image,
Name = "SomethingRandom".ToUpper(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("SomethingRandom")
NormalizedName = "SomethingRandom".ToNormalized()
}));
}
@ -113,28 +128,28 @@ public class SeriesHelperTests
{
Format = MangaFormat.Image,
Name = "Something Random",
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Something Random")
NormalizedName = "Something Random".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Image,
Name = "Something Random".ToLower(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Something Random")
NormalizedName = "Something Random".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Image,
Name = "Something Random".ToUpper(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Something Random")
NormalizedName = "Something Random".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Image,
Name = "SomethingRandom".ToUpper(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("SomethingRandom")
NormalizedName = "SomethingRandom".ToNormalized()
}));
}
@ -148,14 +163,14 @@ public class SeriesHelperTests
{
Format = MangaFormat.Archive,
Name = "My Dress-Up Darling",
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("My Dress-Up Darling")
NormalizedName = "My Dress-Up Darling".ToNormalized()
}));
Assert.True(SeriesHelper.FindSeries(series, new ParsedSeries()
{
Format = MangaFormat.Archive,
Name = "Sono Bisque Doll wa Koi wo Suru".ToLower(),
NormalizedName = API.Services.Tasks.Scanner.Parser.Parser.Normalize("Sono Bisque Doll wa Koi wo Suru")
NormalizedName = "Sono Bisque Doll wa Koi wo Suru".ToNormalized()
}));
}
#endregion