From 70f1e6499382d04f774bcc0bfee2eeb65ba6faf5 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Sat, 25 Apr 2020 08:49:06 +1200 Subject: [PATCH] nordichd: revert 8fcb19e back online. resolves #6708 --- README.md | 17 +- src/Jackett.Common/Definitions/nordichd.yml | 163 ++++++++++++++++++++ src/Jackett.Updater/Program.cs | 1 - 3 files changed, 172 insertions(+), 9 deletions(-) create mode 100644 src/Jackett.Common/Definitions/nordichd.yml diff --git a/README.md b/README.md index 92d68d9c5..3106e874d 100644 --- a/README.md +++ b/README.md @@ -301,6 +301,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * Elite-Tracker * Empornium (EMP) * EpubLibre + * eShareNet + * eStone (XiDER, BeLoad) * Ethor.net (Thor's Land) * ExoticaZ (YourExotic) * ExtremeTorrents @@ -361,6 +363,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * IPTorrents (IPT) * ImmortalSeed (iS) * Immortuos + * inPeril * Insane Tracker * JPopsuki * Kapaki @@ -384,6 +387,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * Mononoké-BT * MoreThanTV (MTV) * MyAnonamouse (MAM) + * myAmity * MySpleen * NBTorrents * NCore @@ -393,7 +397,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * New Real World * Norbits * NordicBits (NB) + * NORDiCHD * Nostalgic (The Archive / VHSTAPES) + * notwhat.cd * OnlineSelfEducation * Orpheus * Ourbits (HDPter) @@ -509,6 +515,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * Twilight Torrents * Twilights Zoom * U-Torrents + * u-torrents (SceneFZ) * U2 (U2分享園@動漫花園) * UHDBits * UnionGang @@ -517,6 +524,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents) * World-In-HD * World-of-Tomorrow + * x-ite.me (XM) + * xBytesV2 * XSpeeds (XS) * XWT-Classics * XWTorrents (XWT) @@ -525,14 +534,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * XtremeFile * Zamunda.net * Zelka.org - * eShareNet - * eStone (XiDER, BeLoad) - * inPeril - * myAmity - * notwhat.cd - * u-torrents (SceneFZ) - * x-ite.me (XM) - * xBytesV2 Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and are missing features or are broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com to get them fixed/improved. diff --git a/src/Jackett.Common/Definitions/nordichd.yml b/src/Jackett.Common/Definitions/nordichd.yml new file mode 100644 index 000000000..fd36e2e12 --- /dev/null +++ b/src/Jackett.Common/Definitions/nordichd.yml @@ -0,0 +1,163 @@ +--- + site: nordichd + name: NORDiCHD + description: "NORDiCHD is a Mixed Nordic HD Tracker which Encodes a lot of Tv shows and Movies" + language: en-us + type: private + encoding: UTF-8 + links: + - http://www.nordichd.eu/ + + caps: + categorymappings: + - {id: 1, cat: Movies, desc: "Movies"} + - {id: 14, cat: Movies/3D, desc: "Movie 3D"} + - {id: 16, cat: Movies/BluRay, desc: "Movie Blu-Ray"} + - {id: 17, cat: Movies/HD, desc: "Movie HD-1080p"} + - {id: 31, cat: Movies/HD, desc: "Movie HD-720p"} + - {id: 32, cat: Movies/SD, desc: "Movie SD"} + - {id: 33, cat: Movies/BluRay, desc: "Movie BD-Rip"} + - {id: 34, cat: Movies/BluRay, desc: "Movie BR-Rip"} + - {id: 35, cat: TV/HD, desc: "HDTV"} + - {id: 36, cat: Movies, desc: "Movie Remux"} + - {id: 37, cat: Movies/WEBDL, desc: "Movie WEB-DL"} + - {id: 46, cat: TV/Documentary, desc: "Documentary"} + - {id: 6, cat: Movies, desc: "Internal"} + - {id: 18, cat: Movies/3D, desc: "Internal 3D"} + - {id: 19, cat: Movies/BluRay, desc: "Internal Blu-Ray"} + - {id: 38, cat: Movies/HD, desc: "Internal HD-1080p"} + - {id: 39, cat: Movies/HD, desc: "Internal HD-720p"} + - {id: 40, cat: Movies/SD, desc: "Internal SD"} + - {id: 41, cat: Movies/BluRay, desc: "Internal BD-Rip"} + - {id: 42, cat: Movies/BluRay, desc: "Internal BR-Rip"} + - {id: 43, cat: TV/HD, desc: "Internal HDTV"} + - {id: 44, cat: Movies, desc: "Internal Remux"} + - {id: 45, cat: Movies/WEBDL, desc: "Internal WEB-DL"} + - {id: 47, cat: TV/Documentary, desc: "Internal Documentary"} + - {id: 7, cat: Audio, desc: "Music"} + - {id: 20, cat: Audio/Video, desc: "Music Video"} + - {id: 21, cat: Audio/MP3, desc: "Music Mp3"} + + modes: + search: [q] + tv-search: [q, season, ep] + movie-search: [q] + music-search: [q] + + settings: + - name: username + type: text + label: Username + - name: password + type: password + label: Password + - name: sort + type: select + label: Sort requested from site + default: "added" + options: + "added": "created" + "seeders": "seeders" + "size": "size" + - name: type + type: select + label: Order requested from site + default: "desc" + options: + "desc": "desc" + "asc": "asc" + + login: + path: ?p=home&pid=1 + method: form + form: form#sls_form + submitpath: ajax/login.php + inputs: + action: login + loginbox_membername: "{{ .Config.username }}" + loginbox_password: "{{ .Config.password }}" + loginbox_remember: 1 + selectorinputs: + securitytoken: + selector: "script:contains(\"stKey: \")" + filters: + - name: regexp + args: "stKey: \"(.+?)\"," + error: + - selector: div.error + - selector: :contains("-ERROR-") + test: + path: ?p=home&pid=1 + selector: div#member_info_bar + + search: + paths: + - path: / + inputs: + p: torrents + pid: 10 + $raw: "{{ range .Categories }}&cid[]={{.}}{{end}}" + keywords: "{{ .Keywords }}" + # name description both uploader + search_type: name + "sortOptions[sortBy]": "{{ .Config.sort }}" + "sortOptions[sortOrder]": "{{ .Config.type }}" + + rows: + selector: div.torrent-box[id^="torrent_"] + + fields: + title: + selector: a[href*="?p=torrents&pid=10&action=details&tid="] + details: + selector: a[href*="?p=torrents&pid=10&action=details&tid="] + attribute: href + category: + selector: a[href*="?p=torrents&pid=10&cid="] + attribute: href + filters: + - name: querystring + args: cid + download: + selector: a[href*="?p=torrents&pid=10&action=download&tid="] + attribute: href + banner: + optional: true + selector: a[href*="data/torrents/torrent_images/"] + attribute: href + size: + selector: a[rel="torrent_size"] + grabs: + selector: a[rel="times_completed"] + seeders: + selector: a[rel="torrent_seeders"] + leechers: + selector: a[rel="torrent_leechers"] + date: + selector: div.torrentOwner abbr + optional: true + attribute: data-time + date: + selector: div.torrentOwner:contains("day") + optional: true + filters: + - name: regexp + args: "Uploaded (.+?) by" + - name: replace + args: [" at ", " "] + date: + selector: div.torrentOwner:contains("-") + optional: true + filters: + - name: regexp + args: "Uploaded (.+?) by" + - name: dateparse + args: "02-01-2006 15:04" + downloadvolumefactor: + case: + img[src$="/torrent_free.png"]: 0.5 + "*": 1 + uploadvolumefactor: + case: + "*": 1 +# TSUE 2.2 diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 89dc972b9..cc7199a15 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -336,7 +336,6 @@ namespace Jackett.Updater "Definitions/music-master.yml", "Definitions/nachtwerk.yml", "Definitions/nexttorrent.yml", - "Definitions/nordichd.yml", "Definitions/nyaa.yml", "Definitions/nyoo.yml", "Definitions/passionetorrent.yml",