diff --git a/definitions/v7/cinematik.yml b/definitions/v7/cinematik.yml index 88bdf77cb..13ef3a13f 100644 --- a/definitions/v7/cinematik.yml +++ b/definitions/v7/cinematik.yml @@ -52,6 +52,7 @@ settings: login: path: /api/torrents method: get + inputs: {} # TODO: remove in v10 error: - selector: a[href*="/login"] message: diff --git a/definitions/v7/hdolimpo-api.yml b/definitions/v7/hdolimpo-api.yml index 7c3f2d8f3..64a1a19ec 100644 --- a/definitions/v7/hdolimpo-api.yml +++ b/definitions/v7/hdolimpo-api.yml @@ -66,7 +66,7 @@ search: paths: # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0) # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349 - - path: api/torrents/filter + - path: "/api/torrents/filter" response: type: json @@ -76,18 +76,22 @@ search: inputs: # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6. Else pass S/E Params for UNIT3D >= v6 name: "{{ .Keywords }}" - $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}" + $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}" sortField: "{{ .Config.sort }}" sortDirection: "{{ .Config.type }}" perPage: 100 + keywordsfilters: + - name: re_replace + args: ["\\.", " "] + rows: selector: data attribute: attributes fields: - categorydesc: - selector: category + category: + selector: category_id title: selector: name filters: @@ -149,8 +153,10 @@ search: selector: details_link download: selector: download_link + infohash: + selector: info_hash poster: - selector: poster + selector: meta.poster filters: - name: replace args: ["https://via.placeholder.com/90x135", ""] @@ -189,12 +195,12 @@ search: 100%: 0 # freeleech "*": 0 # catch errors uploadvolumefactor: - # api returns 0=false, 1=true + # api returns False, True selector: double_upload case: - 0: 1 # normal - 1: 2 # double + False: 1 # normal + True: 2 # double minimumseedtime: # 4 days (as seconds = 4 x 24 x 60 x 60) text: 345600 -# json UNIT3D 6.0.4 +# json UNIT3D 7.x.x diff --git a/definitions/v7/jptv-api.yml b/definitions/v7/jptv-api.yml index b198cb543..f4720a720 100644 --- a/definitions/v7/jptv-api.yml +++ b/definitions/v7/jptv-api.yml @@ -57,6 +57,7 @@ settings: login: path: /api/torrents method: get + inputs: {} # TODO: remove in v10 error: - selector: a[href*="/login"] message: diff --git a/definitions/v7/shareisland-api.yml b/definitions/v7/shareisland-api.yml index 818b4b96e..32655eb04 100644 --- a/definitions/v7/shareisland-api.yml +++ b/definitions/v7/shareisland-api.yml @@ -22,6 +22,7 @@ caps: - {id: 7, cat: PC/Games, desc: "Games"} - {id: 23, cat: PC, desc: "Software"} - {id: 24, cat: TV/Sport, desc: "EVENTI SPORTIVI"} + - {id: 25, cat: Other, desc: "Misc"} modes: search: [q] diff --git a/definitions/v9/hdolimpo-api.yml b/definitions/v9/hdolimpo-api.yml index 66a0e9c92..823d38c1b 100644 --- a/definitions/v9/hdolimpo-api.yml +++ b/definitions/v9/hdolimpo-api.yml @@ -66,7 +66,7 @@ search: paths: # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0) # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349 - - path: api/torrents/filter + - path: "/api/torrents/filter" response: type: json @@ -74,7 +74,7 @@ search: Authorization: ["Bearer {{ .Config.apikey }}"] inputs: - # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6. Else pass S/E Params for UNIT3D >= v6 + # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6. Else pass S/E Params for UNIT3D >= v6 $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}" name: "{{ .Keywords }}" seasonNumber: "{{ .Query.Season }}" @@ -82,18 +82,22 @@ search: imdbId: "{{ .Query.IMDBIDShort }}" tmdbId: "{{ .Query.TMDBID }}" tvdbId: "{{ .Query.TVDBID }}" - free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" + "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}" sortField: "{{ .Config.sort }}" sortDirection: "{{ .Config.type }}" perPage: 100 + keywordsfilters: + - name: re_replace + args: ["\\.", " "] + rows: selector: data attribute: attributes fields: - categorydesc: - selector: category + category: + selector: category_id title: selector: name filters: @@ -155,8 +159,10 @@ search: selector: details_link download: selector: download_link + infohash: + selector: info_hash poster: - selector: poster + selector: meta.poster filters: - name: replace args: ["https://via.placeholder.com/90x135", ""] @@ -195,12 +201,12 @@ search: 100%: 0 # freeleech "*": 0 # catch errors uploadvolumefactor: - # api returns 0=false, 1=true + # api returns False, True selector: double_upload case: - 0: 1 # normal - 1: 2 # double + False: 1 # normal + True: 2 # double minimumseedtime: # 4 days (as seconds = 4 x 24 x 60 x 60) text: 345600 -# json UNIT3D 6.0.4 +# json UNIT3D 7.x.x diff --git a/definitions/v9/shareisland-api.yml b/definitions/v9/shareisland-api.yml index 2516329c7..417c16e6c 100644 --- a/definitions/v9/shareisland-api.yml +++ b/definitions/v9/shareisland-api.yml @@ -22,6 +22,7 @@ caps: - {id: 7, cat: PC/Games, desc: "Games"} - {id: 23, cat: PC, desc: "Software"} - {id: 24, cat: TV/Sport, desc: "EVENTI SPORTIVI"} + - {id: 25, cat: Other, desc: "Misc"} modes: search: [q]