mirror of https://github.com/Jackett/Jackett
parent
dcda239b3f
commit
9565469559
|
@ -314,20 +314,6 @@
|
||||||
args: ["Added ", ""]
|
args: ["Added ", ""]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["on ", ""]
|
args: ["on ", ""]
|
||||||
- name: replace
|
|
||||||
args: ["Monday", "Mon"]
|
|
||||||
- name: replace
|
|
||||||
args: ["Tuesday", "Tue"]
|
|
||||||
- name: replace
|
|
||||||
args: ["Wesnesday", "Wed"]
|
|
||||||
- name: replace
|
|
||||||
args: ["Thursday", "Thu"]
|
|
||||||
- name: replace
|
|
||||||
args: ["Friday", "Fri"]
|
|
||||||
- name: replace
|
|
||||||
args: ["Saturday", "Sat"]
|
|
||||||
- name: replace
|
|
||||||
args: ["Sunday", "Sun"]
|
|
||||||
|
|
||||||
fields:
|
fields:
|
||||||
title:
|
title:
|
||||||
|
|
|
@ -159,22 +159,22 @@
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Hoy en", "Today"]
|
args: ["Hoy en", "Today"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Lunes a", "Monday"]
|
args: ["Lunes a", "Monday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Martes a", "Tuesday"]
|
args: ["Martes a", "Tuesday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Miércoles a", "Wednesday"]
|
args: ["Miércoles a", "Wednesday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Jueves a", "Thursday"]
|
args: ["Jueves a", "Thursday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Viernes a", "Friday"]
|
args: ["Viernes a", "Friday at"]
|
||||||
- name: replace # WTF?
|
- name: replace # WTF?
|
||||||
args: ["Friday a", "Friday"]
|
args: ["Friday a", "Friday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Sábado a", "Saturday"]
|
args: ["Sábado a", "Saturday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Domingo a", "Sunday"]
|
args: ["Domingo a", "Sunday at"]
|
||||||
- name: fuzzytime
|
- name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
|
||||||
date:
|
date:
|
||||||
selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
|
selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
|
||||||
optional: true
|
optional: true
|
||||||
|
@ -190,8 +190,10 @@
|
||||||
- name: regexp
|
- name: regexp
|
||||||
args: "(?<=Uploaded )(.*)(?= by)"
|
args: "(?<=Uploaded )(.*)(?= by)"
|
||||||
- name: replace
|
- name: replace
|
||||||
args: [" at ", " "]
|
args: ["Yesterday at", "Yesterday"]
|
||||||
- name: fuzzytime
|
- name: replace
|
||||||
|
args: ["Today at", "Today"]
|
||||||
|
- name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
|
||||||
size:
|
size:
|
||||||
selector: td.size a, .torrentInfo a[rel="torrent_size"]
|
selector: td.size a, .torrentInfo a[rel="torrent_size"]
|
||||||
grabs:
|
grabs:
|
||||||
|
|
|
@ -185,22 +185,22 @@
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Hoy en", "Today"]
|
args: ["Hoy en", "Today"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Lunes a", "Monday"]
|
args: ["Lunes a", "Monday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Martes a", "Tuesday"]
|
args: ["Martes a", "Tuesday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Miércoles a", "Wednesday"]
|
args: ["Miércoles a", "Wednesday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Jueves a", "Thursday"]
|
args: ["Jueves a", "Thursday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Viernes a", "Friday"]
|
args: ["Viernes a", "Friday at"]
|
||||||
- name: replace # WTF?
|
- name: replace # WTF?
|
||||||
args: ["Friday a", "Friday"]
|
args: ["Friday a", "Friday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Sábado a", "Saturday"]
|
args: ["Sábado a", "Saturday at"]
|
||||||
- name: replace
|
- name: replace
|
||||||
args: ["Domingo a", "Sunday"]
|
args: ["Domingo a", "Sunday at"]
|
||||||
- name: fuzzytime
|
- name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
|
||||||
date:
|
date:
|
||||||
selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
|
selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
|
||||||
optional: true
|
optional: true
|
||||||
|
@ -216,8 +216,10 @@
|
||||||
- name: regexp
|
- name: regexp
|
||||||
args: "(?<=Uploaded )(.*)(?= by)"
|
args: "(?<=Uploaded )(.*)(?= by)"
|
||||||
- name: replace
|
- name: replace
|
||||||
args: [" at ", " "]
|
args: ["Yesterday at", "Yesterday"]
|
||||||
- name: fuzzytime
|
- name: replace
|
||||||
|
args: ["Today at", "Today"]
|
||||||
|
- name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
|
||||||
size:
|
size:
|
||||||
selector: td.size a, .torrentInfo a[rel="torrent_size"]
|
selector: td.size a, .torrentInfo a[rel="torrent_size"]
|
||||||
grabs:
|
grabs:
|
||||||
|
|
|
@ -123,7 +123,7 @@ namespace Jackett.Common.Utils
|
||||||
public static Regex todayRegexp = new Regex(@"(?i)\btoday([\s,]*|$)", RegexOptions.Compiled);
|
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 tomorrowRegexp = new Regex(@"(?i)\btomorrow([\s,]*|$)", RegexOptions.Compiled);
|
||||||
public static Regex yesterdayRegexp = new Regex(@"(?i)\byesterday([\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 daysOfWeekRegexp = new Regex(@"(?i)\b(monday|tuesday|wednesday|thursday|friday|saturday|sunday)\s+at\s+", RegexOptions.Compiled);
|
||||||
public static Regex missingYearRegexp = new Regex(@"^(\d{1,2}-\d{1,2})(\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
|
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
|
||||||
|
|
||||||
|
@ -178,7 +178,7 @@ namespace Jackett.Common.Utils
|
||||||
return dt;
|
return dt;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Days of the week ...
|
// [day of the week] at ... (eg: Saturday at 14:22)
|
||||||
match = daysOfWeekRegexp.Match(str);
|
match = daysOfWeekRegexp.Match(str);
|
||||||
if (match.Success)
|
if (match.Success)
|
||||||
{
|
{
|
||||||
|
@ -187,7 +187,7 @@ namespace Jackett.Common.Utils
|
||||||
dt += ParseTimeSpan(time);
|
dt += ParseTimeSpan(time);
|
||||||
|
|
||||||
var dow = DayOfWeek.Monday;
|
var dow = DayOfWeek.Monday;
|
||||||
var groupMatchLower = match.Groups[0].Value.ToLower();
|
var groupMatchLower = match.Groups[1].Value.ToLower();
|
||||||
if (groupMatchLower.StartsWith("monday"))
|
if (groupMatchLower.StartsWith("monday"))
|
||||||
dow = DayOfWeek.Monday;
|
dow = DayOfWeek.Monday;
|
||||||
else if (groupMatchLower.StartsWith("tuesday"))
|
else if (groupMatchLower.StartsWith("tuesday"))
|
||||||
|
|
Loading…
Reference in New Issue