From daf23439f10be1fddce8f8e42c96ab63566fbd36 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Wed, 31 Jul 2024 22:03:39 -0500 Subject: [PATCH] jackett indexers as of fafc5a8aea56ad328df6d3b9924da899caaae364 [2024-08-01T03:03:39Z] [backports skipped - TODO] --- definitions/v10/riperam.yml | 21 ++- definitions/v10/rudub.yml | 4 +- definitions/v9/madsrevolution.yml | 192 +++++++++++++++++++++++++++ definitions/v9/world-of-tomorrow.yml | 84 ++++++------ 4 files changed, 245 insertions(+), 56 deletions(-) create mode 100644 definitions/v9/madsrevolution.yml diff --git a/definitions/v10/riperam.yml b/definitions/v10/riperam.yml index 3eed6da81..8b5f54fd4 100644 --- a/definitions/v10/riperam.yml +++ b/definitions/v10/riperam.yml @@ -13,6 +13,7 @@ legacylinks: caps: categorymappings: - {id: 238, cat: Movies, desc: "Новинки кино (2024). Новые фильмы скачать бесплатно"} + - {id: 368, cat: Movies/SD, desc: "CAMRip, TS, DVDScreener"} - {id: 425, cat: Movies/HD, desc: "DVDRip / DVD-5/DVD-9"} - {id: 50, cat: Movies/HD, desc: "DVDRip"} - {id: 52, cat: Movies/HD, desc: "DVD-5/DVD-9"} @@ -59,7 +60,6 @@ caps: - {id: 160, cat: TV, desc: "Теория большого взрыва"} - {id: 20, cat: TV, desc: "Русские сериалы"} - {id: 210, cat: TV, desc: "!!! Полные завершенные сериалы !!!"} - - {id: 969, cat: TV, desc: "13"} - {id: 707, cat: TV, desc: "Агент"} - {id: 1028, cat: TV, desc: "Белые волки"} - {id: 736, cat: TV, desc: "Бомбила. Продолжение"} @@ -85,7 +85,6 @@ caps: - {id: 774, cat: TV, desc: "Кулинар-2"} - {id: 989, cat: TV, desc: "Курортная полиция"} - {id: 961, cat: TV, desc: "Личное дело"} - - {id: 639, cat: TV, desc: "Ловушка"} - {id: 1013, cat: TV, desc: "Лучшие враги"} - {id: 131, cat: TV, desc: "Майор полиции"} - {id: 727, cat: TV, desc: "Маяковский - Два дня"} @@ -114,7 +113,6 @@ caps: - {id: 755, cat: TV, desc: "Студия 17"} - {id: 1039, cat: TV, desc: "Тайны следствия"} - {id: 360, cat: TV, desc: "Такси"} - - {id: 981, cat: TV, desc: "Темный мир: Равновесие"} - {id: 1046, cat: TV, desc: "Тест на беременность"} - {id: 977, cat: TV, desc: "Тихая охота"} - {id: 681, cat: TV, desc: "Топтуны"} @@ -127,10 +125,8 @@ caps: - {id: 780, cat: TV, desc: "Шерлок Холмс"} - {id: 805, cat: TV, desc: "Этаж"} - {id: 743, cat: TV, desc: "Ясмин"} - - {id: 973, cat: TV, desc: "Умник"} - {id: 733, cat: TV, desc: "Хмуров"} - {id: 505, cat: TV, desc: "Хозяйка моей судьбы"} - - {id: 1004, cat: TV, desc: "Анжелика"} - {id: 1047, cat: TV, desc: "Бессмертник"} - {id: 1074, cat: TV, desc: "Без свидетелей"} - {id: 692, cat: TV, desc: "Верное средство"} @@ -150,7 +146,6 @@ caps: - {id: 1083, cat: TV, desc: "Код Константина"} - {id: 1092, cat: TV, desc: "Измены"} - {id: 565, cat: TV, desc: "Кодекс чести"} - - {id: 797, cat: TV, desc: "Корабль"} - {id: 1070, cat: TV, desc: "Инспектор Купер"} - {id: 640, cat: TV, desc: "Легавый"} - {id: 1048, cat: TV, desc: "Луна"} @@ -179,10 +174,8 @@ caps: - {id: 1024, cat: TV, desc: "Литейный"} - {id: 1023, cat: TV, desc: "Раскаяние"} - {id: 1076, cat: TV, desc: "Родители"} - - {id: 972, cat: TV, desc: "Сватьи"} - {id: 1073, cat: TV, desc: "Чужое гнездо"} - {id: 1078, cat: TV, desc: "Чтец"} - - {id: 691, cat: TV, desc: "Черные кошки"} - {id: 628, cat: TV, desc: "Карпов"} - {id: 1101, cat: TV, desc: "Квест"} - {id: 1088, cat: TV, desc: "Лондонград"} @@ -201,7 +194,6 @@ caps: - {id: 1181, cat: TV, desc: "Вышибала"} - {id: 1165, cat: TV, desc: "Гастролеры (Беглецы)"} - {id: 1150, cat: TV, desc: "Гражданин Никто"} - - {id: 509, cat: TV, desc: "Два отца и два сына"} - {id: 656, cat: TV, desc: "Деффчонки"} - {id: 1128, cat: TV, desc: "Другой майор Соколов"} - {id: 1192, cat: TV, desc: "Жемчуга"} @@ -213,9 +205,7 @@ caps: - {id: 1077, cat: TV, desc: "Клан Ювелиров"} - {id: 1118, cat: TV, desc: "Команда"} - {id: 1132, cat: TV, desc: "Кости"} - - {id: 354, cat: TV, desc: "Кухня"} - {id: 1040, cat: TV, desc: "Мажор"} - - {id: 1104, cat: TV, desc: "Метод"} - {id: 1189, cat: TV, desc: "Москва. Центральный округ"} - {id: 1135, cat: TV, desc: "На глубине"} - {id: 1151, cat: TV, desc: "Напарницы"} @@ -306,6 +296,10 @@ caps: - {id: 596, cat: TV/Anime, desc: "Zero no Tsukaima Princess no Rondo TV-3 / Подручный бездарной Луизы: Рондо Принцессы ТВ-3"} - {id: 597, cat: TV/Anime, desc: "Zero no Tsukaima F TV-4 / Подручный бездарной Луизы Финал ТВ-4"} - {id: 242, cat: TV, desc: "Без перевода"} + - {id: 164, cat: TV, desc: "Фильмы"} + - {id: 167, cat: TV, desc: "Сериалы"} + - {id: 165, cat: TV, desc: "Мультфильмы"} + - {id: 166, cat: TV, desc: "Передачи - Тв-шоу"} - {id: 241, cat: TV, desc: "ТВ-Шоу, документальные, спорт"} - {id: 23, cat: TV, desc: "ТВ-Шоу и развлекательные передачи"} - {id: 1075, cat: TV, desc: "Архив ТВ-Шоу"} @@ -423,8 +417,6 @@ caps: - {id: 480, cat: TV, desc: "Камеди Woman"} - {id: 459, cat: TV, desc: "Говорим и показываем"} - {id: 479, cat: TV, desc: "Comedy Club - Камеди Клаб"} - - {id: 33, cat: TV, desc: "ДОМ 2"} - - {id: 270, cat: TV, desc: "Архив Дом-2"} - {id: 1484, cat: TV, desc: "ДНК"} - {id: 1483, cat: TV, desc: "За гранью"} - {id: 1469, cat: TV, desc: "Звезды сошлись"} @@ -475,6 +467,7 @@ caps: - {id: 1477, cat: TV/Documentary, desc: "Последний герой"} - {id: 1478, cat: TV/Documentary, desc: "Бородина против Бузовой"} - {id: 1488, cat: TV/Documentary, desc: "Док-ток"} + - {id: 1493, cat: TV/Documentary, desc: "'Рожденные в СССР' Ностальгия"} - {id: 24, cat: TV/Documentary, desc: "Документальные передачи"} - {id: 1460, cat: TV/Documentary, desc: "Специальный репортаж (ТК Звезда)"} - {id: 728, cat: TV/Documentary, desc: "Чудо техники с Сергеем Малозёмовым"} @@ -757,6 +750,7 @@ caps: - {id: 1471, cat: Books, desc: "Кулинария"} - {id: 1333, cat: Books, desc: "Разное"} - {id: 1485, cat: Books, desc: "Медицина"} + - {id: 1494, cat: Books, desc: "Манга / Комиксы"} - {id: 1312, cat: Books, desc: "Аудиокниги"} - {id: 1398, cat: Books, desc: "Приключения"} - {id: 1396, cat: Books, desc: "Детектив"} @@ -791,6 +785,7 @@ caps: - {id: 1349, cat: Books, desc: "Детские журналы"} - {id: 1351, cat: Books, desc: "Военные журналы"} - {id: 1350, cat: Books, desc: "Хобби (Разное)"} + - {id: 1292, cat: Books, desc: "Хобби (Разное)"} modes: search: [q] diff --git a/definitions/v10/rudub.yml b/definitions/v10/rudub.yml index 05bcb45a3..0e431aef0 100644 --- a/definitions/v10/rudub.yml +++ b/definitions/v10/rudub.yml @@ -9,7 +9,7 @@ type: semi-private encoding: windows-1251 followredirect: true links: - - https://30july.rudub.online/ + - https://01august.rudub.online/ legacylinks: - https://rudub.online/ - https://01july.rudub.online/ @@ -41,6 +41,8 @@ legacylinks: - https://27july.rudub.online/ - https://28july.rudub.online/ - https://29july.rudub.online/ + - https://30july.rudub.online/ + - https://31july.rudub.online/ caps: categorymappings: diff --git a/definitions/v9/madsrevolution.yml b/definitions/v9/madsrevolution.yml new file mode 100644 index 000000000..fdc1b7fa6 --- /dev/null +++ b/definitions/v9/madsrevolution.yml @@ -0,0 +1,192 @@ +--- +id: madsrevolution +name: MaDs Revolution +description: "MaDs Revolution is a Private GERMAN site for MOVIES / TV / GENERAL" +language: de-DE +type: private +encoding: UTF-8 +links: + - https://madsrevolution.net/ + +caps: + categorymappings: + - {id: 52, cat: Movies/UHD, desc: "Filme UHD"} + - {id: 3, cat: Movies/HD, desc: "Filme 1080p"} + - {id: 4, cat: Movies/HD, desc: "Filme 720p"} + - {id: 47, cat: Movies/HD, desc: "Filme x264"} + - {id: 2, cat: Movies/SD, desc: "Filme DivX/XviD"} + - {id: 1, cat: Movies/DVD, desc: "Filme DVD-R"} + - {id: 20, cat: Movies/3D, desc: "Filme 3D"} + - {id: 54, cat: TV/UHD, desc: "Serien UHD"} + - {id: 28, cat: TV/HD, desc: "Serien 1080p"} + - {id: 26, cat: TV/HD, desc: "Serien 720p"} + - {id: 48, cat: TV/HD, desc: "Serien x264"} + - {id: 27, cat: TV/SD, desc: "Serien DivX/XviD"} + - {id: 25, cat: TV/SD, desc: "Serien DVD-R"} + - {id: 8, cat: TV/Other, desc: "Serien Unsorted"} + - {id: 38, cat: Audio, desc: "Musik Album"} + - {id: 37, cat: Audio, desc: "Musik Single/EP"} + - {id: 40, cat: Audio/Video, desc: "Musik Video"} + - {id: 39, cat: Audio, desc: "Musik Pack"} + - {id: 14, cat: Audio/Other, desc: "Musik Unsorted"} + - {id: 44, cat: PC/0day, desc: "Software Windows"} + - {id: 42, cat: PC/Mac, desc: "Software Mac"} + - {id: 41, cat: PC, desc: "Software Linux"} + - {id: 43, cat: PC/Mobile-Other, desc: "Software Mobile"} + - {id: 11, cat: PC, desc: "Software Unsorted"} + - {id: 12, cat: PC/Games, desc: "Spiele PC"} + - {id: 13, cat: Console, desc: "Spiele Konsole"} + - {id: 17, cat: Console, desc: "Spiele Portable"} + - {id: 46, cat: Console, desc: "Spiele Other"} + - {id: 53, cat: TV/Documentary, desc: "Dokus UHD"} + - {id: 24, cat: TV/Documentary, desc: "Dokus 1080p"} + - {id: 22, cat: TV/Documentary, desc: "Dokus 720p"} + - {id: 49, cat: TV/Documentary, desc: "Dokus x264"} + - {id: 23, cat: TV/Documentary, desc: "Dokus DivX/XviD"} + - {id: 21, cat: TV/Documentary, desc: "Dokus DVD-R"} + - {id: 7, cat: TV/Documentary, desc: "Dokus Unsorted"} + - {id: 55, cat: TV/Sport, desc: "Sport UHD"} + - {id: 32, cat: TV/Sport, desc: "Sport 1080p"} + - {id: 30, cat: TV/Sport, desc: "Sport 720p"} + - {id: 50, cat: TV/Sport, desc: "Sport x264"} + - {id: 31, cat: TV/Sport, desc: "Sport DivX/XviD"} + - {id: 29, cat: TV/Sport, desc: "Sport DVD-R"} + - {id: 9, cat: TV/Sport, desc: "Sport Unsorted"} + - {id: 15, cat: Audio/Audiobook, desc: "Books aBooks"} + - {id: 18, cat: Books/EBook, desc: "Books eBooks"} + - {id: 56, cat: XXX, desc: "XXX UHD"} + - {id: 36, cat: XXX, desc: "XXX 1080p"} + - {id: 34, cat: XXX, desc: "XXX 720p"} + - {id: 51, cat: XXX, desc: "XXX x264"} + - {id: 35, cat: XXX, desc: "XXX DivX/XviD"} + - {id: 33, cat: XXX, desc: "XXX DVD-R"} + - {id: 10, cat: XXX, desc: "XXX Unsorted"} + - {id: 5, cat: TV/Anime, desc: "Misc Anime"} + - {id: 6, cat: XXX, desc: "Misc Hentai"} + - {id: 19, cat: Other, desc: "Misc Other"} + + modes: + search: [q] + tv-search: [q, season, ep, genre] + movie-search: [q, genre] + music-search: [q, genre] + book-search: [q, genre] + +settings: + - name: username + type: text + label: Username + - name: password + type: password + label: Password + - name: freeleech + type: checkbox + label: Search freeleech only + default: false + - name: info_tpp + type: info + label: Results Per Page + default: For best results, change the Torrents per page: setting to 100 on your account profile. + - name: sort + type: select + label: Sort requested from site + default: s3 + options: + s3: created + s6: seeders + s4: size + s1: title + - name: type + type: select + label: Order requested from site + default: DESC + options: + DESC: desc + ASC: asc + - name: info_activity + type: info + label: Account Inactivity + default: "After 8 weeks of inactivity, the account will be automatically deleted." + +login: + path: login.php + method: post + inputs: + username: "{{ .Config.username }}" + password: "{{ .Config.password }}" + keeplogged: 1 + error: + - selector: div#error-text + test: + path: index.php + selector: a[href^="logout.php?auth="] + +search: + paths: + - path: torrents.php + inputs: + $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}" + action: "{{ if .Config.freeleech }}uploadonly{{ else }}{{ end }}" + searchstr: "{{ .Keywords }}" + searchtags: "{{ .Query.Genre }}" + # 0 any, 1 all + tags_type: 0 + order_by: "{{ .Config.sort }}" + order_way: "{{ .Config.type }}" + # site does not support imdbid searching or present imdb links in results. + + rows: + selector: table#torrent_table > tbody > tr.torrent:has(a[href^="torrents.php?action=download&id="]) + + fields: + category: + selector: a.c-sub + attribute: href + filters: + - name: regexp + args: "\\[(\\d+)\\]" + title: + selector: a[href^="torrents.php?id="] + details: + selector: a[href^="torrents.php?id="] + attribute: href + download: + selector: a[href^="torrents.php?action=download&id="] + attribute: href + poster: + selector: a[href^="torrents.php?id="] + attribute: onmouseover + filters: + - name: regexp + args: "src=(.+?) " + genre: + selector: div.tags + description: + text: "{{ .Result.genre }}" + date: + selector: td:nth-last-child(5) + filters: + - name: append + args: " +01:00" # CET + - name: dateparse + args: "dd MMM yyyy, HH:mm zzz" + size: + selector: td:nth-last-child(4) + grabs: + selector: td:nth-last-child(3) + seeders: + selector: td:nth-last-child(2) + leechers: + selector: td:nth-last-child(1) + downloadvolumefactor: + case: + "strong:contains(\"UploadOnly!\")": 0 + "*": 1 + uploadvolumefactor: + text: 1 + minimumratio: + text: 0.8 + minimumseedtime: + # 3 days (as seconds = 3 x 24 x 60 x 60) + text: 259200 +# engine n/a diff --git a/definitions/v9/world-of-tomorrow.yml b/definitions/v9/world-of-tomorrow.yml index 1f2eff247..8bda8ba2e 100644 --- a/definitions/v9/world-of-tomorrow.yml +++ b/definitions/v9/world-of-tomorrow.yml @@ -13,56 +13,56 @@ legacylinks: caps: categorymappings: - - {id: 1014, cat: Audio/MP3, desc: "Alben / Sampler / Singles"} - - {id: 1087, cat: TV/Anime, desc: "Anime"} - - {id: 1105, cat: TV/Anime, desc: "Anime Serien"} - - {id: 1018, cat: PC, desc: "Appz-Sonstige"} + - {id: 1068, cat: PC, desc: "Programme"} + - {id: 1107, cat: PC/Mac, desc: "Programme MAC"} + - {id: 1018, cat: PC, desc: "Programme Sonstige"} + - {id: 1028, cat: PC/0day, desc: "Programme Windows"} + - {id: 1069, cat: Audio, desc: "Musik"} + - {id: 1036, cat: Audio/Audiobook, desc: "Hörbücher"} + - {id: 1072, cat: Audio, desc: "Musik Packs"} + - {id: 1093, cat: Audio/Video, desc: "Musik Videos"} + - {id: 1070, cat: Audio/Lossless, desc: "Musik Flac"} + - {id: 1014, cat: Audio/MP3, desc: "Musik MP3"} + - {id: 1071, cat: Audio, desc: "Soundtracks"} + - {id: 1110, cat: Audio, desc: "Musik WOTT"} + - {id: 1066, cat: Movies, desc: "Filme"} + - {id: 1049, cat: Movies/HD, desc: "Filme 1080p"} + - {id: 1090, cat: Movies/3D, desc: "Filme 3D"} + - {id: 1048, cat: Movies/HD, desc: "Filme 720p"} + - {id: 1087, cat: TV/Anime, desc: "Filme Anime"} + - {id: 1047, cat: Movies/BluRay, desc: "Filme Bluray"} + - {id: 1011, cat: Movies/DVD, desc: "Filme DVD / HD2DVD"} + - {id: 1060, cat: Movies/HD, desc: "Filme HDTV"} + - {id: 1091, cat: Movies, desc: "Filme-Packs"} + - {id: 1062, cat: Movies/SD, desc: "Filme-SD"} + - {id: 1089, cat: Movies/UHD, desc: "Filme UHD"} + - {id: 1108, cat: TV, desc: "Filme WOTT"} + - {id: 1108, cat: Movies, desc: "Filme WOTT"} + - {id: 1076, cat: TV, desc: "Serien"} + - {id: 1079, cat: TV/HD, desc: "Serien 1080P"} + - {id: 1095, cat: TV/UHD, desc: "Serien 2160P"} + - {id: 1078, cat: TV/HD, desc: "Serien 720P"} + - {id: 1105, cat: TV/Anime, desc: "Serien Anime"} + - {id: 1100, cat: TV/HD, desc: "Serien Packs HD"} + - {id: 1016, cat: TV/SD, desc: "Serien Packs SD"} + - {id: 1077, cat: TV/SD, desc: "Serien SD"} + - {id: 1109, cat: TV, desc: "Serien WOTT"} - {id: 1064, cat: TV/Documentary, desc: "Dokumentation"} - {id: 1019, cat: Books/EBook, desc: "Ebooks"} - - {id: 1111, cat: XXX, desc: "Englisch Section"} - - {id: 1070, cat: Audio/Lossless, desc: "Flac"} - - {id: 1075, cat: TV/Sport, desc: "Formel 1"} - - {id: 1074, cat: TV/Sport, desc: "Fussball"} - - {id: 1083, cat: TV/Sport, desc: "Games"} - - {id: 1036, cat: Audio/Audiobook, desc: "Hörbuch"} + - {id: 1111, cat: Books/EBook, desc: "Ebooks English Section"} - {id: 1101, cat: TV, desc: "Kids"} - - {id: 1005, cat: Console, desc: "Konsolen-Games"} - - {id: 1107, cat: PC/Mac, desc: "MAC-Programme"} - - {id: 1091, cat: Movies, desc: "Movies"} - - {id: 1066, cat: Movies, desc: "Movie-Packs"} - - {id: 1011, cat: Movies/DVD, desc: "Movies DVD / HD2DVD"} - - {id: 1089, cat: Movies/UHD, desc: "Movies UHD"} - - {id: 1049, cat: Movies/HD, desc: "Movies-1080p"} - - {id: 1090, cat: Movies/3D, desc: "Movies-3-D"} - - {id: 1048, cat: Movies/HD, desc: "Movies-720p"} - - {id: 1047, cat: Movies/BluRay, desc: "Movies-Bluray"} - - {id: 1060, cat: Movies/HD, desc: "Movies-HDTV"} - - {id: 1062, cat: Movies/SD, desc: "Movies-SD"} - - {id: 1069, cat: Audio, desc: "Musik"} - - {id: 1072, cat: Audio, desc: "Musik-Packs"} - - {id: 1093, cat: Audio/Video, desc: "Musik-Videos"} - - {id: 1004, cat: PC/Games, desc: "PC-Games"} - - {id: 1068, cat: PC, desc: "Programme"} - - {id: 1076, cat: TV, desc: "Serien"} - - {id: 1079, cat: TV/HD, desc: "Serien-1080P"} - - {id: 1095, cat: TV/UHD, desc: "Serien-2160P"} - - {id: 1078, cat: TV/HD, desc: "Serien-720P"} - - {id: 1100, cat: TV/HD, desc: "Serien-Packs-HD"} - - {id: 1016, cat: TV/SD, desc: "Serien-Packs-SD"} - - {id: 1077, cat: TV/SD, desc: "Serien-SD"} - {id: 1096, cat: Other, desc: "Sonstiges"} - - {id: 1071, cat: Audio, desc: "Soundtracks"} - - {id: 1073, cat: TV/Sport, desc: "Sport"} - {id: 1092, cat: Console, desc: "Wimmelbild"} - - {id: 1028, cat: PC, desc: "Windows-Programme"} - - {id: 1108, cat: Movies, desc: "WOTT-Filme"} - - {id: 1108, cat: TV, desc: "WOTT-Filme"} - - {id: 1110, cat: Audio, desc: "WOTT-MUSIK"} - - {id: 1109, cat: TV, desc: "WOTT-SERIEN"} - - {id: 1023, cat: TV/Sport, desc: "Wrestling"} - {id: 1088, cat: XXX, desc: "XXX"} - {id: 1106, cat: XXX/ImageSet, desc: "XXX Bilder"} - {id: 1102, cat: XXX/Other, desc: "XXX HENTAI"} + - {id: 1083, cat: TV/Sport, desc: "Spiele"} + - {id: 1005, cat: Console, desc: "Spiele Konsolen"} + - {id: 1004, cat: PC/Games, desc: "Spiele Windows"} + - {id: 1075, cat: TV/Sport, desc: "Formel 1"} + - {id: 1074, cat: TV/Sport, desc: "Fussball"} + - {id: 1073, cat: TV/Sport, desc: "Sport"} + - {id: 1023, cat: TV/Sport, desc: "Wrestling"} modes: search: [q]