From 4fd60b4158ad885197d2867a92d6c8e0c298908e Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Thu, 2 May 2024 15:48:26 +1200 Subject: [PATCH] universaltorrents: removed. resolves #14836 --- README.md | 1 - .../Definitions/universaltorrents.yml | 192 ------------------ src/Jackett.Updater/Program.cs | 1 + 3 files changed, 1 insertion(+), 193 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/universaltorrents.yml diff --git a/README.md b/README.md index 26006fd4d..7fc1eaadb 100644 --- a/README.md +++ b/README.md @@ -612,7 +612,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * UHDBits * UltraHD * UnionGang - * Universal-Torrents * UnlimitZ * upload.cx * UTOPIA diff --git a/src/Jackett.Common/Definitions/universaltorrents.yml b/src/Jackett.Common/Definitions/universaltorrents.yml deleted file mode 100644 index e12b9b778..000000000 --- a/src/Jackett.Common/Definitions/universaltorrents.yml +++ /dev/null @@ -1,192 +0,0 @@ ---- -id: universaltorrents -name: Universal-Torrents -description: "Universal-Torrents is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL" -language: de-DE -type: private -encoding: UTF-8 -links: - - https://uni-track.org/ - -caps: - categorymappings: - - {id: 28, cat: Movies/SD, desc: "Filme SD"} - - {id: 32, cat: Movies/HD, desc: "Filme HD"} - - {id: 114, cat: Movies/UHD, desc: "Filme UHD"} - - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"} - - {id: 138, cat: Movies, desc: "Filme Pack`s"} - - {id: 60, cat: TV/SD, desc: "Serien SD"} - - {id: 57, cat: TV/HD, desc: "Serien HD"} - - {id: 139, cat: TV/UHD, desc: "Serien UHD"} - - {id: 59, cat: TV, desc: "Serien Pack`s"} - - {id: 110, cat: Audio/MP3, desc: "Audio MP3"} - - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"} - - {id: 52, cat: Audio, desc: "Audio Pack"} - - {id: 63, cat: Audio/Audiobook, desc: "Audio Hörbuch"} - - {id: 120, cat: Audio/Video, desc: "Audio Videos"} - - {id: 12, cat: PC/0day, desc: "Apps Windows"} - - {id: 125, cat: PC/Mac, desc: "Apps Mac-OSX"} - - {id: 11, cat: PC/Mobile-Android, desc: "Apps Mobil"} - - {id: 141, cat: PC, desc: "Apps Other"} - - {id: 15, cat: TV/Documentary, desc: "Doku SD"} - - {id: 14, cat: TV/Documentary, desc: "Doku HD"} - - {id: 123, cat: TV/Documentary, desc: "Doku Reihe"} - - {id: 126, cat: PC/Mobile-Android, desc: "Spiel Mobil"} - - {id: 17, cat: PC/Games, desc: "Spiel PC"} - - {id: 24, cat: Console, desc: "Spiel Konsole"} - - {id: 121, cat: PC/Games, desc: "Spiel Wimmelbild"} - - {id: 61, cat: TV/Sport, desc: "Sport HD"} - - {id: 62, cat: TV/Sport, desc: "Sport SD"} - - {id: 96, cat: Books/Mags, desc: "ePaper Zeitungen"} - - {id: 136, cat: Books/EBook, desc: "ePaper E-Book"} - - {id: 137, cat: Books/Comics, desc: "ePaper Comics"} - - {id: 143, cat: Movies/Other, desc: "Trickfilm Anime"} - - {id: 144, cat: TV/Anime, desc: "Trickfilm Anime Serien"} - - {id: 145, cat: Movies/Other, desc: "Trickfilm Kids"} - - {id: 76, cat: XXX/SD, desc: "XXX SD"} - - {id: 73, cat: XXX/x264, desc: "XXX HD"} - - {id: 75, cat: XXX/Pack, desc: "XXX Pack"} - - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic´s"} - - {id: 129, cat: Movies/SD, desc: "Internal Film SD"} - - {id: 128, cat: Movies/HD, desc: "Internal Film HD"} - - {id: 131, cat: TV/SD, desc: "Internal Serie SD"} - - {id: 130, cat: TV/HD, desc: "Internal Serien HD"} - - {id: 132, cat: Other, desc: "Internal Sonstiges"} - - modes: - search: [q] - tv-search: [q, season, ep] - movie-search: [q] - music-search: [q] - book-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: freeleech - type: checkbox - label: Filter freeleech only - default: false - - name: sort - type: select - label: Sort requested from site - default: added - options: - added: created - seeds: seeders - size: size - name: title - - name: type - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Anzahl der Torrents beim Durchsuchen Torrents per page: setting to 60 on your account profile. The default is 15. - - name: info_activity - type: info - label: Account Inactivity - default: "Inactive accounts will be deactivated after 7 weeks and deleted after another 3 weeks." - -login: - path: login.php - method: form - cookies: ["JAVA=OK"] # avoid jscheck redirect - inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - error: - - selector: div#login_error - test: - path: index.php - selector: a[href="logout.php"] - -search: - paths: - - path: selection.php - inputs: - $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" - search: "{{ .Keywords }}" - # 0 name, 1 descr, 2 both - blah: 2 - orderby: "{{ .Config.sort }}" - sort: "{{ .Config.type }}" - # site does not support imdbid searching or display imdb links in results. - - rows: - selector: "div.selection_wrap{{ if .Config.freeleech }}:has(:root:has(div.onlyup)){{ else }}{{ end }}" - filters: - - name: andmatch - - fields: - category_p1: - selector: div.kat_cat_pic_name - category_p2: - selector: div.kat_cat_pic_name_b - categorydesc: - text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}" - title: - selector: a[href^="details.php?id="] - filters: - - name: re_replace - args: ["^\\[.+?\\]\\s?", ""] - details: - selector: a[href^="details.php?id="] - attribute: href - download: - selector: a[href^="download_ssl.php?torrent="] - attribute: href - poster: - selector: div[id^="details"] img - attribute: src - size: - selector: div.selection_unter_ad - date_day: - # Heute 13:30:04 - # Gestern 09:10:10 - selector: div.selection_unter_ab:not(:contains(".")) - optional: true - filters: - - name: replace - args: ["Heute", "Today"] - - name: replace - args: ["Gestern", "Yesterday"] - date_year: - # 30.02.2018 um 23:12:50 - selector: div.selection_unter_ab:contains(".") - optional: true - filters: - - name: replace - args: [" um", ""] - - name: append - args: " +01:00" # CET - - name: dateparse - args: "dd.MM.yyyy HH:mm:ss zzz" - date: - text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" - grabs: - selector: div.selection_unter_ae - seeders: - selector: div.selection_unter_aa - leechers: - selector: div.selection_unter_aaa - downloadvolumefactor: - case: - ":root:has(div.onlyup)": 0 # GLobal Freeleech event - "*": 1 - uploadvolumefactor: - text: 1 - minimumratio: - text: 1.0 - minimumseedtime: - # 2 days (as seconds = 2 x 24 x 60 x 60) - text: 172800 -# 3xT diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index d6939d453..7fd274aa9 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -688,6 +688,7 @@ namespace Jackett.Updater "Definitions/underverse.yml", "Definitions/underversel.yml", "Definitions/uniotaku.yml", // to be migrated to c# + "Definitions/universaltorrents.yml", "Definitions/unleashthecartoons.yml", "Definitions/uploads.yml", "Definitions/utorrents.yml", // same as SzeneFZ now