From ca3f756d578f42e7811133e2af5d626c7059e889 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 17 Nov 2020 09:42:22 +1300 Subject: [PATCH] assorted yml: add date TZ code tidy --- src/Jackett.Common/Definitions/r3vwtf.yml | 4 +++- src/Jackett.Common/Definitions/rapidzona.yml | 6 ++++-- src/Jackett.Common/Definitions/rintornet.yml | 4 +++- src/Jackett.Common/Definitions/rus-media.yml | 4 +++- src/Jackett.Common/Definitions/selezen.yml | 4 +++- src/Jackett.Common/Definitions/siambit.yml | 14 ++++++++------ src/Jackett.Common/Definitions/sosulki.yml | 6 ++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/Jackett.Common/Definitions/r3vwtf.yml b/src/Jackett.Common/Definitions/r3vwtf.yml index 782ed961a..4520f2fd7 100644 --- a/src/Jackett.Common/Definitions/r3vwtf.yml +++ b/src/Jackett.Common/Definitions/r3vwtf.yml @@ -102,8 +102,10 @@ search: selector: td:nth-last-child(6):not(:contains("day")) optional: true filters: + - name: append + args: " -07:00" # PDT - name: dateparse - args: "Jan 2 2006 03:04 PM" + args: "Jan 2 2006 03:04 PM -07:00" date: # Today 02:40 PM # Yesterday 09:10 AM diff --git a/src/Jackett.Common/Definitions/rapidzona.yml b/src/Jackett.Common/Definitions/rapidzona.yml index 6ac11d86d..877ea47a7 100644 --- a/src/Jackett.Common/Definitions/rapidzona.yml +++ b/src/Jackett.Common/Definitions/rapidzona.yml @@ -157,7 +157,7 @@ search: selector: h1 > a attribute: href size: - text: "500 MB" + text: "512 MB" seeders: text: 1 leechers: @@ -170,8 +170,10 @@ search: # 20/02/2020 18:34 - name: regexp args: "(\\d{1,2}\\/\\d{2}\\/\\d{4} \\d{1,2}\\:\\d{2})" + - name: append + args: " +03:00" # MSK - name: dateparse - args: "02/01/2006 15:04" + args: "02/01/2006 15:04 -07:00" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/rintornet.yml b/src/Jackett.Common/Definitions/rintornet.yml index 14e472b96..dee5a53e5 100644 --- a/src/Jackett.Common/Definitions/rintornet.yml +++ b/src/Jackett.Common/Definitions/rintornet.yml @@ -100,8 +100,10 @@ search: selector: span.entry__date:contains("-") optional: true filters: + - name: append + args: " +03:00" # MSK - name: dateparse - args: "2-01-2006, 15:04" + args: "2-01-2006, 15:04 -07:00" size: text: "1 GB" seeders: diff --git a/src/Jackett.Common/Definitions/rus-media.yml b/src/Jackett.Common/Definitions/rus-media.yml index 27b4f0657..311c0c35b 100644 --- a/src/Jackett.Common/Definitions/rus-media.yml +++ b/src/Jackett.Common/Definitions/rus-media.yml @@ -398,8 +398,10 @@ search: args: ["дек", "Dec"] - name: replace args: [",", ""] + - name: append + args: " +03:00" # MSK - name: dateparse - args: "02 Jan 2006 15:04" + args: "02 Jan 2006 15:04 -07:00" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/selezen.yml b/src/Jackett.Common/Definitions/selezen.yml index 4f955ef48..bff9ccba1 100644 --- a/src/Jackett.Common/Definitions/selezen.yml +++ b/src/Jackett.Common/Definitions/selezen.yml @@ -126,8 +126,10 @@ search: # 30.10.2019 14:49 - name: regexp args: "(\\d{1,2}\\.\\d{2}\\.\\d{4} \\d{1,2}\\:\\d{2})" + - name: append + args: " +03:00" # MSK - name: dateparse - args: "2.01.2006 15:04" + args: "2.01.2006 15:04 -07:00" seeders: selector: i.fa-arrow-up ~ span leechers: diff --git a/src/Jackett.Common/Definitions/siambit.yml b/src/Jackett.Common/Definitions/siambit.yml index 1cf6bd1f4..587049448 100644 --- a/src/Jackett.Common/Definitions/siambit.yml +++ b/src/Jackett.Common/Definitions/siambit.yml @@ -132,17 +132,17 @@ search: selector: "table[width=\"100%\"][border=1][cellspacing=0][cellpadding=5] > tbody > tr:has(a[href*=\"hashinfo=\"]){{ if .Config.freeleech }}:has(td:nth-child(3):contains(\"100%\")){{ else }}{{ end }}" fields: - title: - selector: a[href^="details.php?id="] - details: - selector: a[href^="details.php?id="] - attribute: href category: selector: a[href^="viewno18.php?cat="], a[href^="viewbr.php?cat="] attribute: href filters: - name: querystring args: cat + title: + selector: a[href^="details.php?id="] + details: + selector: a[href^="details.php?id="] + attribute: href download: selector: a[href^="details.php?id="] attribute: href @@ -154,8 +154,10 @@ search: date: selector: td:nth-child(7) filters: + - name: append + args: " +07:00" # ICT - name: dateparse - args: "02-01-200615:04:05" + args: "02-01-200615:04:05 -07:00" size: selector: td:nth-child(8) grabs: diff --git a/src/Jackett.Common/Definitions/sosulki.yml b/src/Jackett.Common/Definitions/sosulki.yml index c085763bd..c9d6a5f76 100644 --- a/src/Jackett.Common/Definitions/sosulki.yml +++ b/src/Jackett.Common/Definitions/sosulki.yml @@ -40,7 +40,7 @@ download: search: paths: - - path: "{{ if .Keywords }}?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story={{ .Keywords }}&titleonly=3catlist[]=0&searchdate=0&resorder=desc{{else}}lastnews/{{end}}" + - path: "{{ if .Keywords }}?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story={{ .Keywords }}&titleonly=3catlist[]=0&searchdate=0&resorder=desc{{ else }}lastnews/{{ end }}" rows: selector: tr.fr_viewn_in:has(td.frs:contains("B")) @@ -64,8 +64,10 @@ search: date: selector: i filters: + - name: append + args: " +03:00" # MSK - name: dateparse - args: "02-01-2006 15:04:05" + args: "02-01-2006 15:04:05 -07:00" size: selector: td.frs seeders: