diff --git a/src/Jackett.Common/Definitions/noname-club.yml b/src/Jackett.Common/Definitions/noname-club.yml index 8907e8b11..eb32c7f70 100644 --- a/src/Jackett.Common/Definitions/noname-club.yml +++ b/src/Jackett.Common/Definitions/noname-club.yml @@ -802,11 +802,15 @@ search: - name: replace args: ["Невафильм", "Nevafilm"] - name: re_replace - args: ["(\\(((?:[12][0-9]{3})(?:-(?:[12][0-9]{3}))?)\\)(.+)\\([Сс]езоны?\\s+((?:\\d+)(?:-\\d+)?).+[Сс]ери[ия]\\s+(?:(\\d+-*\\d*).*\\d+)\\))", " - S$4E$5 - $3"] + args: ["((\\((?:[12][0-9]{3}-?){1,}\\))(.+)\\([Сс]езоны?\\s+(\\d+-*\\d*).+(?:[Сс]ери[йия]|[Вв]ыпуски?(?:ов)?)\\s+(?:(\\d+-*\\d*).*?[\\?\\d]*)\\))", "- S$4E$5 - $2 $3"] - name: re_replace - args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"] - - name: replace - args: [" / ", " "] + args: ["((\\((?:[12][0-9]{3}-?){1,}\\))(.+)\\((?:[Сс]ери[йия]|[Вв]ыпуски?(?:ов)?)\\s+(?:(\\d+-*\\d*).*?[\\?\\d]*)\\))", "- E$4 $2 $3"] + - name: re_replace + args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"] + - name: re_replace + args: ["[\"«»=!?:|\\/]", " "] + - name: re_replace + args: ["^[-\\s]*", " "] - name: replace args: ["-Rip", "Rip"] - name: replace diff --git a/src/Jackett.Common/Definitions/noname-clubl.yml b/src/Jackett.Common/Definitions/noname-clubl.yml index 3c98b541b..f3b06c2f9 100644 --- a/src/Jackett.Common/Definitions/noname-clubl.yml +++ b/src/Jackett.Common/Definitions/noname-clubl.yml @@ -827,11 +827,15 @@ search: - name: replace args: ["Невафильм", "Nevafilm"] - name: re_replace - args: ["(\\(((?:[12][0-9]{3})(?:-(?:[12][0-9]{3}))?)\\)(.+)\\([Сс]езоны?\\s+((?:\\d+)(?:-\\d+)?).+[Сс]ери[ия]\\s+(?:(\\d+-*\\d*).*\\d+)\\))", " - S$4E$5 - $3"] + args: ["((\\((?:[12][0-9]{3}-?){1,}\\))(.+)\\([Сс]езоны?\\s+(\\d+-*\\d*).+(?:[Сс]ери[йия]|[Вв]ыпуски?(?:ов)?)\\s+(?:(\\d+-*\\d*).*?[\\?\\d]*)\\))", "- S$4E$5 - $2 $3"] - name: re_replace - args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"] - - name: replace - args: [" / ", " "] + args: ["((\\((?:[12][0-9]{3}-?){1,}\\))(.+)\\((?:[Сс]ери[йия]|[Вв]ыпуски?(?:ов)?)\\s+(?:(\\d+-*\\d*).*?[\\?\\d]*)\\))", "- E$4 $2 $3"] + - name: re_replace + args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"] + - name: re_replace + args: ["[\"«»=!?:|\\/]", " "] + - name: re_replace + args: ["^[-\\s]*", " "] - name: replace args: ["-Rip", "Rip"] - name: replace