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

Misc Fixes + Enhancements (#1875)

Browse source 
* Moved Collapse Series with relationships into a user preference rather than library setting.

* Fixed bookmarks not converting to webp after initial save

* Fixed a bug where when merging we'd print out a duplicate series error when we shouldn't have

* Fixed a bug where clicking on a genre or tag from server stats wouldn't load all-series page in a filtered state.

* Implemented the ability to have Login role and thus disable accounts.

* Ensure first time flow gets the Login role

* Refactored user management screen so that pending users can be edited or deleted before the end user accepts the invite. A side effect is old legacy users that were here before email was required can now be deleted.

* Show a progress bar under the main series image on larger viewports to show whole series progress.

* Removed code no longer needed

* Cleanup tags, people, collections without connections after editing series metadata.

* Moved the Entity Builders to the main project
This commit is contained in:
Joe Milazzo 2023-03-10 19:09:38 -06:00 • committed by GitHub
parent c62e594792
commit bd19b282d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 2186 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

1
API.Tests/Entities/ComicInfoTests.cs
View file

@ -36,7 +36,6 @@ public class ComicInfoTests
}
#endregion
#region CalculatedCount
[Fact]

52
API.Tests/Extensions/QueryableExtensionsTests.cs
View file

@ -6,7 +6,7 @@ using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
using API.Tests.Helpers.Builders;
using API.Helpers.Builders;
using Xunit;
namespace API.Tests.Extensions;
@ -226,40 +226,28 @@ public class QueryableExtensionsTests
{
var items = new List<Person>()
{
new Person()
{
SeriesMetadatas = new List<SeriesMetadata>()
new PersonBuilder("Test", PersonRole.Character)
.WithSeriesMetadata(new SeriesMetadata()
{
new SeriesMetadata()
{
AgeRating = AgeRating.Teen,
}
}
},
new Person()
{
SeriesMetadatas = new List<SeriesMetadata>()
AgeRating = AgeRating.Teen,
})
.Build(),
new PersonBuilder("Test", PersonRole.Character)
.WithSeriesMetadata(new SeriesMetadata()
{
new SeriesMetadata()
{
AgeRating = AgeRating.Unknown,
},
new SeriesMetadata()
{
AgeRating = AgeRating.Teen,
}
}
},
new Person()
{
SeriesMetadatas = new List<SeriesMetadata>()
AgeRating = AgeRating.Unknown,
})
.WithSeriesMetadata(new SeriesMetadata()
{
new SeriesMetadata()
{
AgeRating = AgeRating.X18Plus,
}
}
},
AgeRating = AgeRating.Teen,
})
.Build(),
new PersonBuilder("Test", PersonRole.Character)
.WithSeriesMetadata(new SeriesMetadata()
{
AgeRating = AgeRating.X18Plus,
})
.Build(),
};
var filtered = items.AsQueryable().RestrictAgainstAgeRestriction(new AgeRestriction()

2
API.Tests/Extensions/SeriesExtensionsTests.cs
View file

@ -4,7 +4,7 @@ using API.Comparators;
using API.Entities;
using API.Entities.Enums;
using API.Extensions;
using API.Tests.Helpers.Builders;
using API.Helpers.Builders;
using Xunit;
namespace API.Tests.Extensions;

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

@ -1,58 +0,0 @@
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
View file

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

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

@ -1,71 +0,0 @@
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
View file

@ -1,37 +0,0 @@
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
View file

@ -1,43 +0,0 @@
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;
}
}

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

@ -4,9 +4,9 @@ using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
using API.Helpers;
using API.Helpers.Builders;
using API.Parser;
using API.Services.Tasks.Scanner;
using API.Tests.Helpers.Builders;
using Xunit;
namespace API.Tests.Helpers;

2
API.Tests/Repository/SeriesRepositoryTests.cs
View file

@ -8,8 +8,8 @@ using API.Entities;
using API.Entities.Enums;
using API.Extensions;
using API.Helpers;
using API.Helpers.Builders;
using API.Services;
using API.Tests.Helpers.Builders;
using AutoMapper;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;

11
API.Tests/Services/ArchiveServiceTests.cs
View file

@ -244,6 +244,17 @@ public class ArchiveServiceTests
Assert.Equal(summaryInfo, comicInfo.Summary);
}
[Fact]
public void ShouldHaveComicInfo_CanParseUmlaut()
{
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/ComicInfos");
var archive = Path.Join(testDirectory, "Umlaut.zip");
var comicInfo = _archiveService.GetComicInfo(archive);
Assert.NotNull(comicInfo);
Assert.Equal("Belladonna", comicInfo.Series);
}
[Fact]
public void ShouldHaveComicInfo_WithAuthors()
{

2
API.Tests/Services/BookmarkServiceTests.cs
View file

@ -12,9 +12,9 @@ using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
using API.Helpers;
using API.Helpers.Builders;
using API.Services;
using API.SignalR;
using API.Tests.Helpers.Builders;
using AutoMapper;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;

2
API.Tests/Services/CleanupServiceTests.cs
View file

@ -12,11 +12,11 @@ using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
using API.Helpers;
using API.Helpers.Builders;
using API.Services;
using API.Services.Tasks;
using API.SignalR;
using API.Tests.Helpers;
using API.Tests.Helpers.Builders;
using Microsoft.Extensions.Logging;
using NSubstitute;
using Xunit;

2
API.Tests/Services/ReaderServiceTests.cs
View file

@ -12,10 +12,10 @@ using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
using API.Helpers;
using API.Helpers.Builders;
using API.Services;
using API.SignalR;
using API.Tests.Helpers;
using API.Tests.Helpers.Builders;
using AutoMapper;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;

2
API.Tests/Services/ReadingListServiceTests.cs
View file

@ -13,10 +13,10 @@ using API.Entities;
using API.Entities.Enums;
using API.Extensions;
using API.Helpers;
using API.Helpers.Builders;
using API.Services;
using API.SignalR;
using API.Tests.Helpers;
using API.Tests.Helpers.Builders;
using AutoMapper;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;

2
API.Tests/Services/ScannerServiceTests.cs
View file

@ -4,11 +4,11 @@ using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
using API.Helpers.Builders;
using API.Parser;
using API.Services.Tasks;
using API.Services.Tasks.Scanner;
using API.Tests.Helpers;
using API.Tests.Helpers.Builders;
using Xunit;
namespace API.Tests.Services;

2
API.Tests/Services/SeriesServiceTests.cs
View file

@ -12,10 +12,10 @@ using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
using API.Extensions;
using API.Helpers.Builders;
using API.Services;
using API.SignalR;
using API.Tests.Helpers;
using API.Tests.Helpers.Builders;
using Microsoft.Extensions.Logging;
using NSubstitute;
using Xunit;

2
API.Tests/Services/TachiyomiServiceTests.cs
View file

@ -1,5 +1,5 @@
using API.Extensions;
using API.Tests.Helpers.Builders;
using API.Helpers.Builders;
namespace API.Tests.Services;
using System.Collections.Generic;

BIN
API.Tests/Services/Test Data/ArchiveService/ComicInfos/Umlaut.zip Normal file
View file

Binary file not shown.