mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2025-01-02 21:26:08 +00:00
Code Issues Releases Wiki Activity

POC: avoid relative time in timeago if using units greater than days

Browse source
This commit is contained in:
Bogdan 2024-10-08 15:00:45 +03:00
parent 816aba718e
commit 4b1d77eed7
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Jackett.Common/Utils/DateTimeUtil.cs
View file

@ -50,7 +50,9 @@ namespace Jackett.Common.Utils
var now = relativeFrom ?? DateTime.Now;
if (str.Contains("now"))
{
return DateTime.SpecifyKind(now, DateTimeKind.Local);
}
str = str.Replace(",", "");
str = str.Replace("ago", "");
@ -67,22 +69,43 @@ namespace Jackett.Common.Utils
timeAgoMatches = timeAgoMatches.NextMatch();
if (unit.Contains("sec") || unit == "s")
{
timeAgo += TimeSpan.FromSeconds(val);
}
else if (unit.Contains("min") || unit == "m")
{
timeAgo += TimeSpan.FromMinutes(val);
}
else if (unit.Contains("hour") || unit.Contains("hr") || unit == "h")
{
timeAgo += TimeSpan.FromHours(val);
}
else if (unit.Contains("day") || unit == "d")
{
timeAgo += TimeSpan.FromDays(val);
}
else if (unit.Contains("week") || unit.Contains("wk") || unit == "w")
{
timeAgo += TimeSpan.FromDays(val * 7);
}
else if (unit.Contains("month") || unit == "mo")
{
timeAgo += TimeSpan.FromDays(val * 30);
}
else if (unit.Contains("year") || unit == "y")
{
timeAgo += TimeSpan.FromDays(val * 365);
}
else
{
throw new Exception("TimeAgo parsing failed, unknown unit: " + unit);
}
}
if (timeAgo is { TotalDays: > 0, Hours: 0, Minutes: 0, Seconds: 0, Milliseconds: 0 })
{
now = new DateTime(now.Year, now.Month, now.Day);
}
return DateTime.SpecifyKind(now - timeAgo, DateTimeKind.Local);
}

9
src/Jackett.Test/Common/Utils/DateTimeUtilTests.cs
View file

@ -34,16 +34,17 @@ namespace Jackett.Test.Common.Utils
public void FromTimeAgoTest()
{
var now = DateTime.Now;
var nowDateOnly = new DateTime(now.Year, now.Month, now.Day, 0, 0, 0, 0);
AssertSimilarDates(now, DateTimeUtil.FromTimeAgo("NOW")); // case insensitive
AssertSimilarDates(now, DateTimeUtil.FromTimeAgo("now"));
AssertSimilarDates(now.AddSeconds(-1), DateTimeUtil.FromTimeAgo("1 sec"));
AssertSimilarDates(now.AddMinutes(-12), DateTimeUtil.FromTimeAgo("12 min ago"));
AssertSimilarDates(now.AddHours(-20), DateTimeUtil.FromTimeAgo("20 h"));
AssertSimilarDates(now.AddDays(-3), DateTimeUtil.FromTimeAgo("3 days"));
AssertSimilarDates(now.AddDays(-7), DateTimeUtil.FromTimeAgo("1 week"));
AssertSimilarDates(now.AddDays(-60), DateTimeUtil.FromTimeAgo("2 month ago"));
AssertSimilarDates(now.AddDays(-365), DateTimeUtil.FromTimeAgo("1 year"));
AssertSimilarDates(nowDateOnly.AddDays(-3), DateTimeUtil.FromTimeAgo("3 days"));
AssertSimilarDates(nowDateOnly.AddDays(-7), DateTimeUtil.FromTimeAgo("1 week"));
AssertSimilarDates(nowDateOnly.AddDays(-60), DateTimeUtil.FromTimeAgo("2 month ago"));
AssertSimilarDates(nowDateOnly.AddDays(-365), DateTimeUtil.FromTimeAgo("1 year"));
AssertSimilarDates(now.AddHours(-20).AddMinutes(-15), DateTimeUtil.FromTimeAgo("20 hours and 15 minutes ago"));
AssertSimilarDates(now, DateTimeUtil.FromTimeAgo(""));