From 70204971a262db2f447f5baf96264bb8e821a803 Mon Sep 17 00:00:00 2001 From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com> Date: Fri, 1 Jan 2021 09:35:23 +0000 Subject: [PATCH] asgaard: removed, dead. resolves #5562 (#10695) --- README.md | 1 - src/Jackett.Common/Definitions/asgaard.yml | 204 --------------------- src/Jackett.Updater/Program.cs | 2 + 3 files changed, 2 insertions(+), 205 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/asgaard.yml diff --git a/README.md b/README.md index b26af10ec..55cfd81d7 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * Anthelion * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#) * ArabP2P - * Asgaard (AG) * AsianCinema * Asylum Share * AudioNews (AN) diff --git a/src/Jackett.Common/Definitions/asgaard.yml b/src/Jackett.Common/Definitions/asgaard.yml deleted file mode 100644 index 55dfbba1f..000000000 --- a/src/Jackett.Common/Definitions/asgaard.yml +++ /dev/null @@ -1,204 +0,0 @@ ---- -id: asgaard -name: Asgaard -description: "Asgaard (AG) is a NORDIC Private Torrent Tracker for MOVIES / TV / GENERAL" -language: en -type: private -encoding: UTF-8 -links: - - https://asgrd.org/ - -caps: - categorymappings: - - {id: 1, cat: TV, desc: "Kidz"} - - {id: 2, cat: Movies, desc: "Movies"} - - {id: 3, cat: TV, desc: "TV"} - - {id: 4, cat: Audio, desc: "Music"} - - {id: 5, cat: PC, desc: "Apps"} - - {id: 6, cat: PC/Games, desc: "Games"} - - {id: 7, cat: Books, desc: "Books"} - - {id: 8, cat: Movies, desc: "Kidz Movies"} - - {id: 9, cat: TV, desc: "Kidz TV"} - - {id: 10, cat: TV, desc: "Kidz Boxset"} - - {id: 54, cat: Movies/SD, desc: "Movies SD"} - - {id: 55, cat: Movies/DVD, desc: "Movies DVDR"} - - {id: 14, cat: Movies/HD, desc: "Movies HD"} - - {id: 15, cat: Movies/UHD, desc: "Movies 4K"} - - {id: 17, cat: Movies/BluRay, desc: "Movies BD"} - - {id: 73, cat: Movies, desc: "Movies Boxset"} - - {id: 51, cat: Movies, desc: "Movies No Nordic Subs"} - - {id: 52, cat: TV/SD, desc: "TV SD"} - - {id: 58, cat: TV/SD, desc: "TV DVDR"} - - {id: 18, cat: TV/HD, desc: "TV HD"} - - {id: 19, cat: TV/UHD, desc: "TV 4K"} - - {id: 60, cat: TV/HD, desc: "TV BD"} - - {id: 20, cat: TV, desc: "TV Boxset"} - - {id: 50, cat: TV, desc: "TV No Nordic Subs"} - - {id: 49, cat: Audio/Video, desc: "Music Video"} - - {id: 23, cat: Audio/MP3, desc: "Music MP3"} - - {id: 61, cat: Audio/MP3, desc: "Music MP3 Boxset"} - - {id: 24, cat: Audio/Lossless, desc: "Music Flac"} - - {id: 62, cat: Audio/Lossless, desc: "Music Flac Boxset"} - - {id: 28, cat: PC/Mobile-Android, desc: "Apps Android"} - - {id: 29, cat: PC/Mobile-iOS, desc: "Apps iOS"} - - {id: 25, cat: PC/0day, desc: "Apps Windows"} - - {id: 26, cat: PC, desc: "Apps Linux"} - - {id: 27, cat: PC/Mac, desc: "Apps MacOS"} - - {id: 30, cat: PC/Games, desc: "Games Windows"} - - {id: 31, cat: PC, desc: "Games Linux"} - - {id: 32, cat: PC/Mac, desc: "Games MacOS"} - - {id: 33, cat: PC/Mobile-Android, desc: "Games Android"} - - {id: 34, cat: PC/Mobile-iOS, desc: "Games iOS"} - - {id: 35, cat: Console/NDS, desc: "Games Nintendo"} - - {id: 38, cat: Console/PSP, desc: "Games Playstation"} - - {id: 39, cat: Console/XBox, desc: "Games XBox"} - - {id: 41, cat: Books/EBook, desc: "Books E-Book"} - - {id: 42, cat: Audio/Audiobook, desc: "Books Audiobook"} - - {id: 43, cat: Books/Technical, desc: "Books Education"} - - modes: - search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] - music-search: [q] - book-search: [q] - -settings: - - name: info - type: info - label: "About the Username field" - default: "Enter your Email address in the username field." - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: freeleech - type: checkbox - label: Search freeleech only - default: false - - name: sort - type: select - label: Sort requested from site - default: 2 - options: - 2: created - 7: seeders - 5: size - 1: title - - name: type - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - -login: - path: login.php - method: post - form: form - inputs: - email: "{{ .Config.username }}" - password: "{{ .Config.password }}" - remember: 1 - error: - - selector: h2:contains("Error") - message: - selector: p - test: - path: / - selector: a[href$="/logout.php"] - -search: - paths: - # https://asgrd.org/browse.php?sns=&sna=&spf=&sr=&sg=&sys=&sye=&srs=&sre=&si=tt2401090&ss=&incldead=0&only_free=0&sort=4&type=desc - - path: browse.php - inputs: - $raw: "{{ range .Categories }}cats[]={{.}}&{{end}}" - sns: "" - sna: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" - spf: "" - sr: "" - sg: "" - sys: "" - sye: "" - srs: "" - sre: "" - si: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}" - ss: "" - # 0 active, 1 incldead, 2 onlydead - incldead: 1 - # 0 incl non-free, 1 incl only-free - only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}" - sort: "{{ .Config.sort }}" - type: "{{ .Config.type }}" - - rows: - selector: table.table-striped > tbody > tr:has(a[href*="details.php?id="]) - filters: - - name: andmatch - - fields: - title: - selector: div.torrent-name - filters: - # need to remove the tooltip text - - name: regexp - args: "(.+?)\\n" - details: - selector: a[href*="details.php?id="] - attribute: href - category: - selector: a[href*="browse.php?"] - attribute: href - filters: - - name: regexp - args: cats\[\]=(\d+)$ - poster: - selector: img.tooltip-poster - attribute: src - download: - selector: a[href*="download.php?torrent="] - attribute: href - files: - # remember #5754 advanced users have additional last TD so dont go using nth-last-child ;-) - selector: td:nth-child(5) - size: - selector: td:nth-child(7) - grabs: - selector: td:nth-child(8) - seeders: - selector: td:nth-child(9) - leechers: - selector: td:nth-child(10) - date: - # 26 May 20 14:05:06 - selector: td:nth-child(2) > div > div:last-of-type:not(:contains("day")) - optional: true - remove: span - filters: - - name: append - args: " +00:00" # auto adjusted by site account profile - - name: dateparse - args: "2 Jan 2006 15:04:05 -07:00" - date: - # Today, 20:26:23 - # Yesterday, 13:50:05 - selector: td:nth-child(2) > div > div:last-of-type:contains("day") - optional: true - remove: span - filters: - - name: append - args: " +00:00" # auto adjusted by site account profile - - name: fuzzytime - downloadvolumefactor: - case: - img[src="./images/gold.png"]: 0 - "*": 1 - uploadvolumefactor: - text: 1 - minimumratio: - text: 0.95 -# Midgaard diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 865dcb1d0..5feeae6de 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -263,6 +263,7 @@ namespace Jackett.Updater "Definitions/aox.yml", "Definitions/apollo.yml", // migrated to C# gazelle base tracker "Definitions/archetorrent.yml", + "Definitions/asgaard.yml", "Definitions/asiandvdclub.yml", "Definitions/ast4u.yml", // renamed to animeworld #10578 "Definitions/avg.yml", @@ -373,6 +374,7 @@ namespace Jackett.Updater "Definitions/secretcinema.yml", // migrated to C# gazelle base tracker "Definitions/seedpeer.yml", "Definitions/sharespacedb.yml", + "Definitions/shareuniversity.yml", "Definitions/sharingue.yml", "Definitions/shareuniversity.yml", "Definitions/skytorrents.yml",