From bdb4f053210e7b3ec66d967e9a062adab041102d Mon Sep 17 00:00:00 2001 From: Florian Fish Date: Sat, 1 Apr 2023 01:05:11 +0200 Subject: [PATCH] yggtorrent: replace french date dd-mm-yyyy to yyyy.mm.dd (#14199) Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com> --- src/Jackett.Common/Definitions/yggcookie.yml | 19 ++++++------------- src/Jackett.Common/Definitions/yggtorrent.yml | 19 ++++++------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/src/Jackett.Common/Definitions/yggcookie.yml b/src/Jackett.Common/Definitions/yggcookie.yml index f7be46fe5..21bc1f94b 100644 --- a/src/Jackett.Common/Definitions/yggcookie.yml +++ b/src/Jackett.Common/Definitions/yggcookie.yml @@ -214,19 +214,9 @@ search: - name: re_replace # episode number at the end "123" to "E123" args: ["(.*)(\\.|\\s|\\-)(\\d{2,3})(\\.|\\s|\\-*)(.*)", "{{ if .Config.enhancedAnime }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"] # END ANIME HACK - - name: replace - args: ["\"", ""] - # Replace - with space due to internal YGG Issues - - name: replace - args: ["-", " "] - # Replace / with space due to internal YGG Issues - - name: replace - args: ["/", " "] - # Replace ! with nothing for searches due to internal YGG issues reported on Radarr Discord - - name: replace - args: ["!", ""] - - name: replace - args: [" ", " "] + # fix date search and workaround for internal YGG Issues + - name: re_replace + args: ["[\\\\\\-\\.\\/!\\s]+", " "] - name: trim # put each word in quotations to prevent exact phrase search - name: re_replace @@ -271,6 +261,9 @@ search: args: ["(?i)\\b(saison\\s*)\\b([1-9])", "S0$2"] - name: re_replace args: ["(?i)\\b(saison\\s*)\\b(\\d{1,4})", "S$2"] + # Replace French date dd-mm-yyyy to yyyy.mm.dd + - name: re_replace + args: ["(\\d{2})[\\-_\\.](\\d{2})[\\-_\\.](\\d{4})", "$3.$2.$1"] title_filtered: text: "{{ .Result.title_normal }}" filters: diff --git a/src/Jackett.Common/Definitions/yggtorrent.yml b/src/Jackett.Common/Definitions/yggtorrent.yml index 9edc36e9e..96ab8bee8 100644 --- a/src/Jackett.Common/Definitions/yggtorrent.yml +++ b/src/Jackett.Common/Definitions/yggtorrent.yml @@ -224,19 +224,9 @@ search: - name: re_replace # episode number at the end "123" to "E123" args: ["(.*)(\\.|\\s|\\-)(\\d{2,3})(\\.|\\s|\\-*)(.*)", "{{ if .Config.enhancedAnime }}$1 E$3 $5{{ else }}$1$2$3$4$5{{ end }}"] # END ANIME HACK - - name: replace - args: ["\"", ""] - # Replace - with space due to internal YGG Issues - - name: replace - args: ["-", " "] - # Replace / with space due to internal YGG Issues - - name: replace - args: ["/", " "] - # Replace ! with nothing for searches due to internal YGG issues reported on Radarr Discord - - name: replace - args: ["!", ""] - - name: replace - args: [" ", " "] + # fix date search and workaround for internal YGG Issues + - name: re_replace + args: ["[\\\\\\-\\.\\/!\\s]+", " "] - name: trim # put each word in quotations to prevent exact phrase search - name: re_replace @@ -278,6 +268,9 @@ search: args: ["(?i)\\b(saison\\s*)\\b([1-9])", "S0$2"] - name: re_replace args: ["(?i)\\b(saison\\s*)\\b(\\d{1,4})", "S$2"] + # Replace French date dd-mm-yyyy to yyyy.mm.dd + - name: re_replace + args: ["(\\d{2})[\\-_\\.](\\d{2})[\\-_\\.](\\d{4})", "$3.$2.$1"] title_filtered: text: "{{ .Result.title_normal }}" filters: