From 62b568e004c66feee5eb4346c8b40706b1e09030 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 24 Mar 2020 14:41:35 +1300 Subject: [PATCH] mteamtp: updates resolve #7824 --- src/Jackett.Common/Definitions/mteamtp.yml | 52 +++++++++++++++---- src/Jackett.Common/Definitions/mteamtp2fa.yml | 51 ++++++++++++++---- 2 files changed, 81 insertions(+), 22 deletions(-) diff --git a/src/Jackett.Common/Definitions/mteamtp.yml b/src/Jackett.Common/Definitions/mteamtp.yml index 33ecc55b8..99862d96f 100644 --- a/src/Jackett.Common/Definitions/mteamtp.yml +++ b/src/Jackett.Common/Definitions/mteamtp.yml @@ -23,14 +23,15 @@ - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"} - {id: 404, cat: TV/Documentary, desc: "紀錄教育"} - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"} - - {id: 406, cat: Audio/Video, desc: "MV(演唱)"} - - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"} - - {id: 434, cat: Audio, desc: "Music(無損)"} - {id: 407, cat: TV/Sport, desc: "Sports(運動)"} - {id: 422, cat: PC/0day, desc: "Software(軟體)"} - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"} - {id: 427, cat: Books, desc: "eBook(電子書)"} - {id: 409, cat: Other, desc: "Misc(其他)"} + # music + - {id: 406, cat: Audio/Video, desc: "MV(演唱)"} + - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"} + - {id: 434, cat: Audio, desc: "Music(無損)"} # adult - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"} - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"} @@ -47,7 +48,6 @@ - {id: 412, cat: XXX, desc: "H-Anime(動畫)"} - {id: 413, cat: XXX, desc: "H-Comic(漫畫)"} - modes: search: [q, imdbid] tv-search: [q, season, ep, imdbid] @@ -64,6 +64,22 @@ type: info label: "" default: For best results disable the torrent name tooltip (User CP/Tracker Settings/Torrents Page). Otherwise long release names will be cut off. + - 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" login: path: takelogin.php @@ -72,9 +88,10 @@ username: "{{ .Config.username }}" password: "{{ .Config.password }}" error: + - selector: td.embedded:has(h2:contains("登录失败")) - selector: td.embedded:has(h2:contains("failed")) - test: - path: torrents.php + path: index.php + selector: a[href="logout.php"] ratio: path: torrents.php @@ -86,22 +103,31 @@ search: paths: - path: torrents.php - categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413] + categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 406, 408, 434] - path: adult.php categorymappings: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413] - method: post + - path: music.php + categorymappings: [406, 408, 434] inputs: $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}" search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" - incldead: 1 + # 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: 0 + # 0 title 1 descr 3 uploaded 4 imdb url search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}" + # 0 and 1 or 2 exact search_mode: 0 + sort: "{{ .Config.sort }}" + type: "{{ .Config.type }}" + rows: selector: table.torrents > tbody > tr:has(table.torrentname) + fields: title: # shortened for long release names - selector: a[href^="details.php?id="] > b + selector: a[href^="details.php?id="] title: optional: true # not available if IMDB tooltips are turned on selector: a[title][href^="details.php?id="] @@ -124,6 +150,10 @@ filters: - name: replace args: ["pic/nopic.jpg", ""] + imdb: + optional: true + selector: a[href*="www.imdb.com/title/tt"] + attribute: href size: selector: td.rowfollow:nth-last-child(6) grabs: @@ -166,4 +196,4 @@ description: selector: td:nth-child(2) remove: a, img -# NexusPHP +# NexusPHP Standard v1.5 Beta 4 diff --git a/src/Jackett.Common/Definitions/mteamtp2fa.yml b/src/Jackett.Common/Definitions/mteamtp2fa.yml index 002d412df..8439b6270 100644 --- a/src/Jackett.Common/Definitions/mteamtp2fa.yml +++ b/src/Jackett.Common/Definitions/mteamtp2fa.yml @@ -23,14 +23,15 @@ - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"} - {id: 404, cat: TV/Documentary, desc: "紀錄教育"} - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"} - - {id: 406, cat: Audio/Video, desc: "MV(演唱)"} - - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"} - - {id: 434, cat: Audio, desc: "Music(無損)"} - {id: 407, cat: TV/Sport, desc: "Sports(運動)"} - {id: 422, cat: PC/0day, desc: "Software(軟體)"} - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"} - {id: 427, cat: Books, desc: "eBook(電子書)"} - {id: 409, cat: Other, desc: "Misc(其他)"} + # music + - {id: 406, cat: Audio/Video, desc: "MV(演唱)"} + - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"} + - {id: 434, cat: Audio, desc: "Music(無損)"} # adult - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"} - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"} @@ -64,13 +65,29 @@ type: info label: About Titles default: For best results disable the torrent name tooltip (User CP/Tracker Settings/Torrents Page). Otherwise long release names will be cut off. - + - 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" login: method: cookie inputs: cookie: "{{ .Config.cookie }}" test: - path: torrents.php + path: index.php + selector: a[href="logout.php"] ratio: path: torrents.php @@ -82,23 +99,31 @@ search: paths: - path: torrents.php - categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413] + categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 406, 408, 434] - path: adult.php categorymappings: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413] - method: post + - path: music.php + categorymappings: [406, 408, 434] inputs: $raw: "{{range .Categories}}cat{{.}}=1&{{end}}" search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" - incldead: 1 + # 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: 0 - inclbookmarked: 0 + # 0 title 1 descr 3 uploaded 4 imdb url search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}" + # 0 and 1 or 2 exact search_mode: 0 + sort: "{{ .Config.sort }}" + type: "{{ .Config.type }}" + rows: selector: table.torrents > tbody > tr:has(table.torrentname) + fields: title: # shortened for long release names - selector: a[href^="details.php?id="] > b + selector: a[href^="details.php?id="] title: optional: true # not available if IMDB tooltips are turned on selector: a[title][href^="details.php?id="] @@ -121,6 +146,10 @@ filters: - name: replace args: ["pic/nopic.jpg", ""] + imdb: + optional: true + selector: a[href*="www.imdb.com/title/tt"] + attribute: href size: selector: td.rowfollow:nth-last-child(6) grabs: @@ -163,4 +192,4 @@ description: selector: td:nth-child(2) remove: a, img -# NexusPHP +# NexusPHP Standard v1.5 Beta 4