From 52ac5aeb0642be5e279d74ead1bbf891e626eaad Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Thu, 17 Dec 2020 10:16:16 +1300 Subject: [PATCH] Revert "epizod: fix ebook detection resolves #10538" This reverts commit 32b382cefa6b73a10454c4293c10200fbf4eb868. --- src/Jackett.Common/Definitions/acgnx.yml | 90 ------------ src/Jackett.Common/Definitions/epizod.yml | 2 - src/Jackett.Common/Definitions/morethantv.yml | 133 ------------------ 3 files changed, 225 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/acgnx.yml delete mode 100644 src/Jackett.Common/Definitions/morethantv.yml diff --git a/src/Jackett.Common/Definitions/acgnx.yml b/src/Jackett.Common/Definitions/acgnx.yml deleted file mode 100644 index 3f6e94053..000000000 --- a/src/Jackett.Common/Definitions/acgnx.yml +++ /dev/null @@ -1,90 +0,0 @@ ---- -id: acgnx -name: AcgnX -description: "AcgnX is a Public site for ANIME" -language: en-uk -type: public -encoding: UTF-8 -links: - - https://www.acgnx.se/ - -settings: [] - -caps: - categorymappings: - - {id: 1, cat: TV/Anime, desc: "Anime"} - - {id: 2, cat: TV/Anime, desc: "Anime English Translated"} - - {id: 3, cat: TV/Anime, desc: "Anime Raw"} - - {id: 4, cat: TV/Anime, desc: "Anime Non English Translated"} - - {id: 5, cat: Audio/Video, desc: "Anime Music Video"} - - {id: 6, cat: Audio, desc: "Audio"} - - {id: 7, cat: Audio/Lossless, desc: "Audio Lossless"} - - {id: 8, cat: Audio/MP3, desc: "Audio Lossy"} - - {id: 9, cat: Books, desc: "Literature"} - - {id: 10, cat: Books, desc: "Literature English Translated"} - - {id: 11, cat: Books, desc: "Literature Raw"} - - {id: 12, cat: Books, desc: "Literature Non English Translated"} - - {id: 13, cat: TV, desc: "Live Action"} - - {id: 14, cat: TV, desc: "Live Action English Translated"} - - {id: 15, cat: TV, desc: "Live Action Raw"} - - {id: 16, cat: TV, desc: "Live Action Non English Translated"} - - {id: 17, cat: TV, desc: "Live Action Idol/Promotional Video"} - - {id: 18, cat: PC, desc: "Software"} - - {id: 19, cat: PC, desc: "Applications"} - - {id: 20, cat: Console, desc: "Games"} - - {id: 21, cat: Other, desc: "Pictures"} - - {id: 22, cat: Other, desc: "Photos"} - - {id: 23, cat: Other, desc: "Graphics"} - - {id: 25, cat: Other, desc: "Other"} - - modes: - search: [q] - tv-search: [q, season, ep] - music-search: [q] - book-search: [q] - -search: - paths: - # https://www.acgnx.se/today-1.html - # https://www.acgnx.se/search.php?bound=content&keyword=sailor+moon&sort_id=2 - - path: "{{ if .Keywords }}search.php?bound=content&keyword={{ .Keywords }}&sort_id={{ join .Categories \",\" }}{{ else }}today-1.html{{ end }}" - - rows: - selector: table#listTable > tbody > tr:has(a[href^="sort-"]) - - fields: - category: - selector: a[href^="sort-"] - attribute: href - filters: - - name: split - args: ["-", 1] - title: - selector: a[href^="show-"] - details: - selector: a[href^="show-"] - attribute: href - magnet: - selector: a[href^="magnet:?xt="] - attribute: href - date: - selector: td:first-child - attribute: title - filters: - - name: append - args: " +00:00" # GMT - - name: dateparse - args: "2016-01-02 15:04 -07:00" - size: - selector: td:nth-child(4) - seeders: - selector: td:nth-child(6) - leechers: - selector: td:nth-child(7) - grabs: - selector: td:nth-child(8) - downloadvolumefactor: - text: 0 - uploadvolumefactor: - text: 1 -# engine HamotionCloud 1.3.5 diff --git a/src/Jackett.Common/Definitions/epizod.yml b/src/Jackett.Common/Definitions/epizod.yml index 5a8fed21c..645b74235 100644 --- a/src/Jackett.Common/Definitions/epizod.yml +++ b/src/Jackett.Common/Definitions/epizod.yml @@ -90,8 +90,6 @@ search: filters: - name: regexp args: "img/(.+?)_" - - name: replace - args: ["ebooks", "ebook"] category: text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}" sizecat: diff --git a/src/Jackett.Common/Definitions/morethantv.yml b/src/Jackett.Common/Definitions/morethantv.yml deleted file mode 100644 index 0cdb252f5..000000000 --- a/src/Jackett.Common/Definitions/morethantv.yml +++ /dev/null @@ -1,133 +0,0 @@ ---- -id: morethantv -name: MoreThanTV -description: "MoreThanTV is a Private torrent tracker for TV / MOVIES" -language: en-us -type: private -encoding: UTF-8 -links: - - https://www.morethantv.me/ -legacylinks: - - https://www.morethan.tv/ - -caps: - categorymappings: - - {id: 1, cat: Movies, desc: "Movies"} - - {id: 2, cat: TV, desc: "TV"} - - {id: 3, cat: Other, desc: "Other"} - - modes: - search: [q] - tv-search: [q] - movie-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: freeleech - type: checkbox - label: Search freeleech only - default: false - - name: sort - type: select - label: Sort requested from site - default: "time" - options: - "time": "created" - "seeders": "seeders" - "size": "size" - - name: type - type: select - label: Order requested from site - default: "desc" - options: - "desc": "desc" - "asc": "asc" - -login: - path: login - method: form - inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - cinfo: "2550|1350|24|-60" - keeploggedin: 1 - error: - - selector: div.error - test: - path: torrents.php - selector: "#nav_userinfo" - -search: - paths: - - path: torrents.php - inputs: - $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}" - searchtext: "" - title: "{{ .Keywords }}" - order_by: "{{ .Config.sort }}" - order_way: "{{ .Config.type }}" - action: advanced - filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" - filelist: "" - taglist: "" - - rows: - # exclude redbar torrents - selector: table#torrent_table > tbody > tr[class^="torrent row"] - - fields: - download: - selector: a[href^="/torrents.php?action=download&id="] - attribute: href - description: - selector: div.tags - title: - selector: a[href^="/torrents.php?id="] - category: - selector: a[href*="filter_cat"] - attribute: href - filters: - - name: regexp - args: "(\\d+)]=1" - details: - selector: a[href^="/torrents.php?id="] - attribute: href - banner: - optional: true - selector: td:nth-child(2) > script - filters: - - name: regexp - args: "src=\\\\\"(.*?)\\\\\"" - - name: re_replace - args: ["\\\\(.)", "$1"] - - name: replace - args: ["/static/common/noartwork/noimage.png", ""] - files: - selector: td:nth-child(3) - date: - selector: td:nth-child(5) > span - attribute: title - filters: - - name: append - args: " -07:00" # PTZ - - name: dateparse - args: "Jan 02 2006, 15:04 -07:00" - size: - selector: td:nth-child(6) - grabs: - selector: td:nth-child(7) - seeders: - selector: td:nth-child(8) - leechers: - selector: td:nth-child(9) - downloadvolumefactor: - text: 0 - uploadvolumefactor: - text: 1 -# minimumratio: the site is ratioless -# Luminance