diff --git a/src/Jackett.Common/Definitions/1ptbar.yml b/src/Jackett.Common/Definitions/1ptbar.yml index cc9fb47c8..7b412d316 100644 --- a/src/Jackett.Common/Definitions/1ptbar.yml +++ b/src/Jackett.Common/Definitions/1ptbar.yml @@ -110,7 +110,7 @@ search: download: selector: a[href^="download.php?id="] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href date_elapsed: diff --git a/src/Jackett.Common/Definitions/52pt.yml b/src/Jackett.Common/Definitions/52pt.yml index df2efb675..03b9ff486 100644 --- a/src/Jackett.Common/Definitions/52pt.yml +++ b/src/Jackett.Common/Definitions/52pt.yml @@ -113,7 +113,7 @@ search: download: selector: a[href^="download.php?id="] attribute: href - imdb: + imdbid: selector: div.imdb_100 > a attribute: href date_elapsed: diff --git a/src/Jackett.Common/Definitions/aftershock.yml b/src/Jackett.Common/Definitions/aftershock.yml index 179f30709..68fbc5be7 100644 --- a/src/Jackett.Common/Definitions/aftershock.yml +++ b/src/Jackett.Common/Definitions/aftershock.yml @@ -143,7 +143,7 @@ search: filters: - name: regexp args: "src=(.*?) width=" - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href files: diff --git a/src/Jackett.Common/Definitions/anaschcc.yml b/src/Jackett.Common/Definitions/anaschcc.yml index 2243b2f3e..69f8665cc 100644 --- a/src/Jackett.Common/Definitions/anaschcc.yml +++ b/src/Jackett.Common/Definitions/anaschcc.yml @@ -104,7 +104,7 @@ search: download: selector: td a[href^="download.php"] attribute: href - imdb: + imdbid: selector: a[href^="index.php?page=torrent-details"] attribute: onmouseover filters: diff --git a/src/Jackett.Common/Definitions/asiancinema.yml b/src/Jackett.Common/Definitions/asiancinema.yml index 0a0181801..b40438f54 100644 --- a/src/Jackett.Common/Definitions/asiancinema.yml +++ b/src/Jackett.Common/Definitions/asiancinema.yml @@ -122,7 +122,7 @@ search: selector: td:nth-last-child(2) grabs: selector: td:nth-last-child(1) - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href tmdbid: diff --git a/src/Jackett.Common/Definitions/beitai.yml b/src/Jackett.Common/Definitions/beitai.yml index d5690c6bf..9f3390aba 100644 --- a/src/Jackett.Common/Definitions/beitai.yml +++ b/src/Jackett.Common/Definitions/beitai.yml @@ -115,7 +115,7 @@ search: download: selector: a[href^="download.php?id="] attribute: href - imdb: + imdbid: selector: div.imdb_100 > a attribute: href date_elapsed: diff --git a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml index 276582ebf..54361b832 100644 --- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml +++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml @@ -96,7 +96,7 @@ search: selector: a[href$="/peers"] span.text-red grabs: selector: a[href$="/history"] - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href tmdbid: diff --git a/src/Jackett.Common/Definitions/brasiltracker.yml b/src/Jackett.Common/Definitions/brasiltracker.yml index bfaf19412..9587d1804 100644 --- a/src/Jackett.Common/Definitions/brasiltracker.yml +++ b/src/Jackett.Common/Definitions/brasiltracker.yml @@ -97,7 +97,7 @@ search: poster: selector: img[alt="Cover"] attribute: src - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href files: diff --git a/src/Jackett.Common/Definitions/btnext.yml b/src/Jackett.Common/Definitions/btnext.yml index 795b65023..2ba60f645 100644 --- a/src/Jackett.Common/Definitions/btnext.yml +++ b/src/Jackett.Common/Definitions/btnext.yml @@ -202,15 +202,13 @@ search: poster: selector: a[rel="fancybox"] attribute: href - imdb: + imdbid: # a href="http://tracker.btnext.com/data/torrents/imdb/tt0249677.jpg" selector: a[href*="/imdb/tt"] attribute: href filters: - name: regexp - args: "imdb/(.+?).jpg" - - name: prepend - args: "https://www.imdb.com/title/" + args: tt(\d+) downloadvolumefactor: case: "img[title=\"FREE!\"]": 0 diff --git a/src/Jackett.Common/Definitions/carpathians.yml b/src/Jackett.Common/Definitions/carpathians.yml index d1b1b0cdd..3b37f6b55 100644 --- a/src/Jackett.Common/Definitions/carpathians.yml +++ b/src/Jackett.Common/Definitions/carpathians.yml @@ -112,7 +112,7 @@ search: details: selector: a[id][href^="details.php?"] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href poster: diff --git a/src/Jackett.Common/Definitions/carphunter.yml b/src/Jackett.Common/Definitions/carphunter.yml index 9239f3207..c32177319 100644 --- a/src/Jackett.Common/Definitions/carphunter.yml +++ b/src/Jackett.Common/Definitions/carphunter.yml @@ -129,7 +129,7 @@ search: filters: - name: replace args: ["/details", "/download"] - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href poster: diff --git a/src/Jackett.Common/Definitions/ccfbits.yml b/src/Jackett.Common/Definitions/ccfbits.yml index 628d2f08a..fbed94b2d 100644 --- a/src/Jackett.Common/Definitions/ccfbits.yml +++ b/src/Jackett.Common/Definitions/ccfbits.yml @@ -112,7 +112,7 @@ search: download: selector: a[href^="download.php/"] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href files: diff --git a/src/Jackett.Common/Definitions/ceskeforum.yml b/src/Jackett.Common/Definitions/ceskeforum.yml index 333d8e592..54fb77f5c 100644 --- a/src/Jackett.Common/Definitions/ceskeforum.yml +++ b/src/Jackett.Common/Definitions/ceskeforum.yml @@ -121,7 +121,7 @@ search: download: selector: a[href^="download.php?id="] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href date_elapsed: diff --git a/src/Jackett.Common/Definitions/chilebt.yml b/src/Jackett.Common/Definitions/chilebt.yml index 8d43e3bc7..045371c6e 100644 --- a/src/Jackett.Common/Definitions/chilebt.yml +++ b/src/Jackett.Common/Definitions/chilebt.yml @@ -132,7 +132,7 @@ search: selector: td:nth-last-child(2) grabs: selector: td:nth-last-child(1) - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href tmdbid: diff --git a/src/Jackett.Common/Definitions/cinemageddon.yml b/src/Jackett.Common/Definitions/cinemageddon.yml index 7522a3e3d..14930ea4c 100644 --- a/src/Jackett.Common/Definitions/cinemageddon.yml +++ b/src/Jackett.Common/Definitions/cinemageddon.yml @@ -75,7 +75,7 @@ search: download: selector: a[href*="download.php?id="] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href date: diff --git a/src/Jackett.Common/Definitions/cinemamovies.yml b/src/Jackett.Common/Definitions/cinemamovies.yml index 9132cfe66..284e149c1 100644 --- a/src/Jackett.Common/Definitions/cinemamovies.yml +++ b/src/Jackett.Common/Definitions/cinemamovies.yml @@ -144,7 +144,7 @@ search: filters: - name: regexp args: "src=(.+?) " - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href description: diff --git a/src/Jackett.Common/Definitions/diablotorrent.yml b/src/Jackett.Common/Definitions/diablotorrent.yml index 41b565705..4e13af5af 100644 --- a/src/Jackett.Common/Definitions/diablotorrent.yml +++ b/src/Jackett.Common/Definitions/diablotorrent.yml @@ -126,7 +126,7 @@ search: filters: - name: regexp args: src='(.*?)' - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href description: diff --git a/src/Jackett.Common/Definitions/discfan.yml b/src/Jackett.Common/Definitions/discfan.yml index 528e940b0..44cdb2502 100644 --- a/src/Jackett.Common/Definitions/discfan.yml +++ b/src/Jackett.Common/Definitions/discfan.yml @@ -127,7 +127,7 @@ search: download: selector: a[href^="download.php?id="] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href date_elapsed: diff --git a/src/Jackett.Common/Definitions/ebookparadijs.yml b/src/Jackett.Common/Definitions/ebookparadijs.yml index b9917e140..ef562344e 100644 --- a/src/Jackett.Common/Definitions/ebookparadijs.yml +++ b/src/Jackett.Common/Definitions/ebookparadijs.yml @@ -159,16 +159,16 @@ search: args: " +01:00" # CET - name: dateparse args: "2 January 2006 15:04:05 -07:00" - seeders: - text: 0 - seeders: + seeders_optional: optional: true selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font b - leechers: - text: 0 - leechers: + seeders: + text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}" + leechers_optional: optional: true selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b + leechers: + text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}" downloadvolumefactor: case: img[src="pic/freedlfsu.gif"]: 0 diff --git a/src/Jackett.Common/Definitions/elitetorrent-biz.yml b/src/Jackett.Common/Definitions/elitetorrent-biz.yml index 108041368..08b920715 100644 --- a/src/Jackett.Common/Definitions/elitetorrent-biz.yml +++ b/src/Jackett.Common/Definitions/elitetorrent-biz.yml @@ -130,14 +130,14 @@ search: poster: selector: .imagen img attribute: data-src - size: - text: "512 MB" - size: + size_optional: selector: .voto1 optional: true filters: - name: replace args: ["s", ""] + size: + text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}512 MB{{ end }}" date: text: now seeders: diff --git a/src/Jackett.Common/Definitions/esharenet.yml b/src/Jackett.Common/Definitions/esharenet.yml index 1774e2b02..ddcfeb725 100644 --- a/src/Jackett.Common/Definitions/esharenet.yml +++ b/src/Jackett.Common/Definitions/esharenet.yml @@ -150,7 +150,7 @@ search: selector: td:nth-last-child(2) grabs: selector: td:nth-last-child(1) - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href tmdbid: diff --git a/src/Jackett.Common/Definitions/extratorrent-cd.yml b/src/Jackett.Common/Definitions/extratorrent-cd.yml index ca25532aa..cc3fe104f 100644 --- a/src/Jackett.Common/Definitions/extratorrent-cd.yml +++ b/src/Jackett.Common/Definitions/extratorrent-cd.yml @@ -62,7 +62,7 @@ search: download: selector: a[href^="magnet:?xt="] attribute: href - date: + date_day: # Y-day-2020 (seriously!?!, like there's a Y-day-2019 ?) # Today-22:03 selector: td:nth-last-of-type(5):contains("day") @@ -75,7 +75,7 @@ search: - name: re_replace args: ["(Y-day-.*)", "Yesterday"] - name: fuzzytime - date: + date_year: # 12-27-2019 selector: td:nth-last-of-type(5):not(:contains(":")):not(:contains("day")):not(:contains("ago")) optional: true @@ -86,7 +86,7 @@ search: args: " -07:00" # PDT - name: dateparse args: "01-02-2006 -07:00" - date: + date_ago: # 4-mins-ago selector: td:nth-last-of-type(5):contains("ago") optional: true @@ -96,18 +96,20 @@ search: - name: replace args: ["-", " "] - name: timeago + date: + text: "{{ if or .Result.date_year .Result.date_day .Result.date_ago }}{{ or .Result.date_year .Result.date_day .Result.date_ago }}{{ else }}now{{ end }}" size: selector: td:nth-last-of-type(4) - seeders: - text: 0 - seeders: + seeders_optional: optional: true selector: td.sy, td.sn - leechers: - text: 0 - leechers: + seeders: + text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}" + leechers_optional: optional: true selector: td.ly, td.ln + leechers: + text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/extratorrent-st.yml b/src/Jackett.Common/Definitions/extratorrent-st.yml index ace5db716..65f7f3732 100644 --- a/src/Jackett.Common/Definitions/extratorrent-st.yml +++ b/src/Jackett.Common/Definitions/extratorrent-st.yml @@ -109,16 +109,16 @@ search: - name: timeago size: selector: td:nth-last-of-type(4) - seeders: - text: 0 - seeders: + seeders_optional: optional: true selector: td.sy, td.sn - leechers: - text: 0 - leechers: + seeders: + text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}" + leechers_optional: optional: true selector: td.ly, td.ln + leechers: + text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/extremetorrents.yml b/src/Jackett.Common/Definitions/extremetorrents.yml index fa828411c..6baaa8ab1 100644 --- a/src/Jackett.Common/Definitions/extremetorrents.yml +++ b/src/Jackett.Common/Definitions/extremetorrents.yml @@ -168,16 +168,16 @@ search: args: " +01:00" # CET - name: dateparse args: "2 January 2006 15:04:05 -07:00" - seeders: - text: 0 - seeders: + seeders_optional: optional: true selector: table tr:nth-child(3) td:nth-child(5) font b - leechers: - text: 0 - leechers: + seeders: + text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}" + leechers_optional: optional: true selector: table tr:nth-child(3) td:nth-child(5) font b:nth-child(2) + leechers: + text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/extremlymtorrents.yml b/src/Jackett.Common/Definitions/extremlymtorrents.yml index be71e4069..09bc2c2b0 100644 --- a/src/Jackett.Common/Definitions/extremlymtorrents.yml +++ b/src/Jackett.Common/Definitions/extremlymtorrents.yml @@ -130,7 +130,6 @@ search: language: selector: td:nth-last-child(5) description: - optional: true selector: img[src="/images/vip-icon.png"] attribute: src filters: diff --git a/src/Jackett.Common/Definitions/exttorrents.yml b/src/Jackett.Common/Definitions/exttorrents.yml index 4cdb7ede7..24566dbf3 100644 --- a/src/Jackett.Common/Definitions/exttorrents.yml +++ b/src/Jackett.Common/Definitions/exttorrents.yml @@ -129,11 +129,11 @@ search: attribute: href size: selector: td:nth-child(2) - files: - text: 0 - files: + files_optional: selector: td:nth-child(3) optional: true + files: + text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}0{{ end }}" date: selector: td:nth-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/eztv.yml b/src/Jackett.Common/Definitions/eztv.yml index dccc9bfd2..7b7986dd9 100644 --- a/src/Jackett.Common/Definitions/eztv.yml +++ b/src/Jackett.Common/Definitions/eztv.yml @@ -64,13 +64,16 @@ settings: [] search: paths: - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}/{{ end }}" + keywordsfilters: - name: re_replace args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it) + rows: selector: "table.forum_header_border tr[name='hover'].forum_header_border:has(a.magnet)" # some torrents don't have any download links, skip them filters: - name: andmatch + fields: category: text: 1 @@ -89,11 +92,11 @@ search: download: selector: td:nth-child(3) a.magnet, td:nth-child(3) a attribute: href - size: - text: "512 MB" - size: + size_optional: optional: true selector: td:nth-child(4) + size: + text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}512 MB{{ end }}" date: selector: td:nth-child(5) filters: diff --git a/src/Jackett.Common/Definitions/fanoin.yml b/src/Jackett.Common/Definitions/fanoin.yml index 5383b46be..0828acf06 100644 --- a/src/Jackett.Common/Definitions/fanoin.yml +++ b/src/Jackett.Common/Definitions/fanoin.yml @@ -125,7 +125,7 @@ search: filters: - name: replace args: ["details.php", "download.php"] - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href size: diff --git a/src/Jackett.Common/Definitions/fantastiko.yml b/src/Jackett.Common/Definitions/fantastiko.yml index 9b52c7b69..9945a090c 100644 --- a/src/Jackett.Common/Definitions/fantastiko.yml +++ b/src/Jackett.Common/Definitions/fantastiko.yml @@ -128,7 +128,7 @@ search: download: selector: a[href*="?p=torrents"][href*="&action=download"] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href size: @@ -148,7 +148,7 @@ search: "*": 1 uploadvolumefactor: text: 1 - date: + date_day: optional: true selector: td.torrent_name:contains("day"), td.torrent_name:contains("σήμερα"), td.torrent_name:contains("εχθές"), td.torrent_name:contains("Δευτέρα"), td.torrent_name:contains("Τρίτη"), td.torrent_name:contains("Τετάρτη"), td.torrent_name:contains("Πέμπτη"), td.torrent_name:contains("Παρασκευή"), td.torrent_name:contains("Σάββατο"), td.torrent_name:contains("Κυριακή") remove: span, a @@ -184,7 +184,7 @@ search: - name: replace args: ["Κυριακή", "Sunday"] - name: fuzzytime - date: + date_year: optional: true selector: td.torrent_name:contains("-") remove: span, a @@ -207,6 +207,8 @@ search: args: " +00:00" # auto adjusted by site account profile - name: dateparse args: "02-01-2006 15:04 -07:00" + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" minimumratio: text: 1.0 minimumseedtime: diff --git a/src/Jackett.Common/Definitions/femdomcult.yml b/src/Jackett.Common/Definitions/femdomcult.yml index f677fac26..cfa5ec9f3 100644 --- a/src/Jackett.Common/Definitions/femdomcult.yml +++ b/src/Jackett.Common/Definitions/femdomcult.yml @@ -117,9 +117,7 @@ search: args: ["/static/common/noartwork/noimage.png", ""] files: selector: td:nth-child(3) - date: # some torrents have "Never" date - text: 20 years ago - date: + date_optional: selector: td:nth-child(5) > span attribute: title optional: true @@ -128,6 +126,8 @@ search: args: " +00:00" # auto adjusted by site account profile - name: dateparse args: "Jan 02 2006, 15:04 -07:00" + date: # some torrents have "Never" date + text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}20 years ago{{ end }}" size: selector: td:nth-child(6) grabs: diff --git a/src/Jackett.Common/Definitions/film-paleis.yml b/src/Jackett.Common/Definitions/film-paleis.yml index e1efba69a..313dffdf2 100644 --- a/src/Jackett.Common/Definitions/film-paleis.yml +++ b/src/Jackett.Common/Definitions/film-paleis.yml @@ -164,16 +164,16 @@ search: args: " +01:00" # CET - name: dateparse args: "2 January 2006 15:04:05 -07:00" - seeders: - text: 0 - seeders: + seeders_optional: optional: true selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font b - leechers: - text: 0 - leechers: + seeders: + text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}" + leechers_optional: optional: true selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b + leechers: + text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}" downloadvolumefactor: case: img[src="pic/freedlfsu.gif"]: 0 diff --git a/src/Jackett.Common/Definitions/finelite.yml b/src/Jackett.Common/Definitions/finelite.yml index adfde53ee..49a3dcfb6 100644 --- a/src/Jackett.Common/Definitions/finelite.yml +++ b/src/Jackett.Common/Definitions/finelite.yml @@ -115,7 +115,7 @@ search: download: selector: a[href^="/lataa.php/"] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href files: diff --git a/src/Jackett.Common/Definitions/finvip.yml b/src/Jackett.Common/Definitions/finvip.yml index 3abe91468..dba2f0295 100644 --- a/src/Jackett.Common/Definitions/finvip.yml +++ b/src/Jackett.Common/Definitions/finvip.yml @@ -136,15 +136,13 @@ search: download: selector: td a[href^="index.php?page=downloadcheck"] attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href filters: # javascript:popdetails('http://www.imdb.com/title/tt10209130'); - - name: replace - args: ["javascript:popdetails('", ""] - - name: replace - args: ["');", ""] + - name: regexp + args: tt(\d+) size: selector: td:nth-last-child(1) leechers: diff --git a/src/Jackett.Common/Definitions/firebit.yml b/src/Jackett.Common/Definitions/firebit.yml index ebf44200a..da0c1f065 100644 --- a/src/Jackett.Common/Definitions/firebit.yml +++ b/src/Jackett.Common/Definitions/firebit.yml @@ -97,7 +97,7 @@ search: filters: - name: replace args: ["-", "0 B"] - date: + date_day: # Вчера, 08:01:41 # 2 дня назад, 19:33:51 selector: td:nth-child(5):contains(","), li.meta-date:contains(",") @@ -108,7 +108,7 @@ search: - name: replace args: ["дня назад,", "days"] - name: fuzzytime - date: + date_year: # 16.08.2021 20:29:39 selector: td:nth-child(5):not(:contains(",")), li.meta-date:not(:contains(",")) optional: true @@ -117,6 +117,8 @@ search: args: " +03:00" # MSK - name: dateparse args: "02.01.2006 15:04:05 -07:00" + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" seeders: selector: td.l1, li.meta-sead leechers: diff --git a/src/Jackett.Common/Definitions/fouducinema.yml b/src/Jackett.Common/Definitions/fouducinema.yml index b223a15a8..d46b011f5 100644 --- a/src/Jackett.Common/Definitions/fouducinema.yml +++ b/src/Jackett.Common/Definitions/fouducinema.yml @@ -256,7 +256,7 @@ search: selector: div.selection_unter_aa > b leechers: selector: div.selection_unter_aaa > b - date: + date_day: # Aujourd'hui à 06:26:25 # Hier à 05:15:19 selector: div.selection_unter_ab:not(:contains(".")) @@ -269,7 +269,7 @@ search: - name: append args: " +01:00" # CET - name: fuzzytime - date: + date_year: # Le 17.10.2020 à 04:39:44 selector: div.selection_unter_ab:contains(".") optional: true @@ -282,6 +282,8 @@ search: args: " +01:00" # CET - name: dateparse args: "02.01.2006 15:04:05 -07:00" + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" size: selector: div.selection_unter_ad grabs: diff --git a/src/Jackett.Common/Definitions/frozenlayer.yml b/src/Jackett.Common/Definitions/frozenlayer.yml index ba0a7593c..eaf4d566f 100644 --- a/src/Jackett.Common/Definitions/frozenlayer.yml +++ b/src/Jackett.Common/Definitions/frozenlayer.yml @@ -90,7 +90,7 @@ search: category|noappend: optional: true selector: td.tit span - date: + date_day: # 1d # 2d 3h # 3 dias @@ -101,7 +101,7 @@ search: - name: replace args: ["días", "days ago"] - name: timeago - date: + date_year: # 29 Oct 17 optional: true selector: td.fecha:not(:contains("d")):not(:contains("h")) @@ -110,6 +110,8 @@ search: args: " +01:00" # CET - name: dateparse args: "02 Jan 06 -07:00" + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" size: selector: td:nth-child(6) seeders: diff --git a/src/Jackett.Common/Definitions/funkytorrents.yml b/src/Jackett.Common/Definitions/funkytorrents.yml index 9e6e28f15..f883cc1dc 100644 --- a/src/Jackett.Common/Definitions/funkytorrents.yml +++ b/src/Jackett.Common/Definitions/funkytorrents.yml @@ -81,7 +81,6 @@ search: fields: description: - optional: true selector: td:nth-child(2) > font title: selector: td:nth-child(2) diff --git a/src/Jackett.Common/Definitions/haidan.yml b/src/Jackett.Common/Definitions/haidan.yml index b7a0c73b3..2b8921847 100644 --- a/src/Jackett.Common/Definitions/haidan.yml +++ b/src/Jackett.Common/Definitions/haidan.yml @@ -101,7 +101,6 @@ search: search_mode: 0 sort: "{{ .Config.sort }}" type: "{{ .Config.type }}" - # supports search using imdbid, does not return imdb links in results rows: selector: div.group_content:has(a[href^="download.php?id="]) @@ -135,6 +134,9 @@ search: poster: selector: img#poster attribute: data-src + imdbid: + selector: a[href*="imdb.com/title/tt"] + attribute: href date: # time type: time elapsed (default) selector: div.time_col span[title]