From 134677e44209d29a4280c2a13fbc736cb04beb01 Mon Sep 17 00:00:00 2001 From: ServarrAdmin Date: Wed, 8 Jan 2025 15:37:20 -0600 Subject: [PATCH] jackett indexers as of b8c1fd65eb2437f885e8a2517b8749e5e19a1532 [2025-01-08T21:37:20Z] --- definitions/v10/arenabg.yml | 1 + definitions/v10/f1carreras-api.yml | 54 ++++---- definitions/v10/haresclub.yml | 195 ----------------------------- definitions/v10/hdvideo.yml | 2 +- definitions/v10/rudub.yml | 4 +- 5 files changed, 32 insertions(+), 224 deletions(-) delete mode 100644 definitions/v10/haresclub.yml diff --git a/definitions/v10/arenabg.yml b/definitions/v10/arenabg.yml index 1e108fdd7..e17cfcd32 100644 --- a/definitions/v10/arenabg.yml +++ b/definitions/v10/arenabg.yml @@ -34,6 +34,7 @@ caps: - {id: 24, cat: TV, desc: "Series / TV Episodes"} - {id: 25, cat: TV, desc: "Series / TV Boxset"} - {id: 26, cat: TV/HD, desc: "Series / TV Boxset HD"} + - {id: 60, cat: TV/UHD, desc: "Series / 4K"} - {id: 3, cat: Audio, desc: "Music"} - {id: 27, cat: Audio/MP3, desc: "Music / MP3"} - {id: 28, cat: Audio/Video, desc: "Music / Video"} diff --git a/definitions/v10/f1carreras-api.yml b/definitions/v10/f1carreras-api.yml index 98fe6678e..738ec36d9 100644 --- a/definitions/v10/f1carreras-api.yml +++ b/definitions/v10/f1carreras-api.yml @@ -26,7 +26,7 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid, tvdbid, tmdbid] + tv-search: [q, season, ep] settings: - name: apikey @@ -35,11 +35,15 @@ settings: - name: info_key type: info label: About your API key - default: "Find or Generate a new API Token by accessing your F1Carreras account Settings page and clicking on the API Key tab." + default: "Find or Generate a new API Token by accessing your F1Carreras account My Settings page and clicking on the API Key tab." - name: freeleech type: checkbox label: Search freeleech only default: false + - name: single_file_release_use_filename + type: checkbox + label: Use filename as title for single file releases + default: true - name: sort type: select label: Sort requested from site @@ -85,9 +89,6 @@ search: # disabled due to not being properly mapped # seasonNumber: "{{ .Query.Season }}" # episodeNumber: "{{ .Query.Ep }}" - imdbId: "{{ .Query.IMDBIDShort }}" - tmdbId: "{{ .Query.TMDBID }}" - tvdbId: "{{ .Query.TVDBID }}" "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}" sortField: "{{ .Config.sort }}" sortDirection: "{{ .Config.type }}" @@ -107,27 +108,21 @@ search: fields: category: selector: category_id - title: + title_optional: selector: name + title_filename: + selector: "files[0].name" + optional: true + files: + selector: num_file + title: + text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}" details: selector: details_link download: selector: download_link infohash: selector: info_hash - poster: - selector: meta.poster - filters: - - name: replace - args: ["https://via.placeholder.com/90x135", ""] - imdbid: - selector: imdb_id - tmdbid: - selector: tmdb_id - tvdbid: - selector: tvdb_id - files: - selector: num_file seeders: selector: seeders leechers: @@ -144,7 +139,12 @@ search: args: "MM/dd/yyyy HH:mm:ss zzz" size: selector: size - downloadvolumefactor: + _featured: + selector: featured + case: + False: "{{ .False }}" + True: "{{ .True }}" + downloadvolumefactor_freeleech: # api returns 0%, 25%, 50%, 75%, 100% selector: freeleech case: @@ -154,15 +154,17 @@ search: 75%: 0.25 100%: 0 # freeleech "*": 0 # catch errors - uploadvolumefactor: + downloadvolumefactor: + text: "{{ if .Result._featured }}0{{ else }}{{ .Result.downloadvolumefactor_freeleech }}{{ end }}" + uploadvolumefactor_double_upload: # api returns False, True selector: double_upload case: False: 1 # normal True: 2 # double - minimumratio: - text: 1.0 + uploadvolumefactor: + text: "{{ if .Result._featured }}2{{ else }}{{ .Result.uploadvolumefactor_double_upload }}{{ end }}" minimumseedtime: - # 1 day (as seconds = 1 x 24 x 60 x 60) - text: 86400 -# json UNIT3D 7.2.5 (custom) + # 2 day (as seconds = 2 x 24 x 60 x 60) + text: 172800 +# json UNIT3D 8.3.4 (custom) diff --git a/definitions/v10/haresclub.yml b/definitions/v10/haresclub.yml deleted file mode 100644 index e6f28b3c5..000000000 --- a/definitions/v10/haresclub.yml +++ /dev/null @@ -1,195 +0,0 @@ ---- -id: haresclub -name: Hares Club (白兔俱乐部) -description: "Hares Club (白兔俱乐部) is a CHINESE Private site that focuses on 4K media." -language: zh-CN -type: private -encoding: UTF-8 -links: - - https://club.hares.top/ - -caps: - categorymappings: - - {id: 401, cat: Movies, desc: "Movies | 电影"} - - {id: 402, cat: TV, desc: "TV Series | 电视剧"} - - {id: 403, cat: TV, desc: "TV Shows | 综艺"} - - {id: 404, cat: TV/Documentary, desc: "Documentaries | 纪录片"} - - {id: 405, cat: TV/Anime, desc: "Animations | 动漫"} - - {id: 406, cat: Audio/Video, desc: "Music Videos | 音乐视频"} - - {id: 407, cat: TV/Sport, desc: "Sports | 体育"} - - {id: 409, cat: Audio/Video, desc: "Concert | 演唱会"} - - {id: 416, cat: TV, desc: "Show LIVE | 现场LIVE"} - - {id: 415, cat: Other, desc: "Others | 其他"} - - modes: - search: [q] - tv-search: [q, season, ep, imdbid, doubanid] - movie-search: [q, imdbid, doubanid] - music-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: 2facode - type: text - label: 2FA code - - name: info_2fa - type: info - label: "About 2FA code" - default: "Only fill in the 2FA code box if you have enabled 2FA on the Hares Club Web Site. Otherwise just leave it empty." - - name: freeleech - type: checkbox - label: Search freeleech only - default: false - - name: sort - type: select - label: Sort requested from site - default: 4 - options: - 4: created - 7: seeders - 5: size - 1: title - - name: type - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Torrents per page: setting to 100 on your account profile. - -login: - path: login.php - method: form - form: form[action="takelogin.php"] - captcha: - type: image - selector: img[alt="CAPTCHA"] - input: imagestring - inputs: - secret: "" - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - two_step_code: "{{ .Config.2facode }}" - logout: "" - securelogin: "" - ssl: yes - trackerssl: yes - error: - - selector: script:contains("'失败'") - message: - text: "图片代码无效！The Image code is invalid. Close the config and start again." - - selector: script:contains("'登录失败！'") - message: - text: "用户名或密码不正确！或者你还没有通过验证。The username or password is incorrect! Close the config and start again." - test: - path: index.php - selector: a[href*="logout.php"] - -search: - paths: - - path: torrents.php - inputs: - $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}" - search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}" - # 0 incldead, 1 active, 2 dead - incldead: 0 - # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30% - spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}" - # 0 title, 1 descr, 3 uploader, 4 imdburl - search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}" - # 0 AND, 1 OR, 2 exact - search_mode: 0 - sort: "{{ .Config.sort }}" - type: "{{ .Config.type }}" - notnewword: 1 - - rows: - selector: table.torrents > tbody > tr:has(a[href*="download.php?id="]) - - fields: - category: - selector: a[href*="?cat="] - attribute: href - filters: - - name: querystring - args: cat - title_default: - selector: a[href*="details.php?id="] - title: - selector: a[title][href*="details.php?id="] - attribute: title - optional: true - default: "{{ .Result.title_default }}" - details: - selector: a[href*="details.php?id="] - attribute: href - download: - selector: a[href*="download.php?id="] - attribute: href - poster: - selector: div.layui-torrents-Stills > a - attribute: rel - filters: - - name: replace - args: ["re.php?cache=", ""] - date_elapsed: - # time type: time elapsed (default) - selector: td:nth-last-child(6) > span[title] - attribute: title - optional: true - filters: - - name: append - args: " +08:00" # CST - - name: dateparse - args: "yyyy-MM-dd HH:mm:ss zzz" - date_added: - # time added - selector: td:nth-last-child(6):not(:has(span)) - optional: true - filters: - - name: append - args: " +08:00" # CST - - name: dateparse - args: "yyyy-MM-ddHH:mm:ss zzz" - date: - text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}" - size: - selector: td:nth-last-child(5) - seeders: - selector: td:nth-last-child(4) - leechers: - selector: td:nth-last-child(3) - grabs: - selector: td:nth-last-child(2) - downloadvolumefactor: - case: - img.pro_free: 0 - img.pro_free2up: 0 - img.pro_50pctdown: 0.5 - img.pro_50pctdown2up: 0.5 - img.pro_30pctdown: 0.3 - "*": 1 - uploadvolumefactor: - case: - img.pro_50pctdown2up: 2 - img.pro_free2up: 2 - img.pro_2up: 2 - "*": 1 - description_text: - selector: td:nth-child(2) - remove: a, b, font, img, span - description: - case: - i.fa-check: "Verified: {{ .Result.description_text }}" - i.fa-question: "Unverified: {{ .Result.description_text }}" - i.fa-times: "Banned: {{ .Result.description_text }}" -# NexusPHP v1.6.2 2022-03-19 diff --git a/definitions/v10/hdvideo.yml b/definitions/v10/hdvideo.yml index 018caf0e4..d56f8638a 100644 --- a/definitions/v10/hdvideo.yml +++ b/definitions/v10/hdvideo.yml @@ -172,4 +172,4 @@ search: filters: - name: prepend args: "{{ .Result.description_verified }} " -# NexusPHP v1.8.15 2024-12-23 +# NexusPHP v1.8.4 2024-12-23 diff --git a/definitions/v10/rudub.yml b/definitions/v10/rudub.yml index cac257eb7..1c69388f7 100644 --- a/definitions/v10/rudub.yml +++ b/definitions/v10/rudub.yml @@ -9,9 +9,8 @@ type: semi-private encoding: windows-1251 followredirect: true links: - - https://08january.rudub.online/ + - https://09january.rudub.online/ legacylinks: - - https://09december.rudub.online/ - https://10december.rudub.online/ - https://11december.rudub.online/ - https://12december.rudub.online/ @@ -41,6 +40,7 @@ legacylinks: - https://05january.rudub.online/ - https://06january.rudub.online/ - https://07january.rudub.online/ + - https://08january.rudub.online/ caps: categorymappings: