divteam, hachede, mejortorrent, puntotorrent, torrentland, vizuk, zonaq: improve radarr search (#10148)

This commit is contained in:
Diego Heras 2020-11-09 02:20:15 +01:00 committed by GitHub
parent bfb9baee77
commit 32f0006680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 8 deletions

View File

@ -139,6 +139,8 @@ search:
args: ["\\.+", "."] # More than 1 dot -> . args: ["\\.+", "."] # More than 1 dot -> .
- name: re_replace - name: re_replace
args: ["^\\.", ""] # Delete first dot args: ["^\\.", ""] # Delete first dot
- name: re_replace
args: ["UHDRip", "BDRip"] # Fix for Radarr
poster: poster:
selector: a[onmouseover][href^="index.php?page=torrent-details"] selector: a[onmouseover][href^="index.php?page=torrent-details"]
attribute: onmouseover attribute: onmouseover

View File

@ -183,6 +183,12 @@ search:
args: ["\\.+", "."] # More than 1 dot -> . args: ["\\.+", "."] # More than 1 dot -> .
- name: re_replace - name: re_replace
args: ["^\\.", ""] # Delete first dot 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: details:
selector: td.torrent_name > a, .newIndicator > a selector: td.torrent_name > a, .newIndicator > a
attribute: href attribute: href

View File

@ -260,7 +260,7 @@ search:
- name: append - name: append
args: "2160p.Spanish-PuntoTorrent" 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")) selector: td:nth-child(2) a:contains("1080"),a:contains("microhd"),a:contains("mhd"),a:contains("BDRemux"):not(:contains("2160"))
optional: true optional: true
filters: filters:
@ -269,7 +269,7 @@ search:
- name: append - name: append
args: "1080p.Spanish-PuntoTorrent" args: "1080p.Spanish-PuntoTorrent"
title|append: # 720 title|append: # 720p
selector: td:nth-child(2) a:contains("720") selector: td:nth-child(2) a:contains("720")
optional: true optional: true
filters: filters:
@ -278,14 +278,14 @@ search:
- name: append - name: append
args: "720p.Spanish-PuntoTorrent" args: "720p.Spanish-PuntoTorrent"
title|append: # 480 title|append: # 480p
selector: td:nth-child(2) a:contains("Xvid"),a:contains("XVID"),a:contains("xvid") selector: td:nth-child(2) a:contains("480"),a:contains("Xvid"),a:contains("XVID"),a:contains("xvid")
optional: true optional: true
filters: filters:
- name: re_replace - name: re_replace
args: [".", ""] args: [".", ""]
- name: append - name: append
args: "480.Spanish-PuntoTorrent" args: "480p.Spanish-PuntoTorrent"
title: title:
selector: td:nth-child(2) a:contains("VOSE") selector: td:nth-child(2) a:contains("VOSE")

View File

@ -170,16 +170,20 @@ search:
filters: filters:
- name: re_replace - name: re_replace
args: ["(?i)\\bT(\\d+)", "S$1"] args: ["(?i)\\bT(\\d+)", "S$1"]
- name: re_replace
args: ["UHDRip", "BDRip"] # Fix for Radarr
- name: append - name: append
args: " [English]" args: " ENGLiSH"
title: title:
selector: td:nth-child(2) a:not(:contains("VOSE")) selector: td:nth-child(2) a:not(:contains("VOSE"))
optional: true optional: true
filters: filters:
- name: re_replace - name: re_replace
args: ["(?i)\\bT(\\d+)", "S$1"] args: ["(?i)\\bT(\\d+)", "S$1"]
- name: re_replace
args: ["UHDRip", "BDRip"] # Fix for Radarr
- name: append - name: append
args: " [Spanish]" args: " SPANiSH"
poster: poster:
optional: true optional: true
selector: td:nth-child(2) a selector: td:nth-child(2) a

View File

@ -127,6 +127,8 @@ search:
keywordsfilters: keywordsfilters:
- name: re_replace - name: re_replace
args: ["S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"] 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: inputs:
p: torrents p: torrents
page: 1 page: 1
@ -152,7 +154,7 @@ search:
selector: td.torrent_name > a, .newIndicator > a selector: td.torrent_name > a, .newIndicator > a
filters: filters:
- name: append - name: append
args: " [spanish]" args: " SPANiSH"
details: details:
selector: td.torrent_name > a, .newIndicator > a selector: td.torrent_name > a, .newIndicator > a
attribute: href attribute: href

View File

@ -344,6 +344,7 @@ namespace Jackett.Common.Indexers
if (queryMatch.Success) if (queryMatch.Success)
quality = queryMatch.Groups[1].Value; quality = queryMatch.Groups[1].Value;
quality = quality.Trim().Replace("-", " "); quality = quality.Trim().Replace("-", " ");
quality = Regex.Replace(quality, "HDRip", "BDRip", RegexOptions.IgnoreCase); // fix for Radarr
} }
// add the year // add the year

View File

@ -6,6 +6,7 @@ using System.Globalization;
using System.Linq; using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using AngleSharp.Html.Parser; using AngleSharp.Html.Parser;
@ -178,6 +179,9 @@ namespace Jackett.Common.Indexers
continue; continue;
var title = qTitleLink.TextContent.Trim(); var title = qTitleLink.TextContent.Trim();
title += " SPANiSH"; // fix for Radarr
title = Regex.Replace(title, "4k", "2160p", RegexOptions.IgnoreCase);
var detailsStr = qTitleLink.GetAttribute("href"); var detailsStr = qTitleLink.GetAttribute("href");
var details = new Uri(detailsStr); var details = new Uri(detailsStr);
var link = new Uri(detailsStr.Replace("/index.php?page=torrent-details&", "/download.php?")); var link = new Uri(detailsStr.Replace("/index.php?page=torrent-details&", "/download.php?"));