From 32f0006680289673272d84c5cebdf7c00b8d54ee Mon Sep 17 00:00:00 2001 From: Diego Heras Date: Mon, 9 Nov 2020 02:20:15 +0100 Subject: [PATCH] divteam, hachede, mejortorrent, puntotorrent, torrentland, vizuk, zonaq: improve radarr search (#10148) --- src/Jackett.Common/Definitions/divteam.yml | 2 ++ src/Jackett.Common/Definitions/hachede.yml | 6 ++++++ src/Jackett.Common/Definitions/puntotorrent.yml | 10 +++++----- src/Jackett.Common/Definitions/torrentland.yml | 8 ++++++-- src/Jackett.Common/Definitions/vizuk.yml | 4 +++- src/Jackett.Common/Indexers/MejorTorrent.cs | 1 + src/Jackett.Common/Indexers/ZonaQ.cs | 4 ++++ 7 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/Jackett.Common/Definitions/divteam.yml b/src/Jackett.Common/Definitions/divteam.yml index 95b6b9005..e2e598258 100644 --- a/src/Jackett.Common/Definitions/divteam.yml +++ b/src/Jackett.Common/Definitions/divteam.yml @@ -139,6 +139,8 @@ search: args: ["\\.+", "."] # More than 1 dot -> . - name: re_replace args: ["^\\.", ""] # Delete first dot + - name: re_replace + args: ["UHDRip", "BDRip"] # Fix for Radarr poster: selector: a[onmouseover][href^="index.php?page=torrent-details"] attribute: onmouseover diff --git a/src/Jackett.Common/Definitions/hachede.yml b/src/Jackett.Common/Definitions/hachede.yml index ee3151cfc..87f1d53f0 100644 --- a/src/Jackett.Common/Definitions/hachede.yml +++ b/src/Jackett.Common/Definitions/hachede.yml @@ -183,6 +183,12 @@ search: args: ["\\.+", "."] # More than 1 dot -> . - name: re_replace args: ["^\\.", ""] # Delete first dot + - name: re_replace + args: [".BR.", ".BDRip."] # Fix for Radarr + - name: re_replace + args: ["(?i)m720p", "MicroHD.720p"] # Fix for Radarr + - name: re_replace + args: ["(?i)m1080p", "MicroHD.1080p"] # Fix for Radarr details: selector: td.torrent_name > a, .newIndicator > a attribute: href diff --git a/src/Jackett.Common/Definitions/puntotorrent.yml b/src/Jackett.Common/Definitions/puntotorrent.yml index 3ec541cb3..7ddf09a65 100644 --- a/src/Jackett.Common/Definitions/puntotorrent.yml +++ b/src/Jackett.Common/Definitions/puntotorrent.yml @@ -260,7 +260,7 @@ search: - name: append args: "2160p.Spanish-PuntoTorrent" - title|append: # 1080 + title|append: # 1080p selector: td:nth-child(2) a:contains("1080"),a:contains("microhd"),a:contains("mhd"),a:contains("BDRemux"):not(:contains("2160")) optional: true filters: @@ -269,7 +269,7 @@ search: - name: append args: "1080p.Spanish-PuntoTorrent" - title|append: # 720 + title|append: # 720p selector: td:nth-child(2) a:contains("720") optional: true filters: @@ -278,14 +278,14 @@ search: - name: append args: "720p.Spanish-PuntoTorrent" - title|append: # 480 - selector: td:nth-child(2) a:contains("Xvid"),a:contains("XVID"),a:contains("xvid") + title|append: # 480p + selector: td:nth-child(2) a:contains("480"),a:contains("Xvid"),a:contains("XVID"),a:contains("xvid") optional: true filters: - name: re_replace args: [".", ""] - name: append - args: "480.Spanish-PuntoTorrent" + args: "480p.Spanish-PuntoTorrent" title: selector: td:nth-child(2) a:contains("VOSE") diff --git a/src/Jackett.Common/Definitions/torrentland.yml b/src/Jackett.Common/Definitions/torrentland.yml index d20272922..e5cfef85f 100644 --- a/src/Jackett.Common/Definitions/torrentland.yml +++ b/src/Jackett.Common/Definitions/torrentland.yml @@ -170,16 +170,20 @@ search: filters: - name: re_replace args: ["(?i)\\bT(\\d+)", "S$1"] + - name: re_replace + args: ["UHDRip", "BDRip"] # Fix for Radarr - name: append - args: " [English]" + args: " ENGLiSH" title: selector: td:nth-child(2) a:not(:contains("VOSE")) optional: true filters: - name: re_replace args: ["(?i)\\bT(\\d+)", "S$1"] + - name: re_replace + args: ["UHDRip", "BDRip"] # Fix for Radarr - name: append - args: " [Spanish]" + args: " SPANiSH" poster: optional: true selector: td:nth-child(2) a diff --git a/src/Jackett.Common/Definitions/vizuk.yml b/src/Jackett.Common/Definitions/vizuk.yml index 2935df487..3158d1c49 100644 --- a/src/Jackett.Common/Definitions/vizuk.yml +++ b/src/Jackett.Common/Definitions/vizuk.yml @@ -127,6 +127,8 @@ search: keywordsfilters: - name: re_replace args: ["S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"] + - name: re_replace + args: ["\\s*(19|20)\\d{2}$", ""] # Fix for Radarr. Remove the year inputs: p: torrents page: 1 @@ -152,7 +154,7 @@ search: selector: td.torrent_name > a, .newIndicator > a filters: - name: append - args: " [spanish]" + args: " SPANiSH" details: selector: td.torrent_name > a, .newIndicator > a attribute: href diff --git a/src/Jackett.Common/Indexers/MejorTorrent.cs b/src/Jackett.Common/Indexers/MejorTorrent.cs index de334ba1c..8d91c41a9 100644 --- a/src/Jackett.Common/Indexers/MejorTorrent.cs +++ b/src/Jackett.Common/Indexers/MejorTorrent.cs @@ -344,6 +344,7 @@ namespace Jackett.Common.Indexers if (queryMatch.Success) quality = queryMatch.Groups[1].Value; quality = quality.Trim().Replace("-", " "); + quality = Regex.Replace(quality, "HDRip", "BDRip", RegexOptions.IgnoreCase); // fix for Radarr } // add the year diff --git a/src/Jackett.Common/Indexers/ZonaQ.cs b/src/Jackett.Common/Indexers/ZonaQ.cs index 2ea1b6632..fa465442a 100644 --- a/src/Jackett.Common/Indexers/ZonaQ.cs +++ b/src/Jackett.Common/Indexers/ZonaQ.cs @@ -6,6 +6,7 @@ using System.Globalization; using System.Linq; using System.Security.Cryptography; using System.Text; +using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using AngleSharp.Html.Parser; @@ -178,6 +179,9 @@ namespace Jackett.Common.Indexers continue; var title = qTitleLink.TextContent.Trim(); + title += " SPANiSH"; // fix for Radarr + title = Regex.Replace(title, "4k", "2160p", RegexOptions.IgnoreCase); + var detailsStr = qTitleLink.GetAttribute("href"); var details = new Uri(detailsStr); var link = new Uri(detailsStr.Replace("/index.php?page=torrent-details&", "/download.php?"));