From 2af27c0a87e8621c40b4a6514db44c875d3f05ed Mon Sep 17 00:00:00 2001 From: garfield69 Date: Sun, 24 Sep 2017 00:02:35 +1200 Subject: [PATCH 1/8] zooqle: seeders and leechers can be missing. (#1885) --- src/Jackett/Definitions/zooqle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Jackett/Definitions/zooqle.yml b/src/Jackett/Definitions/zooqle.yml index 7d52eefe8..27da7b4b6 100644 --- a/src/Jackett/Definitions/zooqle.yml +++ b/src/Jackett/Definitions/zooqle.yml @@ -71,6 +71,8 @@ - name: replace args: ["– N/A –", "0 Bytes"] seeders: + # seeders can be missing + optional: true selector: td:nth-child(6) div attribute: title filters: @@ -79,6 +81,8 @@ - name: replace args: [",", ""] leechers: + # leechers can be missing + optional: true selector: td:nth-child(6) div attribute: title filters: From 2bdb1ee0ff8511be1df4d8fe225b1da16b64dfdd Mon Sep 17 00:00:00 2001 From: garfield69 Date: Sun, 24 Sep 2017 00:02:49 +1200 Subject: [PATCH 2/8] btdb: add default categories (#1886) --- src/Jackett/Definitions/btdb.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Jackett/Definitions/btdb.yml b/src/Jackett/Definitions/btdb.yml index 29a809615..5f9e52b27 100644 --- a/src/Jackett/Definitions/btdb.yml +++ b/src/Jackett/Definitions/btdb.yml @@ -8,6 +8,10 @@ - https://btdb.to/ caps: + categorymappings: + - {id: 1, cat: TV, desc: "TV"} + - {id: 2, cat: Movies, desc: "Movies"} + modes: search: [q] tv-search: [q, season, ep] From 4463fc055083c92e7eb2cbdcf8a940007ff884f7 Mon Sep 17 00:00:00 2001 From: nenladar <31939341+nenladar@users.noreply.github.com> Date: Fri, 29 Sep 2017 17:21:32 +0200 Subject: [PATCH 3/8] TorrentLeech: Add the new 4K category (#1899) * Add the new 4K category for TorrentLeech TorrentLeech renamed the existing 4k category and added a new "Real 4K UltraHD HDR" category. This PR adds the new category (but leaves the old one too). * Update TorrentLeech.cs --- src/Jackett/Indexers/TorrentLeech.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Jackett/Indexers/TorrentLeech.cs b/src/Jackett/Indexers/TorrentLeech.cs index 16014dabc..8909200af 100644 --- a/src/Jackett/Indexers/TorrentLeech.cs +++ b/src/Jackett/Indexers/TorrentLeech.cs @@ -54,7 +54,8 @@ namespace Jackett.Indexers AddCategoryMapping(14, TorznabCatType.MoviesHD); AddCategoryMapping(15, TorznabCatType.Movies); // Boxsets AddCategoryMapping(29, TorznabCatType.TVDocumentary); - AddCategoryMapping(41, TorznabCatType.MoviesHD, "Movies/4K"); + AddCategoryMapping(41, TorznabCatType.MoviesHD, "4K Upscaled"); + AddCategoryMapping(47, TorznabCatType.MoviesHD, "Real 4K UltraHD HDR"); AddCategoryMapping(36, TorznabCatType.MoviesForeign); AddCategoryMapping(37, TorznabCatType.MoviesWEBDL); AddCategoryMapping(43, TorznabCatType.MoviesSD, "Movies/HDRip"); From 606c82921b1552eee6d32e774c934f0f8058f661 Mon Sep 17 00:00:00 2001 From: garfield69 Date: Sun, 1 Oct 2017 22:25:22 +1300 Subject: [PATCH 4/8] add EliteHD (#1908) * Create elitehd.yml * docs: add EliteHD * elitehd: add description --- README.md | 1 + src/Jackett/Definitions/elitehd.yml | 99 +++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 src/Jackett/Definitions/elitehd.yml diff --git a/README.md b/README.md index a0e5fb65a..ceb1fc268 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * DigitalHive * Dragonworld Reloaded * Dream Team + * EliteHD [![(invite needed)][inviteneeded]](#) * Elite-Tracker * EoT-Forum * eStone diff --git a/src/Jackett/Definitions/elitehd.yml b/src/Jackett/Definitions/elitehd.yml new file mode 100644 index 000000000..08b241243 --- /dev/null +++ b/src/Jackett/Definitions/elitehd.yml @@ -0,0 +1,99 @@ +--- + site: elitehd + name: EliteHD + description: "EliteHD (HDClub) is a RUSSIAN Private Torrent Tracker for HD MOVIES / TV / GENERAL" + language: ru-ru + type: private + encoding: windows-1251 + links: + - https://elitehd.org/ + + caps: + categorymappings: + - {id: 70, cat: Movies, desc: "Animation"} + - {id: 71, cat: Movies, desc: "Movie"} + - {id: 81, cat: Audio, desc: "HD Audio"} + - {id: 78, cat: TV/Documentary, desc: "Documentary"} + - {id: 68, cat: Audio/Video, desc: "Music Video"} + - {id: 64, cat: TV, desc: "TV Show"} + - {id: 62, cat: TV/Sport, desc: "Sport"} + - {id: 82, cat: Other, desc: "Demo"} + + modes: + search: [q] + tv-search: [q, season, ep] + + login: + path: login.php + method: form + form: form[action="takelogin.php"] + captcha: + type: image + image: img#captcha + input: imagestring + inputs: + username: "{{ .Config.username }}" + password: "{{ .Config.password }}" + error: + - selector: td.embedded > div.error + test: + path: browse.php + selector: td.main_bottom + + search: + path: browse.php + inputs: + $raw: "{{range .Categories}}c{{.}}=1&{{end}}" + search: "{{ .Query.Keywords }}" + dsearch: "" + stype: "or" + incldead: "1" + webdl: "0" + 3d: "0" + rows: + selector: tbody#highlighted > tr + fields: + download: + selector: a[href^="details.php?id="] + attribute: href + filters: + - name: replace + args: ["details.php", "download.php"] + title: + selector: a[href^="details.php?id="] + details: + selector: a[href^="details.php?id="] + attribute: href + category: + selector: a[href^="browse.php?cat="] + attribute: href + filters: + - name: querystring + args: cat + date: + selector: div#frame > div#cleft > font + filters: + - name: append + args: " +02:00" + - name: dateparse + args: "2006-01-02 15:04:05 -07:00" + seeders: + selector: td:nth-child(5) + leechers: + selector: td:nth-child(6) + grabs: + selector: td:nth-child(7) b + filters: + - name: regexp + args: ([\d,]+) + size: + selector: td:nth-child(7) + remove: a, br, b + downloadvolumefactor: + case: + img[src="pic/freedownload.gif"]: "0" + img[src="pic/silver.gif"]: "0.5" + "*": "1" + uploadvolumefactor: + case: + "*": "1" From f9b2875470b1b0377d292ee44c1710c6cce3589a Mon Sep 17 00:00:00 2001 From: garfield69 Date: Sun, 1 Oct 2017 22:26:07 +1300 Subject: [PATCH 5/8] add Descriptions (#1909) * HDForever: add description * superbits: add description * czteam: add description * xspeeds: amend description * Synthesiz3r: add description * TorrentVault: add description * insanetracker: add description * yggtorrent: add description * ImmortalSeed: amend description * polishsource: add description * btnext: add description * hon3yhd: add description * hdhome: add description * ultrahdclub: add description * speedtorrentreloaded: add description * hdme: add description * magico: add description * ourbits: add description * audiobooktorrents: add description * ultimategamerclub: add description * dragonworldreloaded: add description * dreamteam: add description * Psytorrents: add description * funkytorrents: add description * rockhardlossless: add description * bluebirdhd: add description * Hardbay: add description * shellife: add description * aox: add description * acidlounge: add description * infinityt: add description * jpopsuki: add description * bithq: add description * HD-Only: add description * torrentccf: add description * xtremezone: add description * sktorrent: add description * Torrentech: add description * passionetorrent: add description * kapaki: add description * carpathians: add description * estone: add description * datascene: add description * myspleen: add description * torviet: add description * backups: add description * CGPeers: add description * inperil: add description --- src/Jackett/Definitions/acidlounge.yml | 1 + src/Jackett/Definitions/aox.yml | 3 ++- src/Jackett/Definitions/audiobooktorrents.yml | 3 ++- src/Jackett/Definitions/backups.yml | 1 + src/Jackett/Definitions/bithq.yml | 3 ++- src/Jackett/Definitions/bluebird.yml | 1 + src/Jackett/Definitions/btnext.yml | 1 + src/Jackett/Definitions/carpathians.yml | 1 + src/Jackett/Definitions/czteam.yml | 3 ++- src/Jackett/Definitions/datascene.yml | 3 ++- src/Jackett/Definitions/dragonworldreloaded.yml | 1 + src/Jackett/Definitions/dreamteam.yml | 1 + src/Jackett/Definitions/estone.yml | 1 + src/Jackett/Definitions/funkytorrents.yml | 1 + src/Jackett/Definitions/hdhome.yml | 3 ++- src/Jackett/Definitions/hdme.yml | 1 + src/Jackett/Definitions/hon3yhd.yml | 1 + src/Jackett/Definitions/infinityt.yml | 3 ++- src/Jackett/Definitions/inperil.yml | 1 + src/Jackett/Definitions/insanetracker.yml | 1 + src/Jackett/Definitions/jpopsuki.yml | 3 ++- src/Jackett/Definitions/kapaki.yml | 1 + src/Jackett/Definitions/magico.yml | 1 + src/Jackett/Definitions/myspleen.yml | 3 ++- src/Jackett/Definitions/ourbits.yml | 1 + src/Jackett/Definitions/passionetorrent.yml | 3 ++- src/Jackett/Definitions/polishsource.yml | 1 + src/Jackett/Definitions/rockhardlossless.yml | 1 + src/Jackett/Definitions/shellife.yml | 3 ++- src/Jackett/Definitions/sktorrent.yml | 3 ++- src/Jackett/Definitions/speedtorrentreloaded.yml | 3 ++- src/Jackett/Definitions/torrentccf.yml | 1 + src/Jackett/Definitions/torrentvault.yml | 1 + src/Jackett/Definitions/torviet.yml | 3 ++- src/Jackett/Definitions/ultimategamerclub.yml | 3 ++- src/Jackett/Definitions/ultrahdclub.yml | 3 ++- src/Jackett/Definitions/xtremezone.yml | 3 ++- src/Jackett/Definitions/yggtorrent.yml | 1 + src/Jackett/Indexers/HDForever.cs | 4 ++-- src/Jackett/Indexers/HDOnly.cs | 4 ++-- src/Jackett/Indexers/Hardbay.cs | 4 ++-- src/Jackett/Indexers/ImmortalSeed.cs | 2 +- src/Jackett/Indexers/Psytorrents.cs | 4 ++-- src/Jackett/Indexers/Superbits.cs | 4 ++-- src/Jackett/Indexers/Synthesiz3r.cs | 4 ++-- src/Jackett/Indexers/Torrentech.cs | 2 +- src/Jackett/Indexers/XSpeeds.cs | 2 +- src/Jackett/Indexers/cgpeers.cs | 4 ++-- 48 files changed, 72 insertions(+), 34 deletions(-) diff --git a/src/Jackett/Definitions/acidlounge.yml b/src/Jackett/Definitions/acidlounge.yml index 078c237dd..782b54fcb 100644 --- a/src/Jackett/Definitions/acidlounge.yml +++ b/src/Jackett/Definitions/acidlounge.yml @@ -1,6 +1,7 @@ --- site: acidlounge name: Acid-Lounge + description: "Acid Lounge (A-L) is a Private Torrent Tracker for 0DAY / GENERAL" language: en-us type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/aox.yml b/src/Jackett/Definitions/aox.yml index 149ca5f1e..ffd48163a 100644 --- a/src/Jackett/Definitions/aox.yml +++ b/src/Jackett/Definitions/aox.yml @@ -1,6 +1,7 @@ --- site: aox name: AOX + description: "AOX (Chippu) is a Private Torrent Tracker for ASIAN MOVIES / TV" language: en-us type: private encoding: UTF-8 @@ -121,4 +122,4 @@ - name: prepend args: "
Language: " - \ No newline at end of file + diff --git a/src/Jackett/Definitions/audiobooktorrents.yml b/src/Jackett/Definitions/audiobooktorrents.yml index b7d1d28f7..cd108cdf6 100644 --- a/src/Jackett/Definitions/audiobooktorrents.yml +++ b/src/Jackett/Definitions/audiobooktorrents.yml @@ -1,6 +1,7 @@ --- site: audiobooktorrents name: Audiobook Torrents + description: "Audiobook Torrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS" language: en-us type: private encoding: UTF-8 @@ -133,4 +134,4 @@ selector: td[colspan=13] filters: - name: prepend - args: "{{ .Result.description }}
\n" \ No newline at end of file + args: "{{ .Result.description }}
\n" diff --git a/src/Jackett/Definitions/backups.yml b/src/Jackett/Definitions/backups.yml index 9acf56166..2783d4fae 100644 --- a/src/Jackett/Definitions/backups.yml +++ b/src/Jackett/Definitions/backups.yml @@ -1,5 +1,6 @@  site: backups name: Back-ups + description: "Back-Ups is a Private Torrent Tracker for MOVIES / TV / GENERAL" language: en-us type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/bithq.yml b/src/Jackett/Definitions/bithq.yml index 9045dca04..ee6a6c7a7 100644 --- a/src/Jackett/Definitions/bithq.yml +++ b/src/Jackett/Definitions/bithq.yml @@ -1,6 +1,7 @@ --- site: bithq name: BitHQ + description: "BitHQ is a Private Torrent Tracker for DVD-R / BLURAY MOVIES / TV" language: en-us type: private encoding: windows-1252 @@ -90,4 +91,4 @@ "*": "1" uploadvolumefactor: case: - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/bluebird.yml b/src/Jackett/Definitions/bluebird.yml index a7b1f4597..2e6c41f88 100644 --- a/src/Jackett/Definitions/bluebird.yml +++ b/src/Jackett/Definitions/bluebird.yml @@ -1,6 +1,7 @@ --- site: bluebirdhd name: BlueBird + description: "BlueBird is a RUSSIAN Private Torrent Tracker for HD MOVIES" language: ru-ru type: private encoding: windows-1251 diff --git a/src/Jackett/Definitions/btnext.yml b/src/Jackett/Definitions/btnext.yml index 109928545..cf1786e8e 100644 --- a/src/Jackett/Definitions/btnext.yml +++ b/src/Jackett/Definitions/btnext.yml @@ -1,6 +1,7 @@ --- site: btnext name: BTNext + description: "BTNext (BTNT) is a PORTUGUESE Private Torrent Tracker for 0DAY / GENERAL" language: pt-pt type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/carpathians.yml b/src/Jackett/Definitions/carpathians.yml index 5c6420353..4b6ebe6b2 100644 --- a/src/Jackett/Definitions/carpathians.yml +++ b/src/Jackett/Definitions/carpathians.yml @@ -1,6 +1,7 @@ --- site: carpathians name: Carpathians + description: "Carpathians is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL" language: hu-hu type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/czteam.yml b/src/Jackett/Definitions/czteam.yml index 7b1341f57..aaddac32d 100644 --- a/src/Jackett/Definitions/czteam.yml +++ b/src/Jackett/Definitions/czteam.yml @@ -1,6 +1,7 @@ --- site: czteam name: CZTeam + description: "CZTeam (CZT) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: cs-cz type: private encoding: UTF-8 @@ -91,4 +92,4 @@ "*": "1" description: selector: div.torrent_info - remove: strong \ No newline at end of file + remove: strong diff --git a/src/Jackett/Definitions/datascene.yml b/src/Jackett/Definitions/datascene.yml index f846ae24b..654e3fd53 100644 --- a/src/Jackett/Definitions/datascene.yml +++ b/src/Jackett/Definitions/datascene.yml @@ -1,6 +1,7 @@ --- site: datascene name: DataScene + description: "DataScene (DS) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: ro-ro type: private encoding: windows-1252 @@ -123,4 +124,4 @@ "*": "1" description: selector: td:nth-child(2) > right - remove: div \ No newline at end of file + remove: div diff --git a/src/Jackett/Definitions/dragonworldreloaded.yml b/src/Jackett/Definitions/dragonworldreloaded.yml index ee44a4d31..4238b8c3a 100644 --- a/src/Jackett/Definitions/dragonworldreloaded.yml +++ b/src/Jackett/Definitions/dragonworldreloaded.yml @@ -1,6 +1,7 @@ --- site: dragonworldreloaded name: Dragonworld Reloaded + description: "Dragonworld Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: de-de type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/dreamteam.yml b/src/Jackett/Definitions/dreamteam.yml index 57827bc8b..ccb470606 100644 --- a/src/Jackett/Definitions/dreamteam.yml +++ b/src/Jackett/Definitions/dreamteam.yml @@ -1,6 +1,7 @@ --- site: dreamteam name: Dream Team + description: "Dream Team is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL" language: el-gr type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/estone.yml b/src/Jackett/Definitions/estone.yml index c816bf4dd..ab48e2d3a 100644 --- a/src/Jackett/Definitions/estone.yml +++ b/src/Jackett/Definitions/estone.yml @@ -1,6 +1,7 @@ --- site: estone name: eStone + description: "eStone (XiDER, BeLoad) is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL" language: hu-hu type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/funkytorrents.yml b/src/Jackett/Definitions/funkytorrents.yml index 0b9e6fc2e..32e004c3f 100644 --- a/src/Jackett/Definitions/funkytorrents.yml +++ b/src/Jackett/Definitions/funkytorrents.yml @@ -1,6 +1,7 @@ --- site: funkytorrents name: FunkyTorrents + description: "FunkyTorrents (FT) is a Private Torrent Tracker for MUSIC" language: en-us type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/hdhome.yml b/src/Jackett/Definitions/hdhome.yml index 79400ee33..afd8f5eef 100644 --- a/src/Jackett/Definitions/hdhome.yml +++ b/src/Jackett/Definitions/hdhome.yml @@ -1,6 +1,7 @@ --- site: hdhome name: HDHome + description: "HDHome (HDBiger) is a CHINESE Private Torrent Tracker for HD MOVIES / TV" language: zh-cn type: private encoding: UTF-8 @@ -139,4 +140,4 @@ "*": "1" description: selector: td:nth-child(2) - remove: a, img \ No newline at end of file + remove: a, img diff --git a/src/Jackett/Definitions/hdme.yml b/src/Jackett/Definitions/hdme.yml index b26a335ad..66f89f6d2 100644 --- a/src/Jackett/Definitions/hdme.yml +++ b/src/Jackett/Definitions/hdme.yml @@ -1,6 +1,7 @@ --- site: hdme name: HDME + description: "HDME is a Private Torrent Tracker for HD MOVIES / TV / GENERAL" language: en-us type: private encoding: windows-1252 diff --git a/src/Jackett/Definitions/hon3yhd.yml b/src/Jackett/Definitions/hon3yhd.yml index 23f48a7b5..dde3785ab 100644 --- a/src/Jackett/Definitions/hon3yhd.yml +++ b/src/Jackett/Definitions/hon3yhd.yml @@ -1,6 +1,7 @@ --- site: hon3yhd name: Hon3y HD + description: "Hon3yHD is an INDIAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: en-us type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/infinityt.yml b/src/Jackett/Definitions/infinityt.yml index af9e4d0ad..22419d394 100644 --- a/src/Jackett/Definitions/infinityt.yml +++ b/src/Jackett/Definitions/infinityt.yml @@ -1,6 +1,7 @@ --- site: infinityt name: Infinity-T + description: "Infinity-T is a DANISH Private Torrent Tracker for 0DAY / GENERAL" language: da-dk type: private encoding: UTF-8 @@ -103,4 +104,4 @@ "*": "1" uploadvolumefactor: case: - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/inperil.yml b/src/Jackett/Definitions/inperil.yml index aff82ecb1..5e5c29066 100644 --- a/src/Jackett/Definitions/inperil.yml +++ b/src/Jackett/Definitions/inperil.yml @@ -1,6 +1,7 @@ --- site: inperil name: inPeril + description: "InPeril is a LATVIAN Private Torrent Tracker for 0DAY / GENERAL" type: private language: lv-lv type: private diff --git a/src/Jackett/Definitions/insanetracker.yml b/src/Jackett/Definitions/insanetracker.yml index f33561dcf..9326d2d29 100644 --- a/src/Jackett/Definitions/insanetracker.yml +++ b/src/Jackett/Definitions/insanetracker.yml @@ -1,6 +1,7 @@ --- site: insanetracker name: Insane Tracker + description: "Insane Tracker is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL" language: hu-hu type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/jpopsuki.yml b/src/Jackett/Definitions/jpopsuki.yml index 1c273504e..6ccd8003f 100644 --- a/src/Jackett/Definitions/jpopsuki.yml +++ b/src/Jackett/Definitions/jpopsuki.yml @@ -1,6 +1,7 @@ --- site: jpopsuki name: JPopsuki + description: "JPopSuki is a Private Torrent Tracker for ASIAN MUSIC" language: en-us type: private encoding: UTF-8 @@ -102,4 +103,4 @@ "*": "1" uploadvolumefactor: case: - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/kapaki.yml b/src/Jackett/Definitions/kapaki.yml index e867532d5..90a62af53 100644 --- a/src/Jackett/Definitions/kapaki.yml +++ b/src/Jackett/Definitions/kapaki.yml @@ -1,6 +1,7 @@ --- site: kapaki name: Kapaki + description: "Kapaki is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL" language: el-gr type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/magico.yml b/src/Jackett/Definitions/magico.yml index 71b3d4dee..685727122 100644 --- a/src/Jackett/Definitions/magico.yml +++ b/src/Jackett/Definitions/magico.yml @@ -1,6 +1,7 @@ --- site: magico name: Magico + description: "Magico (Trellas) is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL" language: el-gr type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/myspleen.yml b/src/Jackett/Definitions/myspleen.yml index 60fa4a90b..f5572362f 100644 --- a/src/Jackett/Definitions/myspleen.yml +++ b/src/Jackett/Definitions/myspleen.yml @@ -1,6 +1,7 @@ --- site: myspleen name: MySpleen + description: "MySpleen is a Private Torrent Tracker for TV / COMEDY / ANIMATION / 80-90’S VHS NOSTALGIA" language: en-us type: private encoding: UTF-8 @@ -96,4 +97,4 @@ "*": "1" uploadvolumefactor: case: - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/ourbits.yml b/src/Jackett/Definitions/ourbits.yml index 4d4230814..51245c40b 100644 --- a/src/Jackett/Definitions/ourbits.yml +++ b/src/Jackett/Definitions/ourbits.yml @@ -1,6 +1,7 @@ --- site: ourbits name: Ourbits + description: "Ourbits (HDPter) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL" language: zh-cn type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/passionetorrent.yml b/src/Jackett/Definitions/passionetorrent.yml index 0d1da6c93..07dce2429 100644 --- a/src/Jackett/Definitions/passionetorrent.yml +++ b/src/Jackett/Definitions/passionetorrent.yml @@ -1,6 +1,7 @@ --- site: passionetorrent name: Passione Torrent + description: "PassioneTorrent is an ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: it-it type: private encoding: UTF-8 @@ -155,4 +156,4 @@ img[alt="8x Upload Multiplier"]: "8" img[alt="9x Upload Multiplier"]: "9" img[alt="10x Upload Multiplier"]: "10" - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/polishsource.yml b/src/Jackett/Definitions/polishsource.yml index c78d9cb0f..7bbb21fcc 100644 --- a/src/Jackett/Definitions/polishsource.yml +++ b/src/Jackett/Definitions/polishsource.yml @@ -1,6 +1,7 @@ --- site: polishsource name: PolishSource + description: "PolishSource (PS) is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL" language: pl-pl type: private encoding: ISO-8859-2 diff --git a/src/Jackett/Definitions/rockhardlossless.yml b/src/Jackett/Definitions/rockhardlossless.yml index 1881d7a44..3c8b7e02e 100644 --- a/src/Jackett/Definitions/rockhardlossless.yml +++ b/src/Jackett/Definitions/rockhardlossless.yml @@ -1,6 +1,7 @@ --- site: rockhardlossless name: Rockhard Lossless + description: "RockHard Lossless is a Private Torrent Tracker for LOSSLESS ROCK MUSIC" language: en-us type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/shellife.yml b/src/Jackett/Definitions/shellife.yml index 0b091e93f..dffe15764 100644 --- a/src/Jackett/Definitions/shellife.yml +++ b/src/Jackett/Definitions/shellife.yml @@ -1,6 +1,7 @@ --- site: shellife name: Shellife + description: "Shellife (SL) is a Private Torrent Tracker for NON MAINSTREAM MUSIC" language: en-us type: private encoding: UTF-8 @@ -78,4 +79,4 @@ - name: trim args: " " - \ No newline at end of file + diff --git a/src/Jackett/Definitions/sktorrent.yml b/src/Jackett/Definitions/sktorrent.yml index 2bcf74479..ba5871cee 100644 --- a/src/Jackett/Definitions/sktorrent.yml +++ b/src/Jackett/Definitions/sktorrent.yml @@ -1,6 +1,7 @@ --- site: sktorrent name: SkTorrent + description: "SkTorrent is a CZECH/SLOVAK Semi-Private Torrent Tracker for MOVIES / TV / GENERAL" language: cs-cz type: semi-private encoding: windows-1250 @@ -128,4 +129,4 @@ "*": "1" uploadvolumefactor: case: - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/speedtorrentreloaded.yml b/src/Jackett/Definitions/speedtorrentreloaded.yml index 85478ec0c..46a227f90 100644 --- a/src/Jackett/Definitions/speedtorrentreloaded.yml +++ b/src/Jackett/Definitions/speedtorrentreloaded.yml @@ -1,6 +1,7 @@ --- site: speedtorrentreloaded name: SpeedTorrent Reloaded + description: "SpeedTorrent Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: de-de type: private encoding: UTF-8 @@ -119,4 +120,4 @@ "*": "1" uploadvolumefactor: case: - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/torrentccf.yml b/src/Jackett/Definitions/torrentccf.yml index 26cb9ad8c..af1b620f0 100644 --- a/src/Jackett/Definitions/torrentccf.yml +++ b/src/Jackett/Definitions/torrentccf.yml @@ -1,6 +1,7 @@ --- site: torrentccf name: TorrentCCF + description: "TorrentCCF (TCCF) is a CHINESE Private Torrent Tracker for HD MOVIES / TV" language: zh-cn type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/torrentvault.yml b/src/Jackett/Definitions/torrentvault.yml index c73a25380..dc07b523a 100644 --- a/src/Jackett/Definitions/torrentvault.yml +++ b/src/Jackett/Definitions/torrentvault.yml @@ -1,6 +1,7 @@ --- site: torrentvault name: TorrentVault + description: "TorrentVault is a Private Torrent Tracker for TV / MOVIES / GENERAL" language: en-us type: private encoding: UTF-8 diff --git a/src/Jackett/Definitions/torviet.yml b/src/Jackett/Definitions/torviet.yml index 737f05756..f182431f8 100644 --- a/src/Jackett/Definitions/torviet.yml +++ b/src/Jackett/Definitions/torviet.yml @@ -1,6 +1,7 @@ --- site: torviet name: TorViet + description: "Tor Viet (HDVNBits) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV / GENERAL" language: vi-vn type: private encoding: UTF-8 @@ -128,4 +129,4 @@ img.pro_50pctdown2up: "2" img.pro_free2up: "2" img.pro_2up: "2" - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/ultimategamerclub.yml b/src/Jackett/Definitions/ultimategamerclub.yml index 292652d5f..2cb6a2654 100644 --- a/src/Jackett/Definitions/ultimategamerclub.yml +++ b/src/Jackett/Definitions/ultimategamerclub.yml @@ -1,6 +1,7 @@ --- site: ultimategamerclub name: Ultimate Gamer Club + description: "Ultimate Gamer (UGC) is a Private Torrent Tracker for GAMES" language: en-us type: private encoding: UTF-8 @@ -122,4 +123,4 @@ "*": "1" uploadvolumefactor: case: - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/ultrahdclub.yml b/src/Jackett/Definitions/ultrahdclub.yml index ef1312866..c0355884c 100644 --- a/src/Jackett/Definitions/ultrahdclub.yml +++ b/src/Jackett/Definitions/ultrahdclub.yml @@ -1,6 +1,7 @@ --- site: ultrahdclub name: ULTRAHDCLUB + description: "UltraHDCLUB is a RUSSIAN Private Torrent Tracker for UHD MOVIES / TV" language: ru-ru type: private encoding: windows-1251 @@ -93,4 +94,4 @@ "*": "1" uploadvolumefactor: case: - "*": "1" \ No newline at end of file + "*": "1" diff --git a/src/Jackett/Definitions/xtremezone.yml b/src/Jackett/Definitions/xtremezone.yml index b4075fad9..85329428f 100644 --- a/src/Jackett/Definitions/xtremezone.yml +++ b/src/Jackett/Definitions/xtremezone.yml @@ -1,6 +1,7 @@ --- site: xtremezone name: Xtreme Zone + description: "XtreMeZone (MYXZ) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: ro-ro type: semi-private encoding: UTF-8 @@ -120,4 +121,4 @@ "*": "1" description: selector: td:nth-child(2) - remove: a, img \ No newline at end of file + remove: a, img diff --git a/src/Jackett/Definitions/yggtorrent.yml b/src/Jackett/Definitions/yggtorrent.yml index d87911340..2671e316d 100755 --- a/src/Jackett/Definitions/yggtorrent.yml +++ b/src/Jackett/Definitions/yggtorrent.yml @@ -1,6 +1,7 @@ --- site: yggtorrent name: YGGtorrent + description: "YGGTorrent is a FRENCH Private Torrent Tracker for 0DAY / GENERAL" language: fr-fr type: semi-private encoding: UTF-8 diff --git a/src/Jackett/Indexers/HDForever.cs b/src/Jackett/Indexers/HDForever.cs index 214c8928e..73e6b41ab 100644 --- a/src/Jackett/Indexers/HDForever.cs +++ b/src/Jackett/Indexers/HDForever.cs @@ -10,7 +10,7 @@ namespace Jackett.Indexers { public HDForever(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService) : base(name: "HD-Forever", - desc: null, + desc: "HD-Forever (HD-F) is a FRENCH Private Torrent Tracker for HD MOVIES", link: "https://hdf.world/", configService: configService, logger: logger, @@ -24,4 +24,4 @@ namespace Jackett.Indexers AddCategoryMapping(1, TorznabCatType.MoviesHD, "Movies/HD"); } } -} \ No newline at end of file +} diff --git a/src/Jackett/Indexers/HDOnly.cs b/src/Jackett/Indexers/HDOnly.cs index 2d866b5ad..b82791384 100644 --- a/src/Jackett/Indexers/HDOnly.cs +++ b/src/Jackett/Indexers/HDOnly.cs @@ -13,7 +13,7 @@ namespace Jackett.Indexers { public HDOnly(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService) : base(name: "HD-Only", - desc: null, + desc: "HD-Only (HD-O) is a FRENCH Private Torrent Tracker for HD MOVIES / TV", link: "https://hd-only.org/", configService: configService, logger: logger, @@ -60,4 +60,4 @@ namespace Jackett.Indexers return new List(); } } -} \ No newline at end of file +} diff --git a/src/Jackett/Indexers/Hardbay.cs b/src/Jackett/Indexers/Hardbay.cs index e4e539294..897b27d1a 100644 --- a/src/Jackett/Indexers/Hardbay.cs +++ b/src/Jackett/Indexers/Hardbay.cs @@ -28,7 +28,7 @@ namespace Jackett.Indexers public Hardbay(IIndexerConfigurationService configService, IWebClient w, Logger l, IProtectionService ps) : base(name: "Hardbay", - description: null, + description: "Hardbay is a Private Torrent Tracker for HARDSTYLE / HARDCORE ELECTRONIC MUSIC", link: "https://hardbay.club/", caps: new TorznabCapabilities(), configService: configService, @@ -147,4 +147,4 @@ namespace Jackett.Indexers return releases; } } -} \ No newline at end of file +} diff --git a/src/Jackett/Indexers/ImmortalSeed.cs b/src/Jackett/Indexers/ImmortalSeed.cs index 6c6663652..a676e9570 100644 --- a/src/Jackett/Indexers/ImmortalSeed.cs +++ b/src/Jackett/Indexers/ImmortalSeed.cs @@ -32,7 +32,7 @@ namespace Jackett.Indexers public ImmortalSeed(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps) : base(name: "ImmortalSeed", - description: "ImmortalSeed", + description: "ImmortalSeed (iS) is a Private Torrent Tracker for MOVIES / TV / GENERAL", link: "http://immortalseed.me/", caps: TorznabUtil.CreateDefaultTorznabTVCaps(), configService: configService, diff --git a/src/Jackett/Indexers/Psytorrents.cs b/src/Jackett/Indexers/Psytorrents.cs index 34e8a21fd..167e1b632 100644 --- a/src/Jackett/Indexers/Psytorrents.cs +++ b/src/Jackett/Indexers/Psytorrents.cs @@ -10,7 +10,7 @@ namespace Jackett.Indexers { public Psytorrents(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService) : base(name: "Psytorrents", - desc: null, + desc: "Psytorrents (PSY) is a Private Torrent Tracker for ELECTRONIC MUSIC", link: "https://psytorrents.info/", configService: configService, logger: logger, @@ -26,4 +26,4 @@ namespace Jackett.Indexers AddCategoryMapping(3, TorznabCatType.PC0day, "App"); } } -} \ No newline at end of file +} diff --git a/src/Jackett/Indexers/Superbits.cs b/src/Jackett/Indexers/Superbits.cs index 595681736..fbe835dc0 100644 --- a/src/Jackett/Indexers/Superbits.cs +++ b/src/Jackett/Indexers/Superbits.cs @@ -28,7 +28,7 @@ namespace Jackett.Indexers public Superbits(IIndexerConfigurationService configService, IWebClient w, Logger l, IProtectionService ps) : base(name: "Superbits", - description: null, + description: "SuperBits is a SWEDISH Private Torrent Tracker for MOVIES / TV / GENERAL", link: "https://superbits.org/", caps: new TorznabCapabilities(), configService: configService, @@ -194,4 +194,4 @@ namespace Jackett.Indexers return releases; } } -} \ No newline at end of file +} diff --git a/src/Jackett/Indexers/Synthesiz3r.cs b/src/Jackett/Indexers/Synthesiz3r.cs index c512a9ced..3abe5324d 100644 --- a/src/Jackett/Indexers/Synthesiz3r.cs +++ b/src/Jackett/Indexers/Synthesiz3r.cs @@ -10,7 +10,7 @@ namespace Jackett.Indexers { public Synthesiz3r(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService) : base(name: "Synthesiz3r", - desc: null, + desc: "Synthesiz3r (ST3) is a Private Torrent Tracker for ELECTRONIC MUSIC", link: "https://synthesiz3r.com/", configService: configService, logger: logger, @@ -30,4 +30,4 @@ namespace Jackett.Indexers AddCategoryMapping(7, TorznabCatType.Books, "Comics"); } } -} \ No newline at end of file +} diff --git a/src/Jackett/Indexers/Torrentech.cs b/src/Jackett/Indexers/Torrentech.cs index ce9210a32..8c0c38beb 100644 --- a/src/Jackett/Indexers/Torrentech.cs +++ b/src/Jackett/Indexers/Torrentech.cs @@ -31,7 +31,7 @@ namespace Jackett.Indexers public Torrentech(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps) : base(name: "Torrentech", - description: null, + description: "TorrenTech (TTH) is a Private Torrent Tracker for ELECTRONIC MUSIC", link: "https://www.torrentech.org/", caps: TorznabUtil.CreateDefaultTorznabTVCaps(), configService: configService, diff --git a/src/Jackett/Indexers/XSpeeds.cs b/src/Jackett/Indexers/XSpeeds.cs index 4a074d6a6..2e94a1a1f 100644 --- a/src/Jackett/Indexers/XSpeeds.cs +++ b/src/Jackett/Indexers/XSpeeds.cs @@ -37,7 +37,7 @@ namespace Jackett.Indexers public XSpeeds(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps) : base(name: "XSpeeds", - description: "XSpeeds", + description: "XSpeeds (XS) is a Private Torrent Tracker for MOVIES / TV / GENERAL", link: "https://www.xspeeds.eu/", caps: TorznabUtil.CreateDefaultTorznabTVCaps(), configService: configService, diff --git a/src/Jackett/Indexers/cgpeers.cs b/src/Jackett/Indexers/cgpeers.cs index 42817c466..fa782d496 100644 --- a/src/Jackett/Indexers/cgpeers.cs +++ b/src/Jackett/Indexers/cgpeers.cs @@ -10,7 +10,7 @@ namespace Jackett.Indexers { public CGPeers(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService) : base(name: "CGPeers", - desc: null, + desc: "CGPeers is a Private Torrent Tracker for GRAPHICS SOFTWARE / TUTORIALS / ETC", link: "https://www.cgpeers.com/", configService: configService, logger: logger, @@ -30,4 +30,4 @@ namespace Jackett.Indexers AddCategoryMapping(7, TorznabCatType.Other, "GameDev"); } } -} \ No newline at end of file +} From aff3af02146d880286ce31ba84a98f6d4108ae13 Mon Sep 17 00:00:00 2001 From: Matthew Banning Date: Sun, 1 Oct 2017 10:26:52 +0100 Subject: [PATCH 6/8] RARBG: Adding 4k categories (#1910) * Add 4k Movie and TV categories for RARBG Currently it does not look like torrentapi.org indexes the 4k movie categories but I've added them anyway in case they get added in the future. Also, torrentapi.org returns "Movies/TV-UHD-episodes" for RARBG's 4k TV category. This may be due to RARBG's top100 page. * Update Rarbg.cs --- src/Jackett/Indexers/Rarbg.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Jackett/Indexers/Rarbg.cs b/src/Jackett/Indexers/Rarbg.cs index 84d7c22d4..f3c28a443 100644 --- a/src/Jackett/Indexers/Rarbg.cs +++ b/src/Jackett/Indexers/Rarbg.cs @@ -67,10 +67,15 @@ namespace Jackett.Indexers AddCategoryMapping(44, TorznabCatType.MoviesHD, "Movies/x264/1080"); AddCategoryMapping(45, TorznabCatType.MoviesHD, "Movies/x264/720"); AddCategoryMapping(47, TorznabCatType.Movies3D, "Movies/x264/3D"); + AddCategoryMapping(50, TorznabCatType.MoviesHD, "Movies/x264/4k"); + AddCategoryMapping(51, TorznabCatType.MoviesHD, "Movies/x265/4k"); + AddCategoryMapping(52, TorznabCatType.MoviesHD, "Movs/x265/4k/HDR"); AddCategoryMapping(42, TorznabCatType.MoviesBluRay, "Movies/Full BD"); AddCategoryMapping(46, TorznabCatType.MoviesBluRay, "Movies/BD Remux"); AddCategoryMapping(18, TorznabCatType.TVSD, "TV Episodes"); AddCategoryMapping(41, TorznabCatType.TVHD, "TV HD Episodes"); + AddCategoryMapping(49, TorznabCatType.TVHD, "TV UHD Episodes"); // torrentapi.org returns "Movies/TV-UHD-episodes" for some reason + AddCategoryMapping(49, TorznabCatType.TVHD, "Movies/TV-UHD-episodes"); // possibly because thats what the category is called on the /top100.php page AddCategoryMapping(23, TorznabCatType.AudioMP3, "Music/MP3"); AddCategoryMapping(25, TorznabCatType.AudioLossless, "Music/FLAC"); AddCategoryMapping(27, TorznabCatType.PCGames, "Games/PC ISO"); @@ -240,4 +245,4 @@ namespace Jackett.Indexers } } -} \ No newline at end of file +} From 1ea5b21956756ed884e78d3fae5c90cd6c5c81c5 Mon Sep 17 00:00:00 2001 From: garfield69 Date: Sun, 1 Oct 2017 22:28:10 +1300 Subject: [PATCH 7/8] Display a description on Indexer Setup panel (#1911) * custom.js: add description alert to Indexer Setup panel * index.html: add description to Indexer Setup panel * Update index.html --- src/Jackett/Content/custom.js | 16 ++++++++-------- src/Jackett/Content/index.html | 7 +++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Jackett/Content/custom.js b/src/Jackett/Content/custom.js index 8a81ad6d8..25929eb6d 100644 --- a/src/Jackett/Content/custom.js +++ b/src/Jackett/Content/custom.js @@ -187,7 +187,7 @@ function displayUnconfiguredIndexersList() { var indexer = unconfiguredIndexers[i]; $(btn).click(function () { $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) { - displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks); + displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks, indexer.description); }); }); }); @@ -378,7 +378,7 @@ function prepareSetupButtons(element) { element.find('.indexer-setup').each(function (i, btn) { var indexer = configuredIndexers[i]; $(btn).click(function () { - displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks); + displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks, indexer.description); }); }); } @@ -456,14 +456,14 @@ function prepareTestButtons(element) { }); } -function displayIndexerSetup(id, name, caps, link, alternativesitelinks) { +function displayIndexerSetup(id, name, caps, link, alternativesitelinks, description) { api.getIndexerConfig(id, function (data) { if (data.result !== undefined && data.result == "error") { doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert"); return; } - populateSetupForm(id, name, data, caps, link, alternativesitelinks); + populateSetupForm(id, name, data, caps, link, alternativesitelinks, description); }).fail(function () { doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert"); }); @@ -539,9 +539,9 @@ function populateConfigItems(configForm, config) { } } -function newConfigModal(title, config, caps, link, alternativesitelinks) { +function newConfigModal(title, config, caps, link, alternativesitelinks, description) { var configTemplate = Handlebars.compile($("#jackett-config-setup-modal").html()); - var configForm = $(configTemplate({ title: title, caps: caps, link:link })); + var configForm = $(configTemplate({ title: title, caps: caps, link: link, description: description })); $("#modals").append(configForm); populateConfigItems(configForm, config); @@ -602,8 +602,8 @@ function getConfigModalJson(configForm) { return configJson; } -function populateSetupForm(indexerId, name, config, caps, link, alternativesitelinks) { - var configForm = newConfigModal(name, config, caps, link, alternativesitelinks); +function populateSetupForm(indexerId, name, config, caps, link, alternativesitelinks, description) { + var configForm = newConfigModal(name, config, caps, link, alternativesitelinks, description); var $goButton = configForm.find(".setup-indexer-go"); $goButton.click(function () { var data = getConfigModalJson(configForm); diff --git a/src/Jackett/Content/index.html b/src/Jackett/Content/index.html index caf811312..70b82fbd0 100644 --- a/src/Jackett/Content/index.html +++ b/src/Jackett/Content/index.html @@ -1,4 +1,4 @@ - + @@ -581,6 +581,9 @@

{{title}} - {{link}}

+ {{#if description}} +
{{description}}
+ {{/if}}
@@ -622,6 +625,6 @@ - +