From 2b38fcc82afca21e3ce60f0b4d99eb329058f444 Mon Sep 17 00:00:00 2001 From: Ilya Pavlov Date: Wed, 20 Apr 2022 05:44:58 +0300 Subject: [PATCH] riperam: update title filters (#13181) --- src/Jackett.Common/Definitions/riperam.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Jackett.Common/Definitions/riperam.yml b/src/Jackett.Common/Definitions/riperam.yml index d8401d1e9..1b23789ed 100644 --- a/src/Jackett.Common/Definitions/riperam.yml +++ b/src/Jackett.Common/Definitions/riperam.yml @@ -922,6 +922,9 @@ search: filters: - name: querystring args: f + categorydesc|noappend: + selector: dt a:last-of-type + optional: true title: selector: a.topictitle filters: @@ -937,21 +940,21 @@ search: args: ["Невафильм", "Nevafilm"] - name: replace args: ["Лицензия", "Lic"] - - name: replace - args: ["селезень", "selezen"] # normalize to SXXEYY format - name: re_replace - args: ["((?:\\d+)(?:-\\d+)?)\\s+[CСcс]езоны?[,:]?\\s+((?:\\d+)(?:-\\d+)?)\\s+[CСcс]ери[ия].*?\\d+(.*)\\[((?:[12][0-9]{3})(?:-(?:[12][0-9]{3}))?)(.*)", "$3 - S$1E$2 - $4 $5"] + args: ["(\\d+-*\\d*)\\s+[CСcс]езоны?[,:]?\\s+(\\d+-*\\d*)\\s+(?:[CСcс]ери[йия]|[Вв]ыпуски?(?:ов)?)(?:.*?\\d+)?(.*)\\[((?:[12][0-9]{3}-?){1,})(.*)", "$3 - S$1E$2 - $4 $5"] - name: re_replace - args: ["(.*)?[CСcс]езоны?:?\\s+((?:\\d+)(?:-\\d+)?).*[CСcс]ери[ия]\\s+((?:\\d+)(?:-\\d+)?).*?\\d+(.*)\\[((?:[12][0-9]{3})(?:-(?:[12][0-9]{3}))?)(.*)", "$1 $4 - S$2E$3 - $5 $6"] + args: ["(.*)[CСcс]езоны?[,:]?\\s+(\\d+-*\\d*).*(?:[CСcс]ери[йия]|[Вв]ыпуски?(?:ов)?)\\s+(\\d+-*\\d*)(?:.*?\\d+)?(.*)\\[((?:[12][0-9]{3}-?){1,})(.*)", "$1 $4 - S$2E$3 - $5 $6"] - name: re_replace - args: ["(((?:\\d+)(?:-\\d+)?)\\s+[CСcс]ери[ия].*?\\d+)", "E$2 - "] + args: ["((\\d+-*\\d*)\\s+(?:[CСcс]ери[йия]|[Вв]ыпуски?(?:ов)?)(?:.*?\\d+))", "E$2 - "] - name: re_replace - args: ["([CСcс]ери[ия]\\s+((?:\\d+)(?:-\\d+)?).*?\\d+)", "E$2 - "] + args: ["((?:[CСcс]ери[йия]|[Вв]ыпуски?(?:ов)?)\\s+(\\d+-*\\d*)(?:.*?\\d+))", "E$2 - "] - name: re_replace - args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"] + args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"] - name: re_replace - args: ["[«»()=.,:|\\[\\]\\/]", " "] + args: ["[\"«»()=!?.,:|\\[\\]\\/]", " "] + - name: re_replace + args: ["^[-\\s]*", " "] - name: append args: "{{ if .Config.addrussian }} - RUSSIAN{{ else }}{{ end }}" - name: replace