shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

cardigann: invariant date string parsing (#14074)

Browse Source
This commit is contained in:
Bogdan
2023-02-25 23:00:15 +02:00
committed by GitHub
parent 37ff7ed991
commit f7e6884720
4 changed files with 115 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Jackett.Common/Extensions/StringExtensions.cs
View File

@@ -10,5 +10,18 @@ namespace Jackett.Common.Extensions
public static bool ContainsIgnoreCase(this string source, string contains) => source != null && contains != null && CultureInfo.InvariantCulture.CompareInfo.IndexOf(source, contains, CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace) >= 0; public static bool ContainsIgnoreCase(this string source, string contains) => source != null && contains != null && CultureInfo.InvariantCulture.CompareInfo.IndexOf(source, contains, CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace) >= 0;
public static bool ContainsIgnoreCase(this IEnumerable<string> source, string value) => source.Contains(value, StringComparer.InvariantCultureIgnoreCase); public static bool ContainsIgnoreCase(this IEnumerable<string> source, string value) => source.Contains(value, StringComparer.InvariantCultureIgnoreCase);
public static bool IsAllDigits(this string input)
{
foreach (var c in input)
{
if (c < '0' || c > '9')
{
return false;
}
}
return true;
}
} }
} }

19
src/Jackett.Common/Indexers/CardigannIndexer.cs
View File

@@ -1013,20 +1013,15 @@ namespace Jackett.Common.Indexers
case "dateparse": case "dateparse":
var layout = (string)Filter.Args; var layout = (string)Filter.Args;
if (layout.Contains("yy") && DateTime.TryParseExact(Data, layout, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDate))
Data = parsedDate.ToString(DateTimeUtil.Rfc1123ZPattern);
else
{
try try
{ {
var datetime = DateTimeUtil.ParseDateTimeGoLang(Data, layout); var datetime = DateTimeUtil.ParseDateTimeGoLang(Data, layout);
Data = datetime.ToString(DateTimeUtil.Rfc1123ZPattern); Data = datetime.ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture);
} }
catch (FormatException ex) catch (FormatException ex)
{ {
logger.Debug(ex.Message); logger.Debug(ex.Message);
} }
}
break; break;
case "regexp": case "regexp":
var pattern = (string)Filter.Args; var pattern = (string)Filter.Args;
@@ -1093,10 +1088,10 @@ namespace Jackett.Common.Indexers
break; break;
case "timeago": case "timeago":
case "reltime": case "reltime":
Data = DateTimeUtil.FromTimeAgo(Data).ToString(DateTimeUtil.Rfc1123ZPattern); Data = DateTimeUtil.FromTimeAgo(Data).ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture);
break; break;
case "fuzzytime": case "fuzzytime":
Data = DateTimeUtil.FromUnknown(Data).ToString(DateTimeUtil.Rfc1123ZPattern); Data = DateTimeUtil.FromUnknown(Data).ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture);
break; break;
case "validfilename": case "validfilename":
Data = StringUtil.MakeValidFileName(Data, '_', false); Data = StringUtil.MakeValidFileName(Data, '_', false);
@@ -1509,7 +1504,7 @@ namespace Jackett.Common.Indexers
variables[variablesKey] = null; variables[variablesKey] = null;
continue; continue;
} }
throw new Exception(string.Format("Error while parsing field={0}, selector={1}, value={2}: {3}", Field.Key, Field.Value.Selector, (value == null ? "<null>" : value), ex.Message)); throw new Exception($"Error while parsing field={Field.Key}, selector={Field.Value.Selector}, value={value ?? "<null>"}: {ex.Message}", ex);
} }
} }
@@ -1646,7 +1641,7 @@ namespace Jackett.Common.Indexers
variables[variablesKey] = null; variables[variablesKey] = null;
continue; continue;
} }
throw new Exception(string.Format("Error while parsing field={0}, selector={1}, value={2}: {3}", Field.Key, Field.Value.Selector, (value == null ? "<null>" : value), ex.Message)); throw new Exception($"Error while parsing field={Field.Key}, selector={Field.Value.Selector}, value={value ?? "<null>"}: {ex.Message}", ex);
} }
} }
@@ -2040,8 +2035,8 @@ namespace Jackett.Common.Indexers
value = release.Seeders.ToString(); value = release.Seeders.ToString();
break; break;
case "date": case "date":
release.PublishDate = DateTimeUtil.FromUnknown(value); release.PublishDate = DateTime.TryParseExact(value, DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDate) ? parsedDate : DateTimeUtil.FromUnknown(value);
value = release.PublishDate.ToString(DateTimeUtil.Rfc1123ZPattern); value = release.PublishDate.ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture);
break; break;
case "files": case "files":
release.Files = ParseUtil.CoerceLong(value); release.Files = ParseUtil.CoerceLong(value);

97
src/Jackett.Common/Utils/DateTimeUtil.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Jackett.Common.Extensions;
namespace Jackett.Common.Utils namespace Jackett.Common.Utils
{ {
@@ -117,7 +118,7 @@ namespace Jackett.Common.Utils
var now = relativeFrom ?? DateTime.Now; var now = relativeFrom ?? DateTime.Now;
// try parsing the str as an unix timestamp // try parsing the str as an unix timestamp
if (str.All(char.IsDigit) && long.TryParse(str, out var unixTimeStamp)) if (str.IsAllDigits() && long.TryParse(str, out var unixTimeStamp))
return UnixTimestampToDateTime(unixTimeStamp); return UnixTimestampToDateTime(unixTimeStamp);
if (str.ToLower().Contains("now")) if (str.ToLower().Contains("now"))
@@ -227,81 +228,87 @@ namespace Jackett.Common.Utils
var now = relativeFrom ?? DateTime.Now; var now = relativeFrom ?? DateTime.Now;
date = ParseUtil.NormalizeSpace(date); date = ParseUtil.NormalizeSpace(date);
var pattern = layout;
var commonStandardFormats = new[] { "y", "h", "d" };
if (commonStandardFormats.Any(layout.ContainsIgnoreCase) && DateTime.TryParseExact(date, layout, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDate))
return parsedDate;
var format = layout
// year // year
pattern = pattern.Replace("2006", "yyyy"); .Replace("2006", "yyyy")
pattern = pattern.Replace("06", "yy"); .Replace("06", "yy")
// month // month
pattern = pattern.Replace("January", "MMMM"); .Replace("January", "MMMM")
pattern = pattern.Replace("Jan", "MMM"); .Replace("Jan", "MMM")
pattern = pattern.Replace("01", "MM"); .Replace("01", "MM")
// day // day
pattern = pattern.Replace("Monday", "dddd"); .Replace("Monday", "dddd")
pattern = pattern.Replace("Mon", "ddd"); .Replace("Mon", "ddd")
pattern = pattern.Replace("02", "dd"); .Replace("02", "dd")
//pattern = pattern.Replace("_2", ""); // space padding not supported nativly by C#? //pattern = pattern.Replace("_2", "") // space padding not supported nativly by C#?
pattern = pattern.Replace("2", "d"); .Replace("2", "d")
// hours/minutes/seconds // hours/minutes/seconds
pattern = pattern.Replace("05", "ss"); .Replace("05", "ss")
pattern = pattern.Replace("15", "HH"); .Replace("15", "HH")
pattern = pattern.Replace("03", "hh"); .Replace("03", "hh")
pattern = pattern.Replace("3", "h"); .Replace("3", "h")
pattern = pattern.Replace("04", "mm"); .Replace("04", "mm")
pattern = pattern.Replace("4", "m"); .Replace("4", "m")
pattern = pattern.Replace("5", "s"); .Replace("5", "s")
// month again // month again
pattern = pattern.Replace("1", "M"); .Replace("1", "M")
// fractional seconds // fractional seconds
pattern = pattern.Replace(".0000", "ffff"); .Replace(".0000", "ffff")
pattern = pattern.Replace(".000", "fff"); .Replace(".000", "fff")
pattern = pattern.Replace(".00", "ff"); .Replace(".00", "ff")
pattern = pattern.Replace(".0", "f"); .Replace(".0", "f")
pattern = pattern.Replace(".9999", "FFFF"); .Replace(".9999", "FFFF")
pattern = pattern.Replace(".999", "FFF"); .Replace(".999", "FFF")
pattern = pattern.Replace(".99", "FF"); .Replace(".99", "FF")
pattern = pattern.Replace(".9", "F"); .Replace(".9", "F")
// AM/PM // AM/PM
pattern = pattern.Replace("PM", "tt"); .Replace("PM", "tt")
pattern = pattern.Replace("pm", "tt"); // not sure if this works .Replace("pm", "tt") // not sure if this works
// timezones // timezones
// these might need further tuning // these might need further tuning
//pattern = pattern.Replace("MST", ""); //pattern = pattern.Replace("MST", "")
//pattern = pattern.Replace("Z07:00:00", ""); //pattern = pattern.Replace("Z07:00:00", "")
pattern = pattern.Replace("Z07:00", "'Z'zzz"); .Replace("Z07:00", "'Z'zzz")
pattern = pattern.Replace("Z07", "'Z'zz"); .Replace("Z07", "'Z'zz")
//pattern = pattern.Replace("Z070000", ""); //pattern = pattern.Replace("Z070000", "")
//pattern = pattern.Replace("Z0700", ""); //pattern = pattern.Replace("Z0700", "")
pattern = pattern.Replace("Z07:00", "'Z'zzz"); .Replace("Z07:00", "'Z'zzz")
pattern = pattern.Replace("Z07", "'Z'zz"); .Replace("Z07", "'Z'zz")
//pattern = pattern.Replace("-07:00:00", ""); //pattern = pattern.Replace("-07:00:00", "")
pattern = pattern.Replace("-07:00", "zzz"); .Replace("-07:00", "zzz")
//pattern = pattern.Replace("-0700", "zz"); //pattern = pattern.Replace("-0700", "zz")
pattern = pattern.Replace("-07", "zz"); .Replace("-07", "zz");
try try
{ {
var dateTime = DateTime.ParseExact(date, pattern, CultureInfo.InvariantCulture); var dateTime = DateTime.ParseExact(date, format, CultureInfo.InvariantCulture);
if (!pattern.Contains("yy") && dateTime > now) if (!format.Contains("yy") && dateTime > now)
dateTime = dateTime.AddYears(-1); dateTime = dateTime.AddYears(-1);
return dateTime; return dateTime;
} }
catch (FormatException ex) catch (FormatException ex)
{ {
throw new FormatException($"Error while parsing DateTime \"{date}\", using layout \"{layout}\" ({pattern}): {ex.Message}", ex); throw new FormatException($"Error while parsing DateTime \"{date}\", using layout \"{layout}\" ({format}): {ex.Message}", ex);
} }
} }

28
src/Jackett.Test/Common/Utils/DateTimeUtilTests.cs
View File

@@ -1,5 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Threading;
using Jackett.Common.Utils; using Jackett.Common.Utils;
using NUnit.Framework; using NUnit.Framework;
@@ -178,5 +180,31 @@ namespace Jackett.Test.Common.Utils
var diff = Math.Abs((dt1 - dt2).TotalSeconds); var diff = Math.Abs((dt1 - dt2).TotalSeconds);
Assert.True(diff < delta, $"Dates are not similar. Expected: {dt1} But was: {dt2}"); Assert.True(diff < delta, $"Dates are not similar. Expected: {dt1} But was: {dt2}");
} }
[TestCase("pt-BR")]
[TestCase("en-US")]
public void AssertFormattingDatesInvariant(string culture)
{
Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
var dateNow = DateTime.Now;
Assert.AreEqual(
dateNow.ToString("ddd, dd MMM yyyy HH':'mm':'ss z", CultureInfo.InvariantCulture),
DateTimeUtil.FromUnknown(dateNow.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture)).ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture));
}
[TestCase("2022-08-08 02:07:39 -02:00", "2006-01-02 15:04:05 -07:00", "yyyy-MM-dd HH:mm:ss zzz", "2022-08-08 04:07:39 +00:00")]
[TestCase("2022-08-08 02:07:39 -02:00", "yyyy-MM-dd HH:mm:ss zzz", "yyyy-MM-dd HH:mm:ss zzz", "2022-08-08 04:07:39 +00:00")]
[TestCase("2022-08-08 -02:00", "2006-01-02 -07:00", "yyyy-MM-dd zzz", "2022-08-08 +00:00")]
[TestCase("2022-08-08 -02:00", "yyyy-MM-dd zzz", "yyyy-MM-dd zzz", "2022-08-08 +00:00")]
[TestCase("02:07:39 -02:00", "15:04:05 -07:00", "HH:mm:ss zzz", "04:07:39 +00:00")]
[TestCase("02:07:39 -02:00", "HH:mm:ss zzz", "HH:mm:ss zzz", "04:07:39 +00:00")]
[TestCase("-02:00", "zzz", "zzz", "+00:00")]
[TestCase("-02:00", "-07:00", "zzz", "+00:00")]
public void AssertParsingDateTimeGolang(string dateInput, string format, string standardFormat, string expectedDate)
{
Assert.AreEqual(expectedDate, DateTimeUtil.ParseDateTimeGoLang(dateInput, format).ToUniversalTime().ToString(standardFormat, CultureInfo.InvariantCulture));
}
} }
} }