From 3bc1344d57409822d8afcac1488eb8d79e62bbd0 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Sat, 17 Jul 2021 17:45:43 +1200 Subject: [PATCH] remove emtrek resolves #9999 --- README.md | 1 - src/Jackett.Common/Definitions/emtrek.yml | 310 ---------------------- src/Jackett.Updater/Program.cs | 1 + 3 files changed, 1 insertion(+), 311 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/emtrek.yml diff --git a/README.md b/README.md index 003165cc1..bb68fcf0d 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * dmhy * E-Hentai * elitetorrent - * emtrek * EpubLibre * Erai-Raws * ETTV diff --git a/src/Jackett.Common/Definitions/emtrek.yml b/src/Jackett.Common/Definitions/emtrek.yml deleted file mode 100644 index db1d0fd89..000000000 --- a/src/Jackett.Common/Definitions/emtrek.yml +++ /dev/null @@ -1,310 +0,0 @@ ---- -id: emtrek -name: emtrek -description: "emtrek is a RUSSIAN Public Torrent Tracker for 0DAY / GENERAL" -language: ru-ru -type: public -encoding: UTF-8 -links: - - http://emtrek.org/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID - -caps: - categorymappings: - # when refreshing categories remember to use the list on the tracker.php page and not the search.php page. - # Игры для PC (pc games) - - {id: 317, cat: PC/Games, desc: "Игры для Linux"} - - {id: 174, cat: PC/Games, desc: " |- Патчи"} - - {id: 175, cat: PC/Games, desc: " |- Дополнения к играм"} - - {id: 176, cat: PC/Games, desc: " |- Русификаторы"} - # Игры для Консолей (console) - - {id: 155, cat: Console/XBox 360, desc: " |- XBox360 | Программы / Прошивки"} - - {id: 162, cat: Console/PSP, desc: " |- PSP | Программы / Прошивки"} - - {id: 163, cat: Console/PSP, desc: " |- PSX-PSP"} - - {id: 164, cat: Console/Other, desc: " |- Homebrew игры"} - - {id: 165, cat: Console/PSP, desc: " |- PlayStation One | Игры"} - - {id: 166, cat: Console/PSP, desc: " |- PlayStation 2 | Игры"} - - {id: 168, cat: Console/NDS, desc: " |- Nintendo DS | Игры"} - - {id: 169, cat: Console/Other, desc: " |- GameCube | Игры"} - - {id: 170, cat: Console/Wii, desc: " |- Wii | Игры"} - # Спорт (sport) - - {id: 313, cat: TV/Sport, desc: " |- Лёгкая атлетика"} - - {id: 181, cat: TV/Sport, desc: " |- Автоспорт"} - - {id: 182, cat: TV/Sport, desc: " |- Мотоспорт"} - - {id: 183, cat: TV/Sport, desc: " |- Формула-1 2011"} - - {id: 184, cat: TV/Sport, desc: " |- Бокс"} - - {id: 185, cat: TV/Sport, desc: " |- Смешанные единоборства и K-1"} - - {id: 186, cat: TV/Sport, desc: " |- Рестлинг"} - - {id: 187, cat: TV/Sport, desc: " |- Регби"} - - {id: 188, cat: TV/Sport, desc: " |- Бейсбол"} - - {id: 190, cat: TV/Sport, desc: " |- Экстрим"} - - {id: 192, cat: TV/Sport, desc: " |- Россия 2011-2013"} - - {id: 193, cat: TV/Sport, desc: " |- Россия/СССР"} - - {id: 194, cat: TV/Sport, desc: " |- Еврокубки"} - - {id: 195, cat: TV/Sport, desc: " |- Еврокубки 2010-2012"} - - {id: 196, cat: TV/Sport, desc: " |- Чемпионаты Европы"} - - {id: 197, cat: TV/Sport, desc: " |- Чемпионаты Мира"} - - {id: 198, cat: TV/Sport, desc: " |- Обзорные и аналитические передачи"} - - {id: 318, cat: TV/Sport, desc: " |- Разное"} - - {id: 200, cat: TV/Sport, desc: " |- Международные соревнования"} - - {id: 201, cat: TV/Sport, desc: " |- NBA / NCAA (до 2000 г.)"} - - {id: 202, cat: TV/Sport, desc: " |- NBA / NCAA (2000-2010 гг.)"} - - {id: 203, cat: TV/Sport, desc: " |- NBA / NCAA (2010-2011 гг.)"} - - {id: 204, cat: TV/Sport, desc: " |- Европейский клубный баскетбол"} - - {id: 206, cat: TV/Sport, desc: " |- Хоккей с мячом / Бенди"} - - {id: 207, cat: TV/Sport, desc: " |- Международные турниры"} - - {id: 208, cat: TV/Sport, desc: " |- KXЛ"} - - {id: 209, cat: TV/Sport, desc: " |- НХЛ (до 2003/04)"} - - {id: 210, cat: TV/Sport, desc: " |- НХЛ (с 2005/06)"} - - {id: 211, cat: TV/Sport, desc: " |- СССР - Канада"} - - {id: 212, cat: TV/Sport, desc: " |- Документальные фильмы и аналитика"} - # Музыка (music) - - {id: 78, cat: Audio, desc: "Джаз и Блюз"} - - {id: 79, cat: Audio, desc: "Классическая музыка"} - - {id: 80, cat: Audio, desc: "Поп музыка, Eurodance, Disco"} - - {id: 81, cat: Audio, desc: "Народная и Этническая музыка"} - - {id: 82, cat: Audio, desc: "New Age, Relax, Meditative&Flamenco"} - - {id: 84, cat: Audio, desc: " |- Отечественный Rap / Hip-hop"} - - {id: 85, cat: Audio, desc: " |- Зарубежный Rap / Hip-hop"} - - {id: 99, cat: Audio, desc: " |- R'n'B"} - - {id: 86, cat: Audio, desc: "Reggae, Ska, Dub,Soul"} - - {id: 295, cat: Audio/Lossless, desc: " |- Classic Rock&Hard Rock (lossless)"} - - {id: 109, cat: Audio, desc: " |- Rock"} - - {id: 88, cat: Audio, desc: "Зарубежный метал"} - - {id: 89, cat: Audio, desc: "Отечественный Рок, Панк, Метал, Альтернатива"} - - {id: 110, cat: Audio, desc: " |- Rock"} - - {id: 90, cat: Audio, desc: "Шансон / Авторская песня"} - - {id: 91, cat: Audio, desc: " |- Шансон"} - - {id: 92, cat: Audio, desc: " |- Авторская песня"} - - {id: 94, cat: Audio, desc: "Восточно-азиатская музыка"} - - {id: 95, cat: Audio/Video, desc: "Музыкальное DVD и HD видео"} - - {id: 96, cat: Audio, desc: "Караоке"} - - {id: 248, cat: Audio, desc: " |- House, Techno, Hardcore, Hardstyle, Jumpstyle"} - - {id: 246, cat: Audio, desc: " |- Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub"} - - {id: 249, cat: Audio, desc: " |- Drum&Bass, Jungle, Breakbeat, Dubstep, IDM, Electro"} - - {id: 250, cat: Audio, desc: " |- Chillout, Lounge, Downtempo, Trip-Hop"} - - {id: 251, cat: Audio, desc: " |- Traditional Electronic, Ambient, Modern Classical,..."} - - {id: 252, cat: Audio, desc: " |- Industrial, Noise, EBM, Dark Electro, Aggrotech,..."} - - {id: 253, cat: Audio/Lossless, desc: " |- Label Packs (lossless)"} - - {id: 254, cat: Audio/MP3, desc: " |- Label packs, Scene packs (lossy)"} - - {id: 255, cat: Audio/Video, desc: " |- Электронная музыка (Видео, DVD Video/Audio, HD Video,..."} - - {id: 298, cat: Audio/Lossless, desc: " |- DTS включая upmix"} - - {id: 299, cat: Audio, desc: " |- DVD-A"} - - {id: 300, cat: Audio, desc: " |- SACD"} - - {id: 257, cat: Audio, desc: "Клипы"} - - {id: 309, cat: Audio, desc: "Разное"} - # Программное обеспечение (software) - - {id: 22, cat: PC/Mac, desc: "Mac OS. Программное обеспечение под них"} - - {id: 23, cat: PC, desc: "Unix, Unix-подобные (*nix) и другие OS. Прогр..."} - - {id: 325, cat: PC, desc: "Авторские сборки"} - - {id: 328, cat: PC, desc: " |- m0nkrus"} - - {id: 289, cat: PC, desc: "Авторские раздачи Unix"} - - {id: 24, cat: PC/0day, desc: "Microsoft Windows OS"} - - {id: 49, cat: PC/0day, desc: " |- Оригинальные версии Windows"} - - {id: 294, cat: PC/0day, desc: " |- Оригинальные версии Windows Server"} - - {id: 28, cat: PC/0day, desc: " |- Windows XP"} - - {id: 29, cat: PC/0day, desc: " |- Windows Vista"} - - {id: 30, cat: PC/0day, desc: " |- Windows 7"} - - {id: 225, cat: PC/0day, desc: " |- Windows 8"} - - {id: 321, cat: PC/0day, desc: " |- Windows 10"} - - {id: 293, cat: PC/0day, desc: " |- Сборки Windows - "все в одном""} - - {id: 235, cat: PC/0day, desc: " |- Разное"} - - {id: 305, cat: PC/0day, desc: "Windows ОС в VHD контейнерах"} - - {id: 292, cat: PC/0day, desc: " |- stea.61"} - - {id: 307, cat: PC/0day, desc: " |- Сборки welic"} - - {id: 308, cat: PC/0day, desc: " |- Разное"} - - {id: 264, cat: PC/0day, desc: " |- lopatkin"} - - {id: 319, cat: PC/0day, desc: " |- KottoSOFT"} - - {id: 273, cat: PC/0day, desc: " |- vlazok"} - - {id: 269, cat: PC/0day, desc: " |- pytex"} - - {id: 276, cat: PC/0day, desc: " |- Vannza"} - - {id: 279, cat: PC/0day, desc: " |- Viktor"} - - {id: 291, cat: PC/0day, desc: " |- aleks200059"} - - {id: 265, cat: PC/0day, desc: " |- StartSoft"} - - {id: 266, cat: PC/0day, desc: " |- UralSOFT"} - - {id: 268, cat: PC/0day, desc: " |- БЕЛOFF"} - - {id: 272, cat: PC/0day, desc: " |- Elgujakviso"} - - {id: 311, cat: PC/0day, desc: " |- Feniks"} - - {id: 312, cat: PC/0day, desc: " |- vldim"} - - {id: 314, cat: PC/0day, desc: " |- DDGroup"} - - {id: 323, cat: PC/0day, desc: " |- adguard"} - - {id: 116, cat: PC/0day, desc: " |- Настройка и обслуживание. Диагностика"} - - {id: 120, cat: PC/0day, desc: " |- Сервисное обслуживание компьютера"} - - {id: 280, cat: PC/0day, desc: " |- Резервное копирование"} - - {id: 115, cat: PC/0day, desc: " |- Архиваторы и файловые менеджеры"} - - {id: 117, cat: PC/0day, desc: " |- Работа с носителями информации"} - - {id: 98, cat: PC/0day, desc: " |- Антивирусное ПО, Фаерволлы и защита информации"} - - {id: 118, cat: PC/0day, desc: " |- Драйвера"} - - {id: 243, cat: PC/0day, desc: " |- Оригинальные диски к компьютерам и комплектующим"} - - {id: 119, cat: PC/0day, desc: " |- Разное"} - - {id: 104, cat: PC/0day, desc: " |- Системы для офиса, бизнеса и научной работы"} - - {id: 107, cat: PC/0day, desc: " |- Программы для Интернет и сетей"} - - {id: 105, cat: PC/0day, desc: " |- Аудио- и видео, CD- проигрыватели и каталогизаторы"} - - {id: 108, cat: PC/0day, desc: " |- Разное"} - - {id: 106, cat: PC/0day, desc: " |- Обучающие программы, справочники, энциклопедии"} - - {id: 329, cat: PC/0day, desc: " |- WPI"} - - {id: 172, cat: PC/0day, desc: " |- Скрипты и движки сайтов, CMS а также расширения к ним"} - - {id: 171, cat: PC/0day, desc: " |- Текстовые редакторы с подсветкой"} - - {id: 111, cat: PC/0day, desc: " |- Графические редакторы"} - - {id: 284, cat: PC/0day, desc: " |- Программные комплекты"} - - {id: 285, cat: PC/0day, desc: " |- Плагины для программ компании Adobe"} - - {id: 286, cat: PC/0day, desc: " |- Редакторы видео"} - - {id: 288, cat: PC/0day, desc: " |- Виртуальные студии, секвенсоры и аудиоредакторы"} - - {id: 112, cat: PC/0day, desc: " |- Разное"} - # Мобильные устройства (mobile) - - {id: 224, cat: PC/Mobile-Other, desc: " |- Игры"} - - {id: 226, cat: PC/Mobile-Other, desc: " |- Программы"} - - {id: 227, cat: PC/Mobile-Other, desc: " |- Прошивки"} - - {id: 222, cat: PC/Mobile-Other, desc: " |- Видео"} - - {id: 228, cat: PC/Mobile-Other, desc: " |- Разное"} - - {id: 230, cat: PC/Mobile-Other, desc: " |- Игры"} - - {id: 231, cat: PC/Mobile-Other, desc: " |- Программы"} - - {id: 232, cat: PC/Mobile-Other, desc: " |- Прошивки"} - - {id: 233, cat: PC/Mobile-Other, desc: " |- Разное"} - # Книги, Аудиокниги, Ноты (books, audiobooks) - - {id: 123, cat: Books, desc: " |- Компьютерная литература"} - - {id: 124, cat: Books, desc: " |- Точные и естественные науки"} - - {id: 125, cat: Books, desc: " |- Строительная литература"} - - {id: 126, cat: Books, desc: " |- Художественная литература"} - - {id: 127, cat: Books, desc: " |- Гуманитарные науки"} - - {id: 281, cat: Books, desc: " |- Медицина.Здоровье"} - - {id: 128, cat: Books, desc: " |- Авто литература"} - - {id: 129, cat: Books, desc: " |- Журналы"} - - {id: 130, cat: Books, desc: " |- Комиксы"} - - {id: 131, cat: Books, desc: " |- Детские книги и журналы"} - - {id: 132, cat: Books, desc: " |- Охота и Рыбалка"} - - {id: 133, cat: Books, desc: " |- Психология"} - - {id: 134, cat: Books, desc: " |- История"} - - {id: 135, cat: Books, desc: " |- Религия"} - - {id: 277, cat: Books, desc: " |- Магия, Астрология, Алхимия"} - - {id: 278, cat: Books, desc: " |- Кулинария (книги)"} - - {id: 304, cat: Books, desc: " |- Домашние питомцы"} - - {id: 310, cat: Books, desc: " |- Разное"} - - {id: 137, cat: Books, desc: " |- Психология"} - - {id: 138, cat: Books, desc: " |- История"} - - {id: 139, cat: Books, desc: " |- Юмор"} - - {id: 140, cat: Books, desc: " |- Религия"} - - {id: 141, cat: Books, desc: " |- Детская литература"} - - {id: 142, cat: Books, desc: " |- Фантастика"} - - {id: 143, cat: Books, desc: " |- Классика"} - - {id: 144, cat: Books, desc: " |- Художественная литература"} - - {id: 303, cat: Books, desc: " |- Поэзия"} - - {id: 146, cat: Books, desc: " |- Ноты"} - # Wallpapers (other) - - {id: 121, cat: Other, desc: "Обои / Рисунки / Картинки"} - # Корзина (other) - - {id: 2, cat: Other, desc: "Для пробных раздач"} - # the following forums are not in the tracker pull down list. - # Архив (archive) - - {id: 20, cat: Other, desc: "Архив"} - - modes: - search: [q] - tv-search: [q, season, ep] - music-search: [q] - book-search: [q] - -settings: - - name: sort - type: select - label: Sort requested from site - default: 1 - options: - 1: created - 10: seeders - 7: size - 2: title - - name: type - type: select - label: Order requested from site - default: 1 - options: - 1: desc - 2: asc - -search: - paths: - - path: tracker.php - inputs: - $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}" - prev_allw: 1 - prev_a: 0 - prev_dla: 0 - prev_dlc: 0 - prev_dld: 0 - prev_dlw: 0 - prev_my: 0 - prev_new: 0 - prev_sd: 0 - prev_da: 1 - prev_dc: 0 - prev_df: 1 - prev_ds: 0 - prev_tor_type: 0 - # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen - o: "{{ .Config.sort }}" - # 1=asc, 2=desc - s: "{{ .Config.type }}" - # show category - dc: 0 - # show forum - df: 1 - # show author - da: 1 - # show speed - ds: 0 - # -1=all time - tm: -1 - # seed not seen -1=disregard - sns: -1 - # group releases -1=not selected - srg: -1 - nm: "{{ .Keywords }}" - # find a username - pn: "" - # all words - allw: 1 - keywordsfilters: - - name: re_replace - args: ["(\\w+)", " +$1"] # prepend + to each word - - rows: - selector: tr[id^="tor_"]:has(a[href^="magnet:?xt="]) - - fields: - category: - selector: a[href^="tracker.php?f="] - attribute: href - filters: - - name: querystring - args: f - title: - selector: a[href^="./viewtopic.php?t="] - details: - selector: a[href^="./viewtopic.php?t="] - attribute: href - magnet: - selector: a[href^="magnet:?xt="] - attribute: href - filters: - - name: append - args: "&tr=udp://tracker.coppersurfer.tk:6969&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://tracker.opentrackr.org:1337" - size: - selector: td:nth-child(6) > u - seeders: - selector: td.seedmed > b - leechers: - selector: td.leechmed > b - grabs: - selector: td:nth-child(9) - date: - # unix - selector: td:last-child > u - downloadvolumefactor: - text: 0 -# case: -# img[src="styles/images/tor_gold.gif"]: 0 -# img[src="styles/images/tor_silver.gif"]: 0.5 -# "*": 1 - uploadvolumefactor: - text: 1 -# TorrentPier II diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 6789e4a66..8bfcd7484 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -305,6 +305,7 @@ namespace Jackett.Updater "Definitions/eggmeon.yml", "Definitions/elitehd.yml", "Definitions/elittracker.yml", + "Definitions/emtrek.yml", "Definitions/epizod.yml", "Definitions/eotforum.yml", "Definitions/erzsebet.yml",