From c8d8ca511b771460fbdc636b675cfce052c7cd2d Mon Sep 17 00:00:00 2001 From: send-your-nudes <2650615+send-your-nudes@users.noreply.github.com> Date: Sat, 5 Oct 2019 20:25:54 +0000 Subject: [PATCH] demonoid: switch to using subcategory (#6090) --- src/Jackett.Common/Definitions/demonoid.yml | 291 +++++++++++++++++--- 1 file changed, 252 insertions(+), 39 deletions(-) diff --git a/src/Jackett.Common/Definitions/demonoid.yml b/src/Jackett.Common/Definitions/demonoid.yml index 513f785d9..e75cf4ba8 100644 --- a/src/Jackett.Common/Definitions/demonoid.yml +++ b/src/Jackett.Common/Definitions/demonoid.yml @@ -10,60 +10,273 @@ caps: categorymappings: - - {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"} + # 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 Sci-Fi"} + - {id: 103, cat: TV/Anime, desc: "Anime Action"} + - {id: 104, cat: TV/Anime, desc: "Anime Adventure"} + - {id: 105, cat: TV/Anime, desc: "Anime Comedy"} + - {id: 106, cat: TV/Anime, desc: "Anime Drama"} + - {id: 107, cat: TV/Anime, desc: "Anime Fantasy"} + - {id: 108, cat: TV/Anime, desc: "Anime Horror"} + - {id: 109, cat: TV/Anime, desc: "Anime Other"} + - {id: 157, cat: TV/Anime, desc: "Anime Romance"} + # Movies + - {id: 151, cat: Movies, desc: "Movies Action"} + - {id: 110, cat: Movies, desc: "Movies Adventure"} + - {id: 236, cat: Movies, desc: "Movies Animation"} + - {id: 111, cat: Movies, desc: "Movies Biography"} + - {id: 152, cat: Movies, desc: "Movies Comedy"} + - {id: 112, cat: Movies, desc: "Movies Concerts"} + - {id: 113, cat: Movies, desc: "Movies Crime"} + - {id: 114, cat: Movies, desc: "Movies Documentary"} + - {id: 115, cat: Movies, desc: "Movies Drama"} + - {id: 116, cat: Movies, desc: "Movies Family"} + - {id: 153, cat: Movies, desc: "Movies Fantasy"} + - {id: 117, cat: Movies, desc: "Movies Horror"} + - {id: 118, cat: Movies, desc: "Movies Musical"} + - {id: 119, cat: Movies, desc: "Movies Mystery"} + - {id: 120, cat: Movies, desc: "Movies Other"} + - {id: 121, cat: Movies, desc: "Movies Romance"} + - {id: 154, cat: Movies, desc: "Movies Sci-Fi"} + - {id: 159, cat: Movies, desc: "Movies Short-Film"} + - {id: 160, cat: Movies, desc: "Movies Sports"} + - {id: 161, cat: Movies, desc: "Movies Thriller"} + - {id: 162, cat: Movies, desc: "Movies Trailers"} + - {id: 163, cat: Movies, desc: "Movies War"} + - {id: 164, cat: Movies, desc: "Movies Western"} + # Music + - {id: 122, cat: Audio, desc: "Music Alternative"} + - {id: 123, cat: Audio, desc: "Music Bluegrass"} + - {id: 124, cat: Audio, desc: "Music Blues"} + - {id: 125, cat: Audio, desc: "Music Childrens"} + - {id: 126, cat: Audio, desc: "Music Christian"} + - {id: 127, cat: Audio, desc: "Music Classical"} + - {id: 128, cat: Audio, desc: "Music Comedy"} + - {id: 129, cat: Audio, desc: "Music Contemporary African"} + - {id: 130, cat: Audio, desc: "Music Country"} + - {id: 131, cat: Audio, desc: "Music Dance / Disco"} + - {id: 132, cat: Audio, desc: "Music Drum and Bass"} + - {id: 133, cat: Audio, desc: "Music Electro / Techno"} + - {id: 134, cat: Audio, desc: "Music Folk"} + - {id: 165, cat: Audio, desc: "Music Gospel"} + - {id: 166, cat: Audio, desc: "Music Grunge"} + - {id: 167, cat: Audio, desc: "Music Hip-Hop / Rap"} + - {id: 168, cat: Audio, desc: "Music Indie"} + - {id: 169, cat: Audio, desc: "Music Industrial"} + - {id: 170, cat: Audio, desc: "Music J-Pop"} + - {id: 171, cat: Audio, desc: "Music Jazz"} + - {id: 172, cat: Audio, desc: "Music Latin American"} + - {id: 173, cat: Audio, desc: "Music Melodic"} + - {id: 174, cat: Audio, desc: "Music Metal"} + - {id: 175, cat: Audio, desc: "Music Other"} + - {id: 176, cat: Audio, desc: "Music Pop"} + - {id: 177, cat: Audio, desc: "Music Punk"} + - {id: 178, cat: Audio, desc: "Music Radio Show"} + - {id: 179, cat: Audio, desc: "Music Reggae"} + - {id: 180, cat: Audio, desc: "Music Rhythm and blues"} + - {id: 181, cat: Audio, desc: "Music Rock"} + - {id: 182, cat: Audio, desc: "Music Soul"} + - {id: 183, cat: Audio, desc: "Music Soundtrack"} + - {id: 184, cat: Audio, desc: "Music Trance"} + - {id: 185, cat: Audio, desc: "Music Trip Hop"} + # Music Videos + - {id: 135, cat: Audio/Video, desc: "Music Videos Alternative"} + - {id: 136, cat: Audio/Video, desc: "Music Videos Bluegrass"} + - {id: 137, cat: Audio/Video, desc: "Music Videos Blues"} + - {id: 138, cat: Audio/Video, desc: "Music Videos Childrens"} + - {id: 139, cat: Audio/Video, desc: "Music Videos Christian"} + - {id: 186, cat: Audio/Video, desc: "Music Videos Classical"} + - {id: 187, cat: Audio/Video, desc: "Music Videos Comedy"} + - {id: 188, cat: Audio/Video, desc: "Music Videos Contemporary African"} + - {id: 189, cat: Audio/Video, desc: "Music Videos Country"} + - {id: 190, cat: Audio/Video, desc: "Music Videos Dance / Disco"} + - {id: 191, cat: Audio/Video, desc: "Music Videos Drum and Bass"} + - {id: 192, cat: Audio/Video, desc: "Music Videos Electro / Techno"} + - {id: 193, cat: Audio/Video, desc: "Music Videos Folk"} + - {id: 194, cat: Audio/Video, desc: "Music Videos Gospel"} + - {id: 195, cat: Audio/Video, desc: "Music Videos Grunge"} + - {id: 196, cat: Audio/Video, desc: "Music Videos Hip-Hop / Rap"} + - {id: 197, cat: Audio/Video, desc: "Music Videos Indie"} + - {id: 198, cat: Audio/Video, desc: "Music Videos Industrial"} + - {id: 199, cat: Audio/Video, desc: "Music Videos J-Pop"} + - {id: 200, cat: Audio/Video, desc: "Music Videos Jazz"} + - {id: 201, cat: Audio/Video, desc: "Music Videos Latin American"} + - {id: 202, cat: Audio/Video, desc: "Music Videos Melodic"} + - {id: 203, cat: Audio/Video, desc: "Music Videos Metal"} + - {id: 204, cat: Audio/Video, desc: "Music Videos Other"} + - {id: 205, cat: Audio/Video, desc: "Music Videos Pop"} + - {id: 206, cat: Audio/Video, desc: "Music Videos Punk"} + - {id: 207, cat: Audio/Video, desc: "Music Videos Radio Show"} + - {id: 208, cat: Audio/Video, desc: "Music Videos Reggae"} + - {id: 209, cat: Audio/Video, desc: "Music Videos Rhythm and blues"} + - {id: 210, cat: Audio/Video, desc: "Music Videos Rock"} + - {id: 211, cat: Audio/Video, desc: "Music Videos Soul"} + - {id: 212, cat: Audio/Video, desc: "Music Videos Soundtrack"} + - {id: 213, cat: Audio/Video, desc: "Music Videos Trance"} + - {id: 214, cat: Audio/Video, desc: "Music Videos Trip Hop"} + # Pictures + - {id: 140, cat: Other, desc: "Pictures Art"} + - {id: 141, cat: Other, desc: "Pictures Commercial"} + - {id: 142, cat: Other, desc: "Pictures Glamour"} + - {id: 215, cat: Other, desc: "Pictures Other"} + - {id: 216, cat: Other, desc: "Pictures Photojournalism"} + - {id: 217, cat: Other, desc: "Pictures Snapshots"} + - {id: 218, cat: Other, desc: "Pictures Sports"} + - {id: 219, cat: Other, desc: "Pictures Wildlife"} + # TV + - {id: 155, cat: TV, desc: "TV Action"} + - {id: 143, cat: TV, desc: "TV Adventure"} + - {id: 144, cat: TV, desc: "TV Biography"} + - {id: 145, cat: TV, desc: "TV Cartoons"} + - {id: 146, cat: TV, desc: "TV Comedy"} + - {id: 147, cat: TV, desc: "TV Concerts"} + - {id: 148, cat: TV, desc: "TV Crime"} + - {id: 149, cat: TV, desc: "TV Documentary"} + - {id: 156, cat: TV, desc: "TV Drama"} + - {id: 220, cat: TV, desc: "TV Family"} + - {id: 221, cat: TV, desc: "TV Fantasy"} + - {id: 222, cat: TV, desc: "TV Horror"} + - {id: 223, cat: TV, desc: "TV Musical"} + - {id: 224, cat: TV, desc: "TV Mystery"} + - {id: 225, cat: TV, desc: "TV Other"} + - {id: 226, cat: TV, desc: "TV Reality"} + - {id: 227, cat: TV, desc: "TV Romance"} + - {id: 228, cat: TV, desc: "TV Sci-Fi"} + - {id: 229, cat: TV, desc: "TV Short film"} + - {id: 230, cat: TV, desc: "TV Sports"} + - {id: 231, cat: TV, desc: "TV Talk show"} + - {id: 232, cat: TV, desc: "TV Thriller"} + - {id: 233, cat: TV, desc: "TV Trailers"} + - {id: 234, cat: TV, desc: "TV War"} + - {id: 235, cat: TV, desc: "TV Western"} modes: search: [q] tv-search: [q, season, ep] movie-search: [q] - 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" + settings: [] download: selector: a[href^="magnet:?xt="] search: paths: - # https://www.dnoid.to/files/?category=0&subcategory=0&language=0&quality=0&incldead=3&search=id&sort=desc + # https://www.dnoid.to/files/?c1&c2&c3&lang=0&incldead=3&search=&sort=added&order=desc - path: files/ inputs: - category: "{{.Config.category}}" - subcategory: 0 - language: 0 - quality: 0 + $raw: "{{range .Categories}}c{{.}}&{{end}}" # 1 active 2 dead 3 both incldead: 3 search: "{{.Keywords}}" - sort: id + sort: added order: desc rows: selector: table.ttable_headinner tr:has(td[class^="tone_"]) @@ -82,11 +295,11 @@ selector: a[href^="/files/details/"] attribute: title category: - selector: a[href^="/files/?category="] + selector: a[href*="&subcategory="] attribute: href filters: - name: querystring - args: category + args: subcategory details: selector: a[href^="/files/details/"] attribute: href