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

UX Pass 7 (#3135)

Browse source 
Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
This commit is contained in:
Joe Milazzo 2024-08-29 08:46:17 -05:00 • committed by GitHub
parent 5bf5558212
commit 79eb98a3bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
67 changed files with 1398 additions and 1006 deletions
Download patch file Download diff file Expand all files Collapse all files

6
API/API.csproj
View file

@ -70,7 +70,7 @@
<PackageReference Include="Hangfire.InMemory" Version="0.10.3" />
<PackageReference Include="Hangfire.MaximumConcurrentExecutions" Version="1.1.0" />
<PackageReference Include="Hangfire.Storage.SQLite" Version="0.4.2" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.63" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.64" />
<PackageReference Include="MarkdownDeep.NET.Core" Version="1.5.0.4" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.14" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
@ -100,9 +100,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
<PackageReference Include="VersOne.Epub" Version="3.3.2" />

5
API/Controllers/LocaleController.cs
View file

@ -22,6 +22,11 @@ public class LocaleController : BaseApiController
[HttpGet]
public ActionResult<IEnumerable<string>> GetAllLocales()
{
// Check if temp/locale_map.json exists
// If not, scan the 2 locale files and calculate empty keys or empty values
// Formulate the Locale object with Percentage
var languages = _localizationService.GetLocales().Select(c =>
{
try

1
API/I18N/ar.json
View file

@ -1 +0,0 @@
{}

1
API/I18N/kn.json
View file

@ -1 +0,0 @@
{}

81
API/Services/SeriesService.cs
View file

@ -625,7 +625,7 @@ public class SeriesService : ISeriesService
}
/// <summary>
/// Update the relations attached to the Series. Does not generate associated Sequel/Prequel pairs on target series.
/// Update the relations attached to the Series. Generates associated Sequel/Prequel pairs on target series.
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
@ -643,15 +643,90 @@ public class SeriesService : ISeriesService
UpdateRelationForKind(dto.AlternativeSettings, series.Relations.Where(r => r.RelationKind == RelationKind.AlternativeSetting).ToList(), series, RelationKind.AlternativeSetting);
UpdateRelationForKind(dto.AlternativeVersions, series.Relations.Where(r => r.RelationKind == RelationKind.AlternativeVersion).ToList(), series, RelationKind.AlternativeVersion);
UpdateRelationForKind(dto.Doujinshis, series.Relations.Where(r => r.RelationKind == RelationKind.Doujinshi).ToList(), series, RelationKind.Doujinshi);
UpdateRelationForKind(dto.Prequels, series.Relations.Where(r => r.RelationKind == RelationKind.Prequel).ToList(), series, RelationKind.Prequel);
UpdateRelationForKind(dto.Sequels, series.Relations.Where(r => r.RelationKind == RelationKind.Sequel).ToList(), series, RelationKind.Sequel);
UpdateRelationForKind(dto.Editions, series.Relations.Where(r => r.RelationKind == RelationKind.Edition).ToList(), series, RelationKind.Edition);
UpdateRelationForKind(dto.Annuals, series.Relations.Where(r => r.RelationKind == RelationKind.Annual).ToList(), series, RelationKind.Annual);
await UpdatePrequelSequelRelations(dto.Prequels, series, RelationKind.Prequel);
await UpdatePrequelSequelRelations(dto.Sequels, series, RelationKind.Sequel);
if (!_unitOfWork.HasChanges()) return true;
return await _unitOfWork.CommitAsync();
}
/// <summary>
/// Updates Prequel/Sequel relations and creates reciprocal relations on target series.
/// </summary>
/// <param name="targetSeriesIds">List of target series IDs</param>
/// <param name="series">The current series being updated</param>
/// <param name="kind">The relation kind (Prequel or Sequel)</param>
private async Task UpdatePrequelSequelRelations(ICollection<int> targetSeriesIds, Series series, RelationKind kind)
{
var existingRelations = series.Relations.Where(r => r.RelationKind == kind).ToList();
// Remove relations that are not in the new list
foreach (var relation in existingRelations.Where(relation => !targetSeriesIds.Contains(relation.TargetSeriesId)))
{
series.Relations.Remove(relation);
await RemoveReciprocalRelation(series.Id, relation.TargetSeriesId, GetOppositeRelationKind(kind));
}
// Add new relations
foreach (var targetSeriesId in targetSeriesIds)
{
if (series.Relations.Any(r => r.RelationKind == kind && r.TargetSeriesId == targetSeriesId))
continue;
series.Relations.Add(new SeriesRelation
{
Series = series,
SeriesId = series.Id,
TargetSeriesId = targetSeriesId,
RelationKind = kind
});
await AddReciprocalRelation(series.Id, targetSeriesId, GetOppositeRelationKind(kind));
}
_unitOfWork.SeriesRepository.Update(series);
}
private static RelationKind GetOppositeRelationKind(RelationKind kind)
{
return kind == RelationKind.Prequel ? RelationKind.Sequel : RelationKind.Prequel;
}
private async Task AddReciprocalRelation(int sourceSeriesId, int targetSeriesId, RelationKind kind)
{
var targetSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(targetSeriesId, SeriesIncludes.Related);
if (targetSeries == null) return;
if (targetSeries.Relations.Any(r => r.RelationKind == kind && r.TargetSeriesId == sourceSeriesId))
return;
targetSeries.Relations.Add(new SeriesRelation
{
Series = targetSeries,
SeriesId = targetSeriesId,
TargetSeriesId = sourceSeriesId,
RelationKind = kind
});
_unitOfWork.SeriesRepository.Update(targetSeries);
}
private async Task RemoveReciprocalRelation(int sourceSeriesId, int targetSeriesId, RelationKind kind)
{
var targetSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(targetSeriesId, SeriesIncludes.Related);
if (targetSeries == null) return;
var relationToRemove = targetSeries.Relations.FirstOrDefault(r => r.RelationKind == kind && r.TargetSeriesId == sourceSeriesId);
if (relationToRemove != null)
{
targetSeries.Relations.Remove(relationToRemove);
_unitOfWork.SeriesRepository.Update(targetSeries);
}
}
/// <summary>
/// Applies the provided list to the series. Adds new relations and removes deleted relations.