From a07cda3efaf16a851a1e41fb1d2af241423ffdf1 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 28 Jun 2022 09:59:21 +1200 Subject: [PATCH] netlab: removed. resolves #5874 --- README.md | 1 - src/Jackett.Common/Definitions/netlab.yml | 119 ---------------------- src/Jackett.Updater/Program.cs | 1 + 3 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/netlab.yml diff --git a/README.md b/README.md index c13f03080..13cac1f4b 100644 --- a/README.md +++ b/README.md @@ -454,7 +454,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * NCore * Nebulance (NBL) (TransmiTheNet) * NetCosmo - * NetLab * NorBits * oMg[WtF]trackr * OpenCD [![(invite needed)][inviteneeded]](#) diff --git a/src/Jackett.Common/Definitions/netlab.yml b/src/Jackett.Common/Definitions/netlab.yml deleted file mode 100644 index 723ef3ebf..000000000 --- a/src/Jackett.Common/Definitions/netlab.yml +++ /dev/null @@ -1,119 +0,0 @@ ---- -id: netlab -name: NetLab -description: "NetLab is a RUSSIAN Private Torrent Tracker" -language: ru-RU -type: private -encoding: windows-1251 -links: - - https://torrent.e2k.ru/ - -caps: - categorymappings: - - {id: 1, cat: Movies/DVD, desc: "DVD5"} - - {id: 4, cat: Movies/DVD, desc: "DVD9"} - - {id: 5, cat: Movies/WEB-DL, desc: "MPEG/AVI"} - - {id: 6, cat: Audio, desc: "Музыка (Music)"} - - {id: 7, cat: PC/Games, desc: "Игры (Games)"} - - {id: 9, cat: PC/0day, desc: "Программы (Apps)"} - - {id: 10, cat: TV/HD, desc: "HDTV"} - - {id: 11, cat: Audio/Audiobook, desc: "Аудио Книги (Audiobooks)"} - - {id: 12, cat: Books/EBook, desc: "Книги (Ebooks)"} - - {id: 14, cat: Other, desc: "Разное (Other)"} - - {id: 15, cat: Audio/Video, desc: "МузDVD (Music/Video)"} - - modes: - search: [q] - tv-search: [q] - movie-search: [q] - music-search: [q, artist] - book-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: striprussian - type: checkbox - label: Strip Russian Letters - default: false - -login: - path: takelogin.php - method: post - inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - returnto: "/my.php" - error: - - selector: td.embedded:contains("Ошибка") - test: - path: my.php - selector: a[href="logout.php"] - -search: - paths: - # https://torrent.e2k.ru/browse.php?c1=1&c4=1&c10=1&incldead=0&search= - - path: browse.php - inputs: - $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" - search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}" - # 0 active, 1 incldead, 2 onlydead - incldead: 1 - - rows: - selector: table[border="1"][cellspacing="0"][cellpadding="5"] > tbody > tr:has(a[href^="details.php?id="]) - - fields: - category: - selector: a[href^="browse.php?cat="] - attribute: href - filters: - - name: querystring - args: cat - title: - selector: a[href^="details.php?id="] - filters: - - name: re_replace - args: ["[\\:\\-\\/\\|]", " "] - - name: re_replace - args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"] - details: - selector: a[href^="details.php?id="] - attribute: href - download: - selector: a[href^="download.php?id="] - attribute: href - magnet: - selector: a[href^="magnet:?xt="] - optional: true - attribute: href - files: - selector: td:nth-child(3) - date: - selector: td:nth-child(4) - filters: - - name: append - args: " +03:00" # MSK - - name: dateparse - args: "2006-01-0215:04:05 -07:00" - size: - selector: td:nth-child(5) - grabs: - selector: td:nth-child(6) - seeders: - selector: td:nth-child(7) - leechers: - selector: td:nth-child(8) - downloadvolumefactor: - case: - img[src$="_gold.png"]: 0.65 - "*": 1 - uploadvolumefactor: - text: 1 - minimumratio: - text: 0.15 -# engine n/a diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index e8ad41ec9..ba9bfc07a 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -421,6 +421,7 @@ namespace Jackett.Updater "Definitions/moviezone.yml", // migrated to teracod #9743 "Definitions/music-master.yml", "Definitions/nachtwerk.yml", + "Definitions/netlab.yml", "Definitions/nexttorrent.yml", "Definitions/nforce.yml", "Definitions/nnm-club.yml", // renamed to noname-club