diff --git a/README.md b/README.md index ec9d2e481..03025408c 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * GkTorrent * GloDLS * GTorrent.pro - * HDhouse (HDReactor) * IBit * Idope * Il CorSaRo Blu diff --git a/src/Jackett.Common/Definitions/hdhouse.yml b/src/Jackett.Common/Definitions/hdhouse.yml deleted file mode 100644 index cfd316c38..000000000 --- a/src/Jackett.Common/Definitions/hdhouse.yml +++ /dev/null @@ -1,156 +0,0 @@ ---- -id: hdhouse -name: HDhouse -description: "HDhouse (HDReactor) is a RUSSIAN Public Torrent Tracker for MOVIES / TV" -language: ru-RU -type: public -encoding: windows-1251 -links: - - https://hdreactor.club/ - - https://hdreactor.net/ -legacylinks: - - https://hdreactor.guru/ - - https://hdreactor.su/ - - https://hdhouse.club/ - -caps: - categorymappings: - - {id: 2001, cat: Movies/HD, desc: "Кино HD"} - - {id: 5006, cat: Movies/UHD, desc: "Кино UHD"} - - {id: 2007, cat: TV/Anime, desc: "Мультфильмы"} - - {id: 2006, cat: TV/HD, desc: "Сериалы HD"} - - {id: 2004, cat: Audio/Lossless, desc: "Музыка A"} - - {id: 5007, cat: Audio/Video, desc: "Музыка V"} - - {id: 2003, cat: XXX, desc: "18+ HD"} - - {id: 2005, cat: PC/Games, desc: "Игры"} - - {id: 5005, cat: TV/Sport, desc: "Спорт HD"} # not shown in list - - modes: - search: [q] - tv-search: [q, season, ep] - movie-search: [q] - music-search: [q] - -settings: - - name: striprussian - type: checkbox - label: Strip Russian Letters - default: false - - name: sort - type: select - label: Sort requested from site - default: date - options: - date: created - title: title - - name: type - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - -download: - selectors: - - selector: a[href^="magnet:?xt="] - attribute: href - -search: - # https://hdreactor.net/index.php?do=search&subaction=search&showposts=1&story=2020&catlist[]=2001&catlist[]=2006 - paths: - - path: index.php - keywordsfilters: - - name: diacritics - args: replace - - name: re_replace # S01 to Сезон 1 - args: ["(?i)\\bS0*(\\d+)\\b", " Сезон $1"] - - name: re_replace # S01E01 to Сезон 1 Серии 1 - args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", " Сезон $1 Серии $2"] - inputs: - $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}" - do: search - subaction: search - showposts: 1 - # 0 in article, 1 in comments ,2 in static pages, 3 in article titles - titleonly: 3 - story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}" - sortby: "{{ .Config.sort }}" - resorder: "{{ .Config.type }}" - - headers: - # site presents hcaptcha challenge for Jackett's User-Agent, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35) - User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"] - - rows: - selector: div.movie-item - - fields: - category: - selector: div.movie-item__meta > span > a - case: - a[href$="/1/"]: 2001 - a[href$="/4k_uhd/"]: 5006 - a[href$="/7/"]: 2007 - a[href$="/6/"]: 2006 - a[href$="/4/"]: 2004 - a[href$="/9/"]: 5007 - a[href$="/3/"]: 2003 - a[href$="/5/"]: 2005 - a[href$="/sport-hd/"]: 5005 # not shown in list - title: - selector: span.movie-item__title - filters: - # normalize to SXXEYY format - - name: re_replace - args: ["[\\.\\,\\:\\-\\/\\|\\[\\]]", " "] - - name: re_replace - args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"] - - name: re_replace - args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*(\\d+)\\s*(.*)", "$1 S$2E$3-$4 rus $5"] - - name: re_replace - args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"] - - name: re_replace - args: ["(.*)[CСcс]езон\\s*(\\d+)(.*)", "$1 S$2 rus $3"] - - name: re_replace - args: ["(.*)[CСcс]]ери[ия]\\s*(\\d+)(.*)", "$1 E$2 rus $3"] - - name: re_replace - args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"] - - name: replace - args: ["WEBRip", "WEBDL"] - - name: replace - args: ["WEB DL", "WEBDL"] - - name: replace - args: ["WEBDLRip", "WEBDL"] - - name: replace - args: ["HDTVRip", "HDTV"] - details: - selector: div.movie-item__desc > a - attribute: href - download: - selector: div.movie-item__desc > a - attribute: href - poster: - selector: img - attribute: src - size: - text: "512 MB" - seeders: - text: 1 - leechers: - text: 1 - date: - selector: div.movie-item__meta > span:nth-child(2) - filters: - # 5-03-2021, 21:59 - - name: replace - args: [",", ""] - - name: append - args: " +03:00" # MSK - - name: dateparse - args: "2-01-2006 15:04 -07:00" - downloadvolumefactor: - text: 0 - uploadvolumefactor: - text: 1 -# DataLife diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs index 340a5dedd..e729a9f02 100644 --- a/src/Jackett.Common/Services/IndexerManagerService.cs +++ b/src/Jackett.Common/Services/IndexerManagerService.cs @@ -43,7 +43,6 @@ namespace Jackett.Common.Services {"audiobooktorrents", "abtorrents"}, {"baibako", "rudub"}, {"broadcastthenet", "broadcasthenet"}, - {"hdreactor", "hdhouse"}, {"icetorrent", "speedapp"}, {"kickasstorrent-kathow", "kickasstorrents-ws"}, {"leaguehd", "lemonhd"}, diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 7d541256d..fcab56ec6 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -361,6 +361,7 @@ namespace Jackett.Updater "Definitions/hdbc.yml", // renamed to hdbitscom "Definitions/hdclub.yml", "Definitions/hddisk.yml", + "Definitions/hdhouse.yml", "Definitions/hdolimpo.yml", // migrated to UNIT3D API "Definitions/hdplus.yml", "Definitions/hdreactor.yml", // renamed to hdhouse