From 5d158c0a9e9390955c2a3663f40dff533ac8e9f5 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Mon, 16 Sep 2019 17:54:32 +1200 Subject: [PATCH] demonoid: new category structure and layout. resolves #5994 --- src/Jackett.Common/Definitions/demonoid.yml | 231 +++++--------------- 1 file changed, 51 insertions(+), 180 deletions(-) diff --git a/src/Jackett.Common/Definitions/demonoid.yml b/src/Jackett.Common/Definitions/demonoid.yml index 615b49eaf..513f785d9 100644 --- a/src/Jackett.Common/Definitions/demonoid.yml +++ b/src/Jackett.Common/Definitions/demonoid.yml @@ -10,193 +10,58 @@ caps: categorymappings: - # Applications - - {id: 1, cat: PC/Phone-Android, desc: "Applications Android"} - - {id: 2, cat: PC/Phone-IOS, desc: "Applications Iphone / Ipod touch"} - - {id: 3, cat: PC, desc: "Applications Linux"} - - {id: 4, cat: PC/Mac, desc: "Applications Mac"} - - {id: 5, cat: PC/Phone-Other, desc: "Applications Mobile phone"} - - {id: 6, cat: PC, desc: "Applications PocketPC"} - - {id: 7, cat: PC/0day, desc: "Applications Windows"} - # Audio Books - - {id: 8, cat: Audio/Audiobook, desc: "Audio Books Action"} - - {id: 9, cat: Audio/Audiobook, desc: "Audio Books Adventure"} - - {id: 10, cat: Audio/Audiobook, desc: "Audio Books Biography"} - - {id: 11, cat: Audio/Audiobook, desc: "Audio Books Childrens"} - - {id: 12, cat: Audio/Audiobook, desc: "Audio Books Computers and Technology"} - - {id: 13, cat: Audio/Audiobook, desc: "Audio Books Contemporary"} - - {id: 14, cat: Audio/Audiobook, desc: "Audio Books Cooking"} - - {id: 15, cat: Audio/Audiobook, desc: "Audio Books Crafts and Hobbies"} - - {id: 16, cat: Audio/Audiobook, desc: "Audio Books Educational"} - - {id: 17, cat: Audio/Audiobook, desc: "Audio Books Fantasy"} - - {id: 18, cat: Audio/Audiobook, desc: "Audio Books Fiction"} - - {id: 19, cat: Audio/Audiobook, desc: "Audio Books General"} - - {id: 20, cat: Audio/Audiobook, desc: "Audio Books History"} - - {id: 21, cat: Audio/Audiobook, desc: "Audio Books Horror"} - - {id: 22, cat: Audio/Audiobook, desc: "Audio Books Humor"} - - {id: 23, cat: Audio/Audiobook, desc: "Audio Books Literary"} - - {id: 24, cat: Audio/Audiobook, desc: "Audio Books Magazine"} - - {id: 25, cat: Audio/Audiobook, desc: "Audio Books Mainstream"} - - {id: 26, cat: Audio/Audiobook, desc: "Audio Books Medicine and Health"} - - {id: 27, cat: Audio/Audiobook, desc: "Audio Books Mystery and Suspense"} - - {id: 28, cat: Audio/Audiobook, desc: "Audio Books Newspaper"} - - {id: 29, cat: Audio/Audiobook, desc: "Audio Books Nonfiction"} - - {id: 30, cat: Audio/Audiobook, desc: "Audio Books Other"} - - {id: 31, cat: Audio/Audiobook, desc: "Audio Books Paranormal"} - - {id: 32, cat: Audio/Audiobook, desc: "Audio Books Religion"} - - {id: 33, cat: Audio/Audiobook, desc: "Audio Books Romance"} - - {id: 34, cat: Audio/Audiobook, desc: "Audio Books RPG"} - - {id: 35, cat: Audio/Audiobook, desc: "Audio Books Sci-Fi"} - - {id: 36, cat: Audio/Audiobook, desc: "Audio Books Self-help"} - - {id: 37, cat: Audio/Audiobook, desc: "Audio Books Suspense"} - - {id: 38, cat: Audio/Audiobook, desc: "Audio Books Textbook"} - - {id: 39, cat: Audio/Audiobook, desc: "Audio Books Thriller"} - - {id: 40, cat: Audio/Audiobook, desc: "Audio Books Western"} - - {id: 41, cat: Audio/Audiobook, desc: "Audio Books Young Adult"} - # Books - - {id: 42, cat: Books/Ebook, desc: "Books Action and Adventure"} - - {id: 43, cat: Books/Ebook, desc: "Books Biography"} - - {id: 44, cat: Books/Ebook, desc: "Books Childrens"} - - {id: 45, cat: Books/Ebook, desc: "Books Computers and Technology"} - - {id: 46, cat: Books/Ebook, desc: "Books Contemporary"} - - {id: 47, cat: Books/Ebook, desc: "Books Cooking"} - - {id: 48, cat: Books/Ebook, desc: "Books Crafts and Hobbies"} - - {id: 49, cat: Books/Ebook, desc: "Books Educational"} - - {id: 50, cat: Books/Ebook, desc: "Books Fantasy"} - - {id: 51, cat: Books/Ebook, desc: "Books Fiction"} - - {id: 52, cat: Books/Ebook, desc: "Books General"} - - {id: 53, cat: Books/Ebook, desc: "Books History"} - - {id: 54, cat: Books/Ebook, desc: "Books Horror"} - - {id: 55, cat: Books/Ebook, desc: "Books Humor"} - - {id: 56, cat: Books/Ebook, desc: "Books Literary"} - - {id: 57, cat: Books/Magazines, desc: "Books Magazine"} - - {id: 58, cat: Books/Ebook, desc: "Books Mainstream"} - - {id: 59, cat: Books/Ebook, desc: "Books Medicine and Health"} - - {id: 60, cat: Books/Ebook, desc: "Books Mystery and Suspense"} - - {id: 61, cat: Books/Ebook, desc: "Books Newspaper"} - - {id: 62, cat: Books/Ebook, desc: "Books Nonfiction"} - - {id: 63, cat: Books/Ebook, desc: "Books Other"} - - {id: 64, cat: Books/Ebook, desc: "Books Paranormal"} - - {id: 65, cat: Books/Ebook, desc: "Books Religion"} - - {id: 66, cat: Books/Ebook, desc: "Books Romance"} - - {id: 67, cat: Books/Ebook, desc: "Books RPG"} - - {id: 68, cat: Books/Ebook, desc: "Books Sci-Fi"} - - {id: 69, cat: Books/Ebook, desc: "Books Self-help"} - - {id: 70, cat: Books/Ebook, desc: "Books Suspense"} - - {id: 71, cat: Books/Ebook, desc: "Books Textbook"} - - {id: 72, cat: Books/Ebook, desc: "Books Thriller"} - - {id: 73, cat: Books/Ebook, desc: "Books Western"} - - {id: 74, cat: Books/Ebook, desc: "Books Young Adult"} - # Comics - - {id: 75, cat: Books/Comics, desc: "Comics Action / Adventure"} - - {id: 76, cat: Books/Comics, desc: "Comics Crime"} - - {id: 77, cat: Books/Comics, desc: "Comics Drama"} - - {id: 78, cat: Books/Comics, desc: "Comics Fantasy"} - - {id: 79, cat: Books/Comics, desc: "Comics Historical fiction"} - - {id: 80, cat: Books/Comics, desc: "Comics Horror"} - - {id: 81, cat: Books/Comics, desc: "Comics Illustrated novel"} - - {id: 82, cat: Books/Comics, desc: "Comics Manga"} - - {id: 83, cat: Books/Comics, desc: "Comics Other"} - - {id: 84, cat: Books/Comics, desc: "Comics Real-Life"} - - {id: 85, cat: Books/Comics, desc: "Comics Sci-Fi"} - - {id: 86, cat: Books/Comics, desc: "Comics Super Hero"} - # Games - - {id: 87, cat: PC, desc: "Games DOS"} - - {id: 88, cat: Console/Other, desc: "Games Dreamcast"} - - {id: 89, cat: Console/Other, desc: "Games Emulators"} - - {id: 90, cat: Console/Other, desc: "Games GameBoy"} - - {id: 91, cat: Console/Other, desc: "Games GameCube"} - - {id: 92, cat: PC, desc: "Games Linux"} - - {id: 93, cat: PC/Mac, desc: "Games Mac"} - - {id: 94, cat: PC/Phone-Other, desc: "Games Mobile phone"} - - {id: 95, cat: Console/NDS, desc: "Games Nintendo DS"} - - {id: 96, cat: Console/Other, desc: "Games Palm"} - - {id: 97, cat: Console/PS3, desc: "Games Playstation"} - - {id: 98, cat: Console/Other, desc: "Games PocketPC"} - - {id: 99, cat: Console/PSP, desc: "Games PSP"} - - {id: 100, cat: Console/Wii, desc: "Games Wii / Wii U"} - - {id: 101, cat: PC/Games, desc: "Games Windows"} - - {id: 102, cat: Console/Xbox, desc: "Games XBox"} - # Anime - - {id: 158, cat: TV/Anime, desc: "Anime 4K / UHD"} - - {id: 103, cat: TV/Anime, desc: "Anime DVD Quality"} - - {id: 104, cat: TV/Anime, desc: "Anime HD 1080p / 1080i"} - - {id: 105, cat: TV/Anime, desc: "Anime HD 720p"} - - {id: 106, cat: TV/Anime, desc: "Anime HEVC / x265"} - - {id: 107, cat: TV/Anime, desc: "Anime Other Quality"} - - {id: 108, cat: TV/Anime, desc: "Anime TV Quality"} - - {id: 109, cat: TV/Anime, desc: "Anime VHS Quality"} - - {id: 157, cat: TV/Anime, desc: "Anime WEBRip"} - # Movies - - {id: 151, cat: Movies/UHD, desc: "Movies 4K / UHD"} - - {id: 110, cat: Movies/BluRay, desc: "Movies Blu-ray"} - - {id: 111, cat: Movies/3D, desc: "Movies Blu-ray 3D"} - - {id: 152, cat: Movies/BluRay, desc: "Movies Blu-ray Rip"} - - {id: 112, cat: Movies, desc: "Movies Cam"} - - {id: 113, cat: Movies/DVD, desc: "Movies DVD Full"} - - {id: 114, cat: Movies/DVD, desc: "Movies DVD Rip"} - - {id: 115, cat: Movies/HD, desc: "Movies HD 1080p / 1080i"} - - {id: 116, cat: Movies/HD, desc: "Movies HD 720p"} - - {id: 153, cat: Movies/HD, desc: "Movies HDRip"} - - {id: 117, cat: Movies/HD, desc: "Movies HEVC / x265"} - - {id: 118, cat: Movies/SD, desc: "Movies Other Quality"} - - {id: 119, cat: Movies, desc: "Movies Remux"} - - {id: 120, cat: Movies/SD, desc: "Movies Screener VHS"} - - {id: 121, cat: Movies/SD, desc: "Movies VHS Rip"} - - {id: 154, cat: Movies/WEBDL, desc: "Movies WEBRip"} - # Music - - {id: 122, cat: Audio, desc: "Music AAC"} - - {id: 123, cat: Audio/Lossless, desc: "Music Loseless"} - - {id: 124, cat: Audio/MP3, desc: "Music MP3/128Kbps"} - - {id: 125, cat: Audio/MP3, desc: "Music MP3/192Kbps"} - - {id: 126, cat: Audio/MP3, desc: "Music MP3/256Kbps"} - - {id: 127, cat: Audio/MP3, desc: "Music MP3/64Kbps"} - - {id: 128, cat: Audio/MP3, desc: "Music MP3/Over 256Kbps"} - - {id: 129, cat: Audio/MP3, desc: "Music MP3/Surround"} - - {id: 130, cat: Audio/MP3, desc: "Music MP3/Variable"} - - {id: 131, cat: Audio, desc: "Music MPC"} - - {id: 132, cat: Audio, desc: "Music OGG"} - - {id: 133, cat: Audio, desc: "Music Other Quality"} - - {id: 134, cat: Audio, desc: "Music WMA"} - # Music Videos - - {id: 135, cat: Audio/Video, desc: "Music Videos DVD Quality"} - - {id: 136, cat: Audio/Video, desc: "Music Videos HEVC / x265"} - - {id: 137, cat: Audio/Video, desc: "Music Videos Other Quality"} - - {id: 138, cat: Audio/Video, desc: "Music Videos TV Quality"} - - {id: 139, cat: Audio/Video, desc: "Music Videos VHS Quality"} - # Pictures - - {id: 140, cat: Other, desc: "Pictures Hi-Res"} - - {id: 141, cat: Other, desc: "Pictures Low-Res"} - - {id: 142, cat: Other, desc: "Pictures Mixed Quality"} - # TV - - {id: 155, cat: TV/UHD, desc: "TV 4K / UHD"} - - {id: 143, cat: TV/SD, desc: "TV DVD Quality"} - - {id: 144, cat: TV/HD, desc: "TV HD 1080p / 1080i"} - - {id: 145, cat: TV/HD, desc: "TV HD 720p"} - - {id: 146, cat: TV/HD, desc: "TV HEVC / x265"} - - {id: 147, cat: TV/SD, desc: "TV Other Quality"} - - {id: 148, cat: TV/HD, desc: "TV TV Quality"} - - {id: 149, cat: TV/SD, desc: "TV VHS Quality"} - - {id: 156, cat: TV/WEB-DL, desc: "TV WEBRip"} + - {id: 1, cat: PC, desc: "Applications"} + - {id: 2, cat: Audio/Audiobook, desc: "Audio Books"} + - {id: 3, cat: Books/Ebook, desc: "Books"} + - {id: 4, cat: Books/Comics, desc: "Comics"} + - {id: 5, cat: PC/Games, desc: "Games"} + - {id: 6, cat: TV/Anime, desc: "Anime"} + - {id: 7, cat: Other, desc: "Miscellaneous"} + - {id: 8, cat: Movies, desc: "Movies"} + - {id: 9, cat: Audio, desc: "Music"} + - {id: 10, cat: Audio/Video, desc: "Music Videos"} + - {id: 11, cat: Other, desc: "Pictures"} + - {id: 12, cat: TV, desc: "TV"} modes: search: [q] tv-search: [q, season, ep] movie-search: [q] - settings: [] + settings: + - name: category + type: select + label: Category + default: "0" + options: + "0": "All" + "1": "Applications" + "2": "Audio Books" + "3": "Books" + "4": "Comics" + "5": "Games" + "6": "Anime" + "7": "Miscellaneous" + "8": "Movies" + "9": "Music" + "10": "Music Videos" + "11": "Pictures" + "12": "TV" download: selector: a[href^="magnet:?xt="] search: paths: - # https://www.dnoid.to/files/?c115&c116&c118&lang=0&incldead=0&search=&sort=id&order=desc + # https://www.dnoid.to/files/?category=0&subcategory=0&language=0&quality=0&incldead=3&search=id&sort=desc - path: files/ inputs: - $raw: "{{range .Categories}}c{{.}}&{{end}}" - lang: 0 - incldead: 0 + category: "{{.Config.category}}" + subcategory: 0 + language: 0 + quality: 0 + # 1 active 2 dead 3 both + incldead: 3 search: "{{.Keywords}}" sort: id order: desc @@ -205,25 +70,31 @@ after: 1 filters: - name: andmatch + dateheaders: + selector: tr td.added_today + filters: + - name: replace + args: ["Added ", ""] + - name: replace + args: ["on ", ""] fields: title: selector: a[href^="/files/details/"] + attribute: title category: - selector: td span.subcategory a.subcategory:nth-child(2) + selector: a[href^="/files/?category="] attribute: href filters: - - name: regexp - args: (\d+)$ + - name: querystring + args: category details: selector: a[href^="/files/details/"] attribute: href download: selector: a[href^="/files/details/"] attribute: href - date: - selector: td:nth-last-child(7) - filters: - - name: timeago + description: + selector: td:nth-last-child(9) size: selector: td:nth-last-child(6) grabs: