diff --git a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml index 692248c34..548249317 100644 --- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml +++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml @@ -16,7 +16,7 @@ caps: modes: search: [q] tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + movie-search: [q, imdbid, tmdbid] settings: - name: oneurl @@ -55,10 +55,10 @@ search: - path: torrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tmdb: "" + tmdb: "{{ .Query.TMDBID }}" sorting: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 @@ -106,6 +106,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href downloadvolumefactor: case: i[data-original-title="100% Free"]: 0 diff --git a/src/Jackett.Common/Definitions/beyond-hd.yml b/src/Jackett.Common/Definitions/beyond-hd.yml index 99c859217..61b4da49a 100644 --- a/src/Jackett.Common/Definitions/beyond-hd.yml +++ b/src/Jackett.Common/Definitions/beyond-hd.yml @@ -16,7 +16,7 @@ caps: modes: search: [q] tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + movie-search: [q, imdbid, tmdbid] settings: - name: info_oid @@ -75,10 +75,10 @@ search: - path: torrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tmdb: "" + tmdb: "{{ .Query.TMDBID }}" sorting: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 @@ -126,6 +126,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href downloadvolumefactor: case: i[data-original-title="100% Free"]: 0 diff --git a/src/Jackett.Common/Definitions/channelx.yml b/src/Jackett.Common/Definitions/channelx.yml index d5ed1d750..8aa463e79 100644 --- a/src/Jackett.Common/Definitions/channelx.yml +++ b/src/Jackett.Common/Definitions/channelx.yml @@ -73,7 +73,7 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" @@ -81,10 +81,13 @@ search: tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -109,8 +112,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/chilebt.yml b/src/Jackett.Common/Definitions/chilebt.yml index 91253994b..3d508777c 100644 --- a/src/Jackett.Common/Definitions/chilebt.yml +++ b/src/Jackett.Common/Definitions/chilebt.yml @@ -24,8 +24,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] book-search: [q] @@ -82,17 +82,18 @@ search: - path: filterTorrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -117,8 +118,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -133,6 +138,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: diff --git a/src/Jackett.Common/Definitions/concertos.yml b/src/Jackett.Common/Definitions/concertos.yml index c13c1f8a2..a13efc721 100644 --- a/src/Jackett.Common/Definitions/concertos.yml +++ b/src/Jackett.Common/Definitions/concertos.yml @@ -74,7 +74,7 @@ search: - path: torrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - title: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + title: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search imdb: "{{ .Query.IMDBIDShort }}" freeleech: "{{ if .Config.freeleech }}on{{ else }}{{ end }}" order_by: "{{ .Config.sort }}" diff --git a/src/Jackett.Common/Definitions/desireleasers.yml b/src/Jackett.Common/Definitions/desireleasers.yml index 58220dd99..430176692 100644 --- a/src/Jackett.Common/Definitions/desireleasers.yml +++ b/src/Jackett.Common/Definitions/desireleasers.yml @@ -68,7 +68,7 @@ search: paths: - path: torrents/filter inputs: - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" @@ -76,10 +76,13 @@ search: tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" direction: "{{ .Config.type }}" - view: list qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -103,8 +106,12 @@ search: selector: img.tps attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] imdb: selector: a[href*="imdb.com/title/tt"] attribute: href diff --git a/src/Jackett.Common/Definitions/dxdhd.yml b/src/Jackett.Common/Definitions/dxdhd.yml index ef42b7930..73521a2a1 100644 --- a/src/Jackett.Common/Definitions/dxdhd.yml +++ b/src/Jackett.Common/Definitions/dxdhd.yml @@ -25,8 +25,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] book-search: [q] @@ -81,18 +81,21 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -117,8 +120,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -133,6 +140,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: diff --git a/src/Jackett.Common/Definitions/esharenet.yml b/src/Jackett.Common/Definitions/esharenet.yml index c0f7998f5..713845fa9 100644 --- a/src/Jackett.Common/Definitions/esharenet.yml +++ b/src/Jackett.Common/Definitions/esharenet.yml @@ -42,8 +42,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] settings: @@ -97,18 +97,21 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 50 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -133,8 +136,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -149,6 +156,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: @@ -204,6 +214,8 @@ search: i[class*="fa-globe text-green"]: 2 # Global Double Upload i[class*="fa-certificate text-pink"]: 2 # Featured Torrent "*": 1 + minimumratio: + text: 0.4 minimumseedtime: # 3 days (as seconds = 3 x 24 x 60 x 60) text: 259200 diff --git a/src/Jackett.Common/Definitions/freetorrent.yml b/src/Jackett.Common/Definitions/freetorrent.yml index b2fe08ccc..31dd55b6b 100644 --- a/src/Jackett.Common/Definitions/freetorrent.yml +++ b/src/Jackett.Common/Definitions/freetorrent.yml @@ -78,7 +78,7 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" @@ -86,10 +86,13 @@ search: tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list rows: selector: table > tbody > tr @@ -113,8 +116,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/hdolimpo.yml b/src/Jackett.Common/Definitions/hdolimpo.yml index dbf2a5145..47e070df5 100644 --- a/src/Jackett.Common/Definitions/hdolimpo.yml +++ b/src/Jackett.Common/Definitions/hdolimpo.yml @@ -19,8 +19,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] settings: - name: username @@ -73,18 +73,20 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" + keywords: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -126,8 +128,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -142,6 +148,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: diff --git a/src/Jackett.Common/Definitions/hush.yml b/src/Jackett.Common/Definitions/hush.yml index 5f6b00d49..fecd4699f 100644 --- a/src/Jackett.Common/Definitions/hush.yml +++ b/src/Jackett.Common/Definitions/hush.yml @@ -19,8 +19,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] settings: - name: username @@ -52,6 +52,22 @@ settings: type: checkbox label: Replace VOSTFR with ENGLISH default: false + - name: sort + type: select + label: Sort requested from site + default: created_at + options: + created_at: created + seeders: seeders + size: size + name: title + - name: type + type: select + label: Order requested from site + default: desc + options: + desc: desc + asc: asc login: path: login @@ -78,17 +94,19 @@ search: - path: filterTorrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" - sort: created_at - direction: desc + sorting: "{{ .Config.sort }}" + direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -129,8 +147,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -145,6 +167,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: diff --git a/src/Jackett.Common/Definitions/immortuos.yml b/src/Jackett.Common/Definitions/immortuos.yml index 80409baed..76cf40686 100644 --- a/src/Jackett.Common/Definitions/immortuos.yml +++ b/src/Jackett.Common/Definitions/immortuos.yml @@ -24,8 +24,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] settings: @@ -39,6 +39,22 @@ settings: type: checkbox label: Search freeleech only default: false + - name: sort + type: select + label: Sort requested from site + default: created_at + options: + created_at: created + seeders: seeders + size: size + name: title + - name: type + type: select + label: Order requested from site + default: desc + options: + desc: desc + asc: asc login: path: login @@ -65,16 +81,18 @@ search: - path: filterTorrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" - sort: created_at - direction: desc + sorting: "{{ .Config.sort }}" + direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -99,8 +117,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -115,6 +137,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: diff --git a/src/Jackett.Common/Definitions/onlyscene.yml b/src/Jackett.Common/Definitions/onlyscene.yml index 9e241e023..ffaa87d2f 100644 --- a/src/Jackett.Common/Definitions/onlyscene.yml +++ b/src/Jackett.Common/Definitions/onlyscene.yml @@ -28,8 +28,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] book-search: [q] @@ -103,18 +103,21 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -158,8 +161,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -174,6 +181,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: diff --git a/src/Jackett.Common/Definitions/piratadigital.yml b/src/Jackett.Common/Definitions/piratadigital.yml index 4706ad861..e5b3c4a81 100644 --- a/src/Jackett.Common/Definitions/piratadigital.yml +++ b/src/Jackett.Common/Definitions/piratadigital.yml @@ -72,7 +72,7 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" @@ -80,10 +80,13 @@ search: tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -108,8 +111,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -182,6 +189,8 @@ search: i[class*="fa-globe text-green"]: 2 # Global Double Upload i[class*="fa-certificate text-pink"]: 2 # Featured Torrent "*": 1 + minimumratio: + text: 0.4 minimumseedtime: # 5 days (as seconds = 5 x 24 x 60 x 60) text: 432000 diff --git a/src/Jackett.Common/Definitions/purovicio.yml b/src/Jackett.Common/Definitions/purovicio.yml index cbaf9ba4f..63fe8d936 100644 --- a/src/Jackett.Common/Definitions/purovicio.yml +++ b/src/Jackett.Common/Definitions/purovicio.yml @@ -25,8 +25,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] settings: @@ -74,17 +74,18 @@ search: - path: filterTorrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -109,11 +110,18 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href size: selector: td:nth-last-child(4) grabs: diff --git a/src/Jackett.Common/Definitions/racing4everyone.yml b/src/Jackett.Common/Definitions/racing4everyone.yml index d3ba3b86f..ec12699ae 100644 --- a/src/Jackett.Common/Definitions/racing4everyone.yml +++ b/src/Jackett.Common/Definitions/racing4everyone.yml @@ -48,7 +48,7 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] settings: - name: username @@ -101,16 +101,19 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" + tvdb: "{{ .Query.TVDBID }}" tmdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -131,12 +134,6 @@ search: details: selector: a.view-torrent attribute: href - poster: - selector: div.torrent-poster img - attribute: src - filters: - - name: replace - args: ["https://via.placeholder.com/600x900", ""] size: selector: td:nth-last-child(4) seeders: @@ -206,4 +203,6 @@ search: i[class*="fa-globe text-green"]: 2 # Global Double Upload i[class*="fa-certificate text-pink"]: 2 # Featured Torrent "*": 1 + minimumratio: + text: 1.0 # UNIT3D 2.2.7 diff --git a/src/Jackett.Common/Definitions/shareuniversity.yml b/src/Jackett.Common/Definitions/shareuniversity.yml index 436218290..7e563be7c 100644 --- a/src/Jackett.Common/Definitions/shareuniversity.yml +++ b/src/Jackett.Common/Definitions/shareuniversity.yml @@ -34,8 +34,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] book-search: [q] @@ -92,16 +92,18 @@ search: - path: filterTorrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" + mal: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -126,8 +128,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://i.imgur.com/IPRVhUJ.png&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -142,6 +148,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: @@ -197,6 +206,8 @@ search: i[class*="fa-globe text-green"]: 2 # Global Double Upload i[class*="fa-certificate text-pink"]: 2 # Featured Torrent "*": 1 + minimumratio: + text: 0.4 minimumseedtime: # 2 days (as seconds = 2 x 24 x 60 x 60) text: 172800 diff --git a/src/Jackett.Common/Definitions/theshinning.yml b/src/Jackett.Common/Definitions/theshinning.yml index 8981ff9d3..afe1c3703 100644 --- a/src/Jackett.Common/Definitions/theshinning.yml +++ b/src/Jackett.Common/Definitions/theshinning.yml @@ -14,20 +14,20 @@ legacylinks: caps: categorymappings: - {id: 1, cat: Movies, desc: "Movies"} - - {id: 2, cat: TV, desc: "TV"} - - {id: 3, cat: Audio, desc: "Music"} + - {id: 2, cat: TV, desc: "Serien"} + - {id: 3, cat: Audio, desc: "Musik"} - {id: 4, cat: Console, desc: "Games"} - {id: 5, cat: PC, desc: "Apps"} - {id: 6, cat: Other, desc: "Misc"} - - {id: 7, cat: XXX, desc: "XXX"} + - {id: 7, cat: XXX, desc: "XxX"} - {id: 8, cat: Movies, desc: "Kids"} - {id: 9, cat: TV/Sport, desc: "Sport"} - {id: 10, cat: TV/Documentary, desc: "Doku"} modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] settings: @@ -81,17 +81,18 @@ search: - path: filterTorrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 + page: 0 + view: list freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: @@ -116,11 +117,18 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://theshinning.me/img/nocover.png", ""] + args: ["https://images.weserv.nl/?url=https://theshinning.me/img/nocover.png&w=180&h=270", ""] imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href size: selector: td:nth-last-child(4) grabs: @@ -133,12 +141,13 @@ search: leechers: selector: td:nth-last-child(1) date: + # 13.11.2020 19:50:26 selector: time filters: - name: append args: " +01:00" # CET - name: dateparse - args: "02/01/2006 15:04:05 -07:00" + args: "02.01.2006 15:04:05 -07:00" downloadvolumefactor: case: i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store diff --git a/src/Jackett.Common/Definitions/torrentdb.yml b/src/Jackett.Common/Definitions/torrentdb.yml index 9d1b4a9d6..372dd95c9 100644 --- a/src/Jackett.Common/Definitions/torrentdb.yml +++ b/src/Jackett.Common/Definitions/torrentdb.yml @@ -19,8 +19,8 @@ caps: modes: search: [q] - tv-search: [q, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] settings: @@ -75,7 +75,9 @@ search: - path: filter/torrents inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}freeleech=1&{{ else }}{{ end }}" - search: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{ else }}{{ .Keywords }}{{ end }}" + # note: dashboard only supports imdbid (tt12345678). Since tvdbid and tmdbid are just numbers the dashboard sends them as keywords + # which will fail title matching because we need the andmatch to filter the web sites title missmatches (it searches in descriptions too) + search: "{{ if or .Query.IMDBID .Query.TVDBID .Query.TMDBID }}{{ or .Query.IMDBIDShort .Query.TVDBID .Query.TMDBID }}{{ else }}{{ .Keywords }}{{ end }}" tags: "" sorting: "{{ .Config.sort }}" direction: "{{ .Config.type }}" @@ -118,6 +120,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href downloadvolumefactor: case: i.fa-star: 0 # Freeleech diff --git a/src/Jackett.Common/Definitions/tvchaosuk.yml b/src/Jackett.Common/Definitions/tvchaosuk.yml index f32eac470..930c683d5 100644 --- a/src/Jackett.Common/Definitions/tvchaosuk.yml +++ b/src/Jackett.Common/Definitions/tvchaosuk.yml @@ -28,8 +28,8 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, tvdbid] + movie-search: [q, imdbid, tmdbid] music-search: [q] settings: @@ -83,16 +83,17 @@ search: - path: torrents/filter inputs: $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}" - search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" # for dashboard imdbid search description: "" uploader: "" imdb: "{{ .Query.IMDBIDShort }}" - tvdb: "" - tmdb: "" + tvdb: "{{ .Query.TVDBID }}" + tmdb: "{{ .Query.TMDBID }}" mal: "" igdb: "" + start_year: "" + end_year: "" sorting: "{{ .Config.sort }}" - sort: "{{ .Config.sort }}" direction: "{{ .Config.type }}" qty: 100 freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" @@ -119,8 +120,12 @@ search: selector: div.torrent-poster img attribute: src filters: + - name: prepend + args: "https://images.weserv.nl/?url=" # for display on dashboard + - name: append + args: "&w=180&h=270" # for display on dashboard - name: replace - args: ["https://via.placeholder.com/600x900", ""] + args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] size: selector: td:nth-last-child(4) seeders: @@ -135,6 +140,9 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href + tmdbid: + selector: a[href*="themoviedb.org/movie/"] + attribute: href date: selector: time filters: @@ -190,6 +198,8 @@ search: i[class*="fa-globe text-green"]: 2 # Global Double Upload i[class*="fa-certificate text-pink"]: 2 # Featured Torrent "*": 1 + minimumratio: + text: 0.4 minimumseedtime: # 1 day (as seconds = 24 x 60 x 60) text: 86400