mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

core: improve fuzzytime date parser to handle week days. resolves #6832 (#6845) 

Previous version works well with dates like "Yesterday 15:30" or "Today 15:30"
Now it can handle "Monday 15:30" as well (means last Monday at 15:30 h)
This commit is contained in:
Diego Heras 2020-01-06 18:34:57 +01:00 committed by garfield69
parent ab55c6af7c
commit 603001a75c
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,7 @@ namespace Jackett.Common.Utils
public static Regex todayRegexp = new Regex(@"(?i)\btoday([\s,]*|$)", RegexOptions.Compiled);
public static Regex tomorrowRegexp = new Regex(@"(?i)\btomorrow([\s,]*|$)", RegexOptions.Compiled);
public static Regex yesterdayRegexp = new Regex(@"(?i)\byesterday([\s,]*|$)", RegexOptions.Compiled);
public static Regex daysOfWeekRegexp = new Regex(@"(?i)\b(monday|tuesday|wednesday|thursday|friday|saturday|sunday)([\s,]*|$)", RegexOptions.Compiled);
public static Regex missingYearRegexp = new Regex(@"^(\d{1,2}-\d{1,2})(\s|$)", RegexOptions.Compiled);
public static Regex missingYearRegexp2 = new Regex(@"^(\d{1,2}\s+\w{3})\s+(\d{1,2}\:\d{1,2}.*)$", RegexOptions.Compiled); // 1 Jan 10:30
@ -177,6 +178,36 @@ namespace Jackett.Common.Utils
return dt;
}
// Days of the week ...
match = daysOfWeekRegexp.Match(str);
if (match.Success)
{
var time = str.Replace(match.Groups[0].Value, "");
DateTime dt = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified);
dt += ParseTimeSpan(time);
var dow = DayOfWeek.Monday;
var groupMatchLower = match.Groups[0].Value.ToLower();
if (groupMatchLower.StartsWith("monday"))
dow = DayOfWeek.Monday;
else if (groupMatchLower.StartsWith("tuesday"))
dow = DayOfWeek.Tuesday;
else if (groupMatchLower.StartsWith("wednesday"))
dow = DayOfWeek.Wednesday;
else if (groupMatchLower.StartsWith("thursday"))
dow = DayOfWeek.Thursday;
else if (groupMatchLower.StartsWith("friday"))
dow = DayOfWeek.Friday;
else if (groupMatchLower.StartsWith("saturday"))
dow = DayOfWeek.Saturday;
else
dow = DayOfWeek.Sunday;
while (dt.DayOfWeek != dow)
dt = dt.AddDays(-1);
return dt;
}
try
{
// try parsing the str as an unix timestamp