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

Browse by Genre/Tag/Person with new metadata system for People (#3835)

Browse source 
Co-authored-by: Stepan Goremykin <s.goremykin@proton.me>
Co-authored-by: goremykin <goremukin@gmail.com>
Co-authored-by: Christopher <39032787+MrRobotjs@users.noreply.github.com>
Co-authored-by: Fesaa <77553571+Fesaa@users.noreply.github.com>
This commit is contained in:
Joe Milazzo 2025-06-14 12:14:04 -05:00 • committed by GitHub
parent 00c4712fc3
commit c52ed1f65d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
147 changed files with 6612 additions and 958 deletions
Download patch file Download diff file Expand all files Collapse all files

28
API/Services/Plus/ExternalMetadataService.cs
View file

@ -200,6 +200,9 @@ public class ExternalMetadataService : IExternalMetadataService
/// <summary>
/// Returns the match results for a Series from UI Flow
/// </summary>
/// <remarks>
/// Will extract alternative names like Localized name, year will send as ReleaseYear but fallback to Comic Vine syntax if applicable
/// </remarks>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<IList<ExternalSeriesMatchDto>> MatchSeries(MatchSeriesDto dto)
@ -212,19 +215,26 @@ public class ExternalMetadataService : IExternalMetadataService
var potentialAnilistId = ScrobblingService.ExtractId<int?>(dto.Query, ScrobblingService.AniListWeblinkWebsite);
var potentialMalId = ScrobblingService.ExtractId<long?>(dto.Query, ScrobblingService.MalWeblinkWebsite);
List<string> altNames = [series.LocalizedName, series.OriginalName];
if (potentialAnilistId == null && potentialMalId == null && !string.IsNullOrEmpty(dto.Query))
var format = series.Library.Type.ConvertToPlusMediaFormat(series.Format);
var otherNames = ExtractAlternativeNames(series);
var year = series.Metadata.ReleaseYear;
if (year == 0 && format == PlusMediaFormat.Comic && !string.IsNullOrWhiteSpace(series.Name))
{
altNames.Add(dto.Query);
var potentialYear = Parser.ParseYear(series.Name);
if (!string.IsNullOrEmpty(potentialYear))
{
year = int.Parse(potentialYear);
}
}
var matchRequest = new MatchSeriesRequestDto()
{
Format = series.Library.Type.ConvertToPlusMediaFormat(series.Format),
Format = format,
Query = dto.Query,
SeriesName = series.Name,
AlternativeNames = altNames.Where(s => !string.IsNullOrEmpty(s)).ToList(),
Year = series.Metadata.ReleaseYear,
AlternativeNames = otherNames,
Year = year,
AniListId = potentialAnilistId ?? ScrobblingService.GetAniListId(series),
MalId = potentialMalId ?? ScrobblingService.GetMalId(series)
};
@ -254,6 +264,12 @@ public class ExternalMetadataService : IExternalMetadataService
return ArraySegment<ExternalSeriesMatchDto>.Empty;
}
private static List<string> ExtractAlternativeNames(Series series)
{
List<string> altNames = [series.LocalizedName, series.OriginalName];
return altNames.Where(s => !string.IsNullOrEmpty(s)).Distinct().ToList();
}
/// <summary>
/// Retrieves Metadata about a Recommended External Series

13
API/Services/Plus/LicenseService.cs
View file

@ -130,22 +130,23 @@ public class LicenseService(
if (cacheValue.HasValue) return cacheValue.Value;
}
var result = false;
try
{
var serverSetting = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey);
var result = await IsLicenseValid(serverSetting.Value);
await provider.FlushAsync();
await provider.SetAsync(CacheKey, result, _licenseCacheTimeout);
return result;
result = await IsLicenseValid(serverSetting.Value);
}
catch (Exception ex)
{
logger.LogError(ex, "There was an issue connecting to Kavita+");
}
finally
{
await provider.FlushAsync();
await provider.SetAsync(CacheKey, false, _licenseCacheTimeout);
await provider.SetAsync(CacheKey, result, _licenseCacheTimeout);
}
return false;
return result;
}
/// <summary>