From 7da865ea0798dd69813a9eb82be44a784d3a6a6b Mon Sep 17 00:00:00 2001
From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
Date: Wed, 20 Jan 2021 04:58:43 +0000
Subject: [PATCH] bigtower, fullmixmusic, hdstreet: removed, down for 30 days
(#10874)
---
README.md | 3 -
src/Jackett.Common/Definitions/bigtower.yml | 141 ---------------
.../Definitions/fullmixmusic.yml | 89 ---------
src/Jackett.Common/Definitions/hdstreet.yml | 171 ------------------
src/Jackett.Updater/Program.cs | 3 +
5 files changed, 3 insertions(+), 404 deletions(-)
delete mode 100644 src/Jackett.Common/Definitions/bigtower.yml
delete mode 100644 src/Jackett.Common/Definitions/fullmixmusic.yml
delete mode 100644 src/Jackett.Common/Definitions/hdstreet.yml
diff --git a/README.md b/README.md
index ef1d5fca8..8001bc23a 100644
--- a/README.md
+++ b/README.md
@@ -252,7 +252,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* BeyondHD (BHD)
* Bibliotik
* BIGTorrent
- * BigTower
* Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
* BIT-HDTV
* BiT-TiTAN
@@ -328,7 +327,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* FocusX
* Fou-Du-Cinema
* FreeTorrent
- * FullMixMusic
* FunFile (FF)
* FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
* FunReleases [![(invite needed)][inviteneeded]](#)
@@ -365,7 +363,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* HDME
* HDRoute [![(invite needed)][inviteneeded]](#)
* HDSky
- * HDStreet
* HDTime
* HDTorrents.it
* HDTurk [![(invite needed)][inviteneeded]](#)
diff --git a/src/Jackett.Common/Definitions/bigtower.yml b/src/Jackett.Common/Definitions/bigtower.yml
deleted file mode 100644
index 559c4b5d2..000000000
--- a/src/Jackett.Common/Definitions/bigtower.yml
+++ /dev/null
@@ -1,141 +0,0 @@
----
-id: bigtower
-name: BigTower
-description: "Big Tower is an ITALIAN Private site for TV / MOVIES / GENERAL"
-language: it-it
-type: private
-encoding: UTF-8
-links:
- - http://bigtower.info/ # site does not support https NET::ERR_CERT_DATE_INVALID
-legacylinks:
- - https://bigtower.info/
-
-caps:
- categorymappings:
-
- - {id: 11, cat: Movies/HD, desc: "DSS"}
- - {id: 1, cat: Movies, desc: "Screener"}
- - {id: 2, cat: Movies, desc: "DVDRip & BDRip"}
- - {id: 3, cat: Movies/BluRay, desc: "Bluray 1080p & 720p"}
- - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
- - {id: 6, cat: TV, desc: "Serie TV"}
- - {id: 4, cat: TV/Anime, desc: "Cartoni"}
- - {id: 7, cat: PC/Games, desc: "Giochi"}
- - {id: 8, cat: Audio, desc: "Musica"}
- - {id: 9, cat: PC/0day, desc: "Software"}
- - {id: 12, cat: PC/Mobile-Other, desc: "Applicazioni"}
- - {id: 14, cat: Other, desc: "Varie & Altro"}
- - {id: 13, cat: Books, desc: "Libri & Edicola"}
-
- 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: donor
- type: checkbox
- label: Show donor torrent? (Enable if you're a donor)
- default: false
- - name: info
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
-
-login:
- path: index.php?page=login
- method: post
- inputs:
- uid: "{{ .Config.username }}"
- pwd: "{{ .Config.password }}"
- error:
- - selector: span:contains("Nome Utente non corretto")
- test:
- path: index.php
- selector: a[href="logout.php"]
-
-search:
- paths:
- - path: index.php
- inputs:
- search: "{{ .Keywords }}"
- page: torrents
- category: "{{ range .Categories }}{{.}};{{end}}"
- options: 0
- active: 0
-
- rows:
- selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="]){{ if .Config.donor }}{{ else }}:not(:has(img[src*="keditbookmarks.png"])){{ end }}
-
- fields:
- category:
- selector: a[href^="index.php?page=torrents&category="]
- attribute: href
- filters:
- - name: querystring
- args: category
- title:
- selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
- filters:
- - name: re_replace # rimozioni varie
- args: ["(?i)(\\[Richiesta\\])", ""]
- details:
- selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
- attribute: href
- download:
- selector: a[href^="index.php?page=torrent-details&id="]
- attribute: href
- filters:
- - name: replace
- args: ["index.php?page=torrent-details&id=", "download.php?id="]
- poster:
- selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
- attribute: onmouseover
- filters:
- - name: regexp
- args: "src=(.*?) "
- size:
- selector: td:nth-last-child(2)
- date:
- selector: td:nth-last-child(8)
- filters:
- - name: append
- args: " +01:00" # CET
- - name: dateparse
- args: "02/01/2006 -07:00"
- grabs:
- selector: td:nth-last-child(5)
- filters:
- - name: replace
- args: ["---", "0"]
- seeders:
- selector: td:nth-last-child(7)
- leechers:
- selector: td:nth-last-child(6)
- downloadvolumefactor:
- case:
- img[alt="Gold 100% Free"]: 0
- img[alt="Silver 50% Free"]: 0.5
- img[alt="Bronze 25% Free"]: 0.75
- "*": 1
- uploadvolumefactor:
- case:
- img[alt="2x Upload Multiplier"]: 2
- img[alt="3x Upload Multiplier"]: 3
- img[alt="4x Upload Multiplier"]: 4
- img[alt="5x Upload Multiplier"]: 5
- img[alt="6x Upload Multiplier"]: 6
- img[alt="7x Upload Multiplier"]: 7
- img[alt="8x Upload Multiplier"]: 8
- img[alt="9x Upload Multiplier"]: 9
- img[alt="10x Upload Multiplier"]: 10
- "*": 1
-# xbtitFM v3.0.00
diff --git a/src/Jackett.Common/Definitions/fullmixmusic.yml b/src/Jackett.Common/Definitions/fullmixmusic.yml
deleted file mode 100644
index 19d389e7b..000000000
--- a/src/Jackett.Common/Definitions/fullmixmusic.yml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-id: fullmixmusic
-name: FullMixMusic
-description: "FullMixMusic is a HUNGARIAN Private Torrent Tracker for MUSIC"
-language: hu-hu
-type: private
-encoding: UTF-8
-links:
- - https://fullmixmusic.org/
-legacylinks:
- - http://fullmixmusic.org/
-
-caps:
- categories:
- 1: Audio
-
- modes:
- search: [q]
- music-search: [q, artist]
-
-login:
- path: login.php
- method: post
- inputs:
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- error:
- - selector: table.main:contains("Művelet!")
- test:
- path: browse.php
-
-search:
- paths:
- - path: browse.php
- inputs:
- search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
- showsearch: 1
- incldead: 1
-
- rows:
- selector: table.tablak > tbody > tr:has(a[href^="details.php?id="])
-
- fields:
- category:
- text: 1
- title:
- selector: a[href^="details.php?id="][title]
- attribute: title
- filters:
- - name: regexp
- args: ^(.*?)
- details:
- selector: a[href^="details.php?id="][title]
- attribute: href
- download:
- selector: a[href^="download.php?id="]
- attribute: href
- poster:
- selector: a[href^="details.php?id="][title]
- attribute: title
- filters:
- - name: regexp
- args: "src=\"(.*?)\">"
- description:
- selector: td:nth-child(2) > i > font
- date:
- selector: td:nth-child(6)
- filters:
- - name: append
- args: " +01:00" # CET
- - name: dateparse
- args: "2006-01-02 15:04:05 -07:00"
- size:
- selector: td:nth-child(7)
- seeders:
- selector: td:nth-child(8)
- leechers:
- selector: td:nth-child(9)
- grabs:
- selector: td:nth-child(10)
- downloadvolumefactor:
- text: 0
- uploadvolumefactor:
- case:
- font[title^="Dupla feltöltésű torrent!"]: 2
- font[title^="x3 feltöltésű torrent!"]: 3
- font[title^="x4 feltöltésű torrent!"]: 4
- "*": 1
-# engine tbd
diff --git a/src/Jackett.Common/Definitions/hdstreet.yml b/src/Jackett.Common/Definitions/hdstreet.yml
deleted file mode 100644
index c904ee1c6..000000000
--- a/src/Jackett.Common/Definitions/hdstreet.yml
+++ /dev/null
@@ -1,171 +0,0 @@
----
-id: hdstreet
-name: HDStreet
-description: "HDStreet is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-cn
-type: private
-encoding: UTF-8
-links:
- - https://hdstreet.club/
-caps:
- categorymappings:
- - {id: 401, cat: Movies, desc: "Movies(D)/华语电影", default: true}
- - {id: 403, cat: Movies, desc: "Movies(F)/外语电影", default: true}
- - {id: 402, cat: TV, desc: "TV Series(D)/华语电视剧", default: true}
- - {id: 404, cat: TV, desc: "TV Series(F)/外语电视剧", default: true}
- - {id: 406, cat: TV, desc: "TV Shows(D)/华语综艺", default: true}
- - {id: 405, cat: TV, desc: "TV Shows(F)/外语综艺", default: true}
- - {id: 408, cat: TV/Anime, desc: "TV Anime(D)/华语动漫", default: true}
- - {id: 411, cat: TV/Anime, desc: "TV Anime(F)/外语动漫", default: true}
- - {id: 409, cat: Audio/Video, desc: "MusicVideo(D)/华语音乐MV", default: true}
- - {id: 412, cat: Audio/Video, desc: "MusicVideo(F)/外语音乐MV", default: true}
- - {id: 407, cat: TV/Documentary, desc: "Documentaries(D)/华语纪录片", default: true}
- - {id: 413, cat: TV/Documentary, desc: "Documentaries(F)/外语纪录片", default: true}
-
- modes:
- search: [q]
- tv-search: [q, season, ep, imdbid]
- movie-search: [q, imdbid]
- music-search: [q]
-
-settings:
- - 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: 4
- options:
- 4: created
- 7: seeders
- 5: size
- 1: 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 Torrents per page: setting to 100 on your account profile.
-
-login:
- path: login.php
- method: form
- form: form[action="takelogin.php"]
- inputs:
- logintype: username
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- logout: ""
- thispagewidth: yes
- error:
- - selector: td.embedded:has(h2:contains("姿势不正确"))
- test:
- path: index.php
- selector: a[href="logout.php"]
-
-search:
- paths:
- - path: torrents.php
- categories: [401, 402, 406, 408, 409, 407]
- - path: torrentsasia.php
- categories: [403, 404, 405, 411, 412, 413]
- inputs:
- $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
- search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
- # 0 incldead, 1 active, 2 dead, 3 noimdb, 4 onlydead
- incldead: 0
- # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%, 8 all promotions
- spstate: "{{ if .Config.freeleech }}8{{ else }}0{{ end }}"
- # 0 all, 1 popular, 2 classic, 3 recommended, 4 normal
- picktype: 0
- # 0 title, 3 uploader, 4 movie info, 5 imdbid, 6 torrent hash, 7 activity seed
- search_area: "{{ if .Query.IMDBID }}5{{ else }}0{{ end }}"
- # 0 AND, 1 OR, 2 exact
- search_mode: 0
- sort: "{{ .Config.sort }}"
- type: "{{ .Config.type }}"
- # can search for imdbid but does not show imdb link in search results.
-
- rows:
- selector: table.torrents > tbody > tr:has(a[href^="details.php?id="]), table.torrents > tbody > tr:has(a[href^="comment.php?"])
- after: 1
-
- fields:
- category:
- selector: a[href^="?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
- title:
- selector: a[href^="details.php?id="]
- title:
- optional: true
- selector: a[title][href^="details.php?id="]
- attribute: title
- details:
- selector: a[href^="details.php?id="]
- attribute: href
- download:
- # downloads can be missing but we can exclude them due to after:1
- selector: a[href^="download.php?id="]
- attribute: href
- optional: true
- seeders:
- selector: td:nth-child(3)
- leechers:
- selector: td:nth-child(4)
- grabs:
- selector: td:nth-child(5)
- date:
- # time type: time elapsed (default)
- selector: td:nth-child(9) > span[title]
- attribute: title
- optional: true
- filters:
- - name: append
- args: " +08:00" # CST
- - name: dateparse
- args: "2006-01-02 15:04:05 -07:00"
- date:
- # time added
- selector: td:nth-child(9):not(:has(span))
- optional: true
- filters:
- - name: append
- args: " +08:00" # CST
- - name: dateparse
- args: "2006-01-0215:04:05 -07:00"
- size:
- selector: td:nth-child(10)
- downloadvolumefactor:
- case:
- img.pro_free: 0
- img.pro_free2up: 0
- img.pro_50pctdown: 0.5
- img.pro_50pctdown2up: 0.5
- img.pro_30pctdown: 0.3
- "*": 1
- uploadvolumefactor:
- case:
- img.pro_50pctdown2up: 2
- img.pro_free2up: 2
- img.pro_2up: 2
- "*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
-# NexusPHP V1.5.β5
diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs
index e9caf54c2..d77bbcbfc 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -272,6 +272,7 @@ namespace Jackett.Updater
"Definitions/b2s-share.yml",
"Definitions/badasstorrents.yml", // to be migrated to c#
"Definitions/bithq.yml",
+ "Definitions/bigtower.yml",
"Definitions/bitme.yml",
"Definitions/bittorrentam.yml",
"Definitions/blubits.yml",
@@ -311,6 +312,7 @@ namespace Jackett.Updater
"Definitions/filmsclub.yml",
"Definitions/freakstrackingsystem.yml",
"Definitions/freedomhd.yml",
+ "Definitions/fullmixmusic.yml",
"Definitions/gdf76.yml",
"Definitions/gfxnews.yml",
"Definitions/gods.yml",
@@ -323,6 +325,7 @@ namespace Jackett.Updater
"Definitions/hdclub.yml",
"Definitions/hddisk.yml",
"Definitions/hdplus.yml",
+ "Definitions/hdstreet.yml",
"Definitions/hon3yhd-net.yml",
"Definitions/horriblesubs.yml",
"Definitions/hyperay.yml",