From d92333681d06b763cd6a117ba1fd7acb38f524a6 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Wed, 1 Jul 2020 10:08:33 +1200 Subject: [PATCH] haidan: new categories and layout --- src/Jackett.Common/Definitions/haidan.yml | 69 +++++++++++------------ 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/src/Jackett.Common/Definitions/haidan.yml b/src/Jackett.Common/Definitions/haidan.yml index 507f45f49..09d56139d 100644 --- a/src/Jackett.Common/Definitions/haidan.yml +++ b/src/Jackett.Common/Definitions/haidan.yml @@ -12,23 +12,11 @@ legacylinks: caps: categorymappings: - - {id: 300, cat: Movies/UHD, desc: "Movies UHD-4K"} - - {id: 412, cat: Movies/WEBDL, desc: "Movies WEB-DL"} - - {id: 413, cat: TV/HD, desc: "Movies HDTV"} - - {id: 414, cat: Movies/DVD, desc: "Movies DVD"} - - {id: 415, cat: Movies, desc: "Movies REMUX"} - - {id: 416, cat: Movies/3D, desc: "Movies 3D"} - - {id: 417, cat: Movies, desc: "Movies iPad"} - - {id: 418, cat: Movies/WEBDL, desc: "Netflix WEB-DL"} - - {id: 419, cat: Movies/WEBDL, desc: "VIU WEB-DL"} - - {id: 301, cat: Movies/UHD, desc: "Movies 2160p"} - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"} - - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"} + - {id: 401, cat: Movies, desc: "Movies(电影)"} - {id: 405, cat: TV/Anime, desc: "Animations(动画片)"} - {id: 402, cat: TV, desc: "TV Series(电视剧)"} - - {id: 410, cat: Movies/HD, desc: "Movies 1080p"} - {id: 403, cat: TV, desc: "TV Shows(综艺)"} - - {id: 411, cat: Movies/HD, desc: "Movies 720p"} - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)"} - {id: 407, cat: TV/Sport, desc: "Sports(体育)"} - {id: 409, cat: Other, desc: "Misc(其他)"} @@ -67,6 +55,10 @@ settings: type: info label: Results Per Page default: For best results, change the Torrents per page: setting to 100 on your account profile. + - name: info_indexer + type: info + label: Alert + default: HaiDan has switched to a group torrent list, which means this Indexer can only display the first item in each group.
This yml Indexer will eventually be re-written in c# as soon as a c# dev volunteers, to display all items in a group. login: path: login.php @@ -100,15 +92,15 @@ search: # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30% spstate: 0 # 0 title 1 descr 3 uploader 4 imdburl - search_area: "{{ if .Query.IMDBID }}1{{else}}0{{end}}" + search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}" # 0 AND 1 OR 2 exact search_mode: 0 sort: "{{ .Config.sort }}" type: "{{ .Config.type }}" - # search imdbid using descr, does not return imdb links in results + # supports search using imdbid, does not return imdb links in results rows: - selector: table.torrents > tbody > tr:has(table.torrentname) + selector: div.torrent_panel > div.torrent_group > div.group_content fields: category: @@ -117,25 +109,32 @@ search: filters: - name: querystring args: cat - title: - selector: a[href^="details.php?id="] - title: + year: optional: true - selector: a[title][href^="details.php?id="] - attribute: title + selector: div.video_year + filters: + - name: replace + args: ["年份:", " "] + _title: + selector: a.video_name_str + title: + text: "{{ .Result._title }}{{ .Result.year }}" details: - selector: a[href^="details.php?id="] + selector: a.video_name_str attribute: href download: selector: a[href^="download.php?id="] attribute: href - imdb: + description: optional: true - selector: a[href*="imdb.com/title/tt"] - attribute: href + selector: div.torrent_name_col > a + banner: + optional: true + selector: img#poster + attribute: data-src date: # time type: time elapsed (default) - selector: td:nth-child(4) > span[title] + selector: div.time_col > span[title] attribute: title optional: true filters: @@ -145,21 +144,22 @@ search: args: "2006-01-02 15:04:05 -07:00" date: # time added - selector: td:nth-child(4):not(:has(span)) + selector: div.time_col:not(:has(span)) optional: true filters: - name: append args: " +08:00" - name: dateparse - args: "2006-01-0215:04:05 -07:00" + args: "2006-01-02 15:04:05 -07:00" size: - selector: td:nth-child(5) + # group size. item size + selector: div.group > div.video_size, div.torrent_item > div.video_size seeders: - selector: td:nth-child(6) + selector: div.group > div.seeder_col, div.torrent_item > div.seeder_col leechers: - selector: td:nth-child(7) + selector: div.group > div.leecher_col, div.torrent_item > div.leecher_col grabs: - selector: td:nth-child(8) + selector: div.group > div.snatched_col, div.torrent_item > div.snatched_col downloadvolumefactor: case: img.pro_free: 0 @@ -174,7 +174,4 @@ search: img.pro_free2up: 2 img.pro_2up: 2 "*": 1 - description: - selector: td:nth-child(2) - remove: a, img -# NexusPHP Standard v1.5 Beta 4 +# NexusPHP Standard v1.5 Beta 4 customised