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

Polish Part 3 (#2424)

Browse source
This commit is contained in:
Joe Milazzo 2023-11-10 07:56:30 -06:00 • committed by GitHub
parent a018d6828e
commit 944830ca73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 518 additions and 493 deletions
Download patch file Download diff file Expand all files Collapse all files

8
API/Data/ManualMigrations/MigrateSmartFilterEncoding.cs
View file

@ -27,7 +27,7 @@ public static class MigrateSmartFilterEncoding
var smartFilters = dataContext.AppUserSmartFilter.ToList();
foreach (var filter in smartFilters)
{
if (filter.Filter.Contains(SmartFilterHelper.StatementSeparator)) continue;
if (!ShouldMigrateFilter(filter.Filter)) continue;
var decode = EncodeFix(filter.Filter);
if (string.IsNullOrEmpty(decode)) continue;
filter.Filter = decode;
@ -41,6 +41,11 @@ public static class MigrateSmartFilterEncoding
logger.LogCritical("Running MigrateSmartFilterEncoding migration - Completed. This is not an error");
}
public static bool ShouldMigrateFilter(string filter)
{
return !string.IsNullOrEmpty(filter) && !(filter.Contains(SmartFilterHelper.StatementSeparator) || Uri.UnescapeDataString(filter).Contains(SmartFilterHelper.StatementSeparator));
}
public static string EncodeFix(string encodedFilter)
{
var statements = StatementsRegex.Matches(encodedFilter)
@ -67,6 +72,7 @@ public static class MigrateSmartFilterEncoding
return $"sortField={sortFieldValue}{SmartFilterHelper.InnerStatementSeparator}isAscending={isAscendingValue}";
});
//name=Zero&sortOptions=sortField=2&isAscending=False&limitTo=0&combination=1
var filterDto = SmartFilterHelper.Decode(noStmt);
// Now we just parse each individual stmt into the core components and add to statements