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

.NET 8 Update (#2496)

Browse source
This commit is contained in:
Joe Milazzo 2023-12-13 19:16:54 -06:00 • committed by GitHub
parent 6d4d2d4a7f
commit b838fd53e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 590 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

2
API/Extensions/FileTypeGroupExtensions.cs
View file

@ -17,7 +17,7 @@ public static class FileTypeGroupExtensions
case FileTypeGroup.Pdf:
return Parser.PdfFileExtension;
case FileTypeGroup.Images:
return Parser.ImageFileExtensions;;
return Parser.ImageFileExtensions;
default:
throw new ArgumentOutOfRangeException(nameof(fileTypeGroup), fileTypeGroup, null);
}

8
API/Extensions/HttpExtensions.cs
View file

@ -21,8 +21,8 @@ public static class HttpExtensions
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
};
response.Headers.Add("Pagination", JsonSerializer.Serialize(paginationHeader, options));
response.Headers.Add("Access-Control-Expose-Headers", "Pagination");
response.Headers.Append("Pagination", JsonSerializer.Serialize(paginationHeader, options));
response.Headers.Append("Access-Control-Expose-Headers", "Pagination");
}
/// <summary>
@ -33,7 +33,7 @@ public static class HttpExtensions
public static void AddCacheHeader(this HttpResponse response, byte[] content)
{
if (content is not {Length: > 0}) return;
response.Headers.Add(HeaderNames.ETag, string.Concat(SHA256.HashData(content).Select(x => x.ToString("X2"))));
response.Headers.Append(HeaderNames.ETag, string.Concat(SHA256.HashData(content).Select(x => x.ToString("X2"))));
response.Headers.CacheControl = $"private,max-age=100";
}
@ -47,7 +47,7 @@ public static class HttpExtensions
{
if (filename is not {Length: > 0}) return;
var hashContent = filename + File.GetLastWriteTimeUtc(filename);
response.Headers.Add("ETag", string.Concat(SHA256.HashData(Encoding.UTF8.GetBytes(hashContent)).Select(x => x.ToString("X2"))));
response.Headers.Append("ETag", string.Concat(SHA256.HashData(Encoding.UTF8.GetBytes(hashContent)).Select(x => x.ToString("X2"))));
if (maxAge != 10)
{
response.Headers.CacheControl = $"max-age={maxAge}";

6
API/Extensions/QueryExtensions/Filtering/SeriesFilter.cs
View file

@ -22,7 +22,7 @@ public static class SeriesFilter
switch (comparison)
{
case FilterComparison.Equal:
return queryable.Where(s => s.Metadata.Language.Equals(languages.First()));
return queryable.Where(s => s.Metadata.Language.Equals(languages[0]));
case FilterComparison.Contains:
return queryable.Where(s => languages.Contains(s.Metadata.Language));
case FilterComparison.MustContains:
@ -30,9 +30,9 @@ public static class SeriesFilter
case FilterComparison.NotContains:
return queryable.Where(s => !languages.Contains(s.Metadata.Language));
case FilterComparison.NotEqual:
return queryable.Where(s => !s.Metadata.Language.Equals(languages.First()));
return queryable.Where(s => !s.Metadata.Language.Equals(languages[0]));
case FilterComparison.Matches:
return queryable.Where(s => EF.Functions.Like(s.Metadata.Language, $"{languages.First()}%"));
return queryable.Where(s => EF.Functions.Like(s.Metadata.Language, $"{languages[0]}%"));
case FilterComparison.GreaterThan:
case FilterComparison.GreaterThanEqual:
case FilterComparison.LessThan:

16
API/Extensions/StringExtensions.cs
View file

@ -6,8 +6,9 @@ namespace API.Extensions;
public static class StringExtensions
{
private static readonly Regex SentenceCaseRegex = new Regex(@"(^[a-z])|\.\s+(.)",
RegexOptions.ExplicitCapture | RegexOptions.Compiled, Services.Tasks.Scanner.Parser.Parser.RegexTimeout);
private static readonly Regex SentenceCaseRegex = new(@"(^[a-z])|\.\s+(.)",
RegexOptions.ExplicitCapture | RegexOptions.Compiled,
Services.Tasks.Scanner.Parser.Parser.RegexTimeout);
public static string SentenceCase(this string value)
{
@ -21,17 +22,16 @@ public static class StringExtensions
/// <returns></returns>
public static string ToNormalized(this string? value)
{
if (string.IsNullOrEmpty(value)) return string.Empty;
return Services.Tasks.Scanner.Parser.Parser.Normalize(value);
return string.IsNullOrEmpty(value) ? string.Empty : Services.Tasks.Scanner.Parser.Parser.Normalize(value);
}
public static float AsFloat(this string value)
public static float AsFloat(this string? value, float defaultValue = 0.0f)
{
return float.Parse(value, CultureInfo.InvariantCulture);
return string.IsNullOrEmpty(value) ? defaultValue : float.Parse(value, CultureInfo.InvariantCulture);
}
public static double AsDouble(this string value)
public static double AsDouble(this string? value, double defaultValue = 0.0f)
{
return double.Parse(value, CultureInfo.InvariantCulture);
return string.IsNullOrEmpty(value) ? defaultValue : double.Parse(value, CultureInfo.InvariantCulture);
}
}