puntotorrent:: this completes the conform to yaml standards by avoiding duplicate keys. resolves #11917

at least as far as the visualstudio2019 yaml syntax checker is concerned.

src/Jackett.Common/Definitions/puntotorrent.yml

@@ -180,7 +180,88 @@ search:
         - name: querystring
           args: category
 
-    title: # Clean Title
+    remux: # Remux
+      selector: td:nth-child(2) a:contains("REMUX"),a:contains("Remux"),a:contains("remux")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".", ""]
+        - name: append
+          args: "Remux."
+
+    webdl: # WEBDL
+      selector: td:nth-child(2) a:contains("WEB"),a:contains("web"),a:contains("Web")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".", ""]
+        - name: append
+          args: "WEBDL."
+
+    hdtv: # HDTV
+      selector: td:nth-child(2) a:contains("HDTV"),a:contains("HDtv"),a:contains("hdtv")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".", ""]
+        - name: append
+          args: "HDTV."
+
+    dvd: # DVD
+      selector: td:nth-child(2) a:contains("DVD"),a:contains("dvd"),a:contains("Dvd")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".", ""]
+        - name: append
+          args: "DVD.Spanish-PuntoTorrent"
+
+    bluray: # BluRay
+      selector: td:nth-child(2) a:not(:contains("HDTV"))a:not(:contains("hdtv"))a:not(:contains("REMUX"))a:not(:contains("Remux"))a:not(:contains("remux"))a:not(:contains("WEB"))a:not(:contains("web"))a:not(:contains("Web"))a:contains("1080"),:contains("2160"):contains("uhd")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".", ""]
+        - name: append
+          args: "BluRay."
+
+    2160p: # 2160p
+      selector: td:nth-child(2) a:contains("2160"),a:contains("4k"),a:contains("4K"),a:contains("uhd"),a:contains("UHD")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".", ""]
+        - name: append
+          args: "2160p.Spanish-PuntoTorrent"
+
+    1080p: # 1080p
+      selector: td:nth-child(2) a:contains("1080"),a:contains("microhd"),a:contains("mhd"),a:contains("BDRemux"):not(:contains("2160"))
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".", ""]
+        - name: append
+          args: "1080p.Spanish-PuntoTorrent"
+
+    720p: # 720p
+      selector: td:nth-child(2) a:contains("720")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".", ""]
+        - name: append
+          args: "720p.Spanish-PuntoTorrent"
+
+    480p: # 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: "480p.Spanish-PuntoTorrent"
+
+    title_default: # Clean Title
       selector: td:nth-child(2)
       optional: true
       filters:
@@ -212,89 +293,10 @@ search:
           args: ["\\.+", "."] # More than 1 dot -> .
         - name: re_replace
           args: ["^\\.", ""] # Delete first dot
-
-    title|append: # Remux
-      selector: td:nth-child(2) a:contains("REMUX"),a:contains("Remux"),a:contains("remux")
-      optional: true
-      filters:
-        - name: re_replace
-          args: [".", ""]
         - name: append
-          args: "Remux."
+          args: " {{ .Result.remux }}{{ .Result.webdl }}{{ .Result.hdtv }}{{ .Result.dvd }}{{ .Result.bluray }}{{ .Result.2160p }}{{ .Result.1080p }}{{ .Result.720p }}{{ .Result.480p }}"
 
-    title|append: # WEBDL
-      selector: td:nth-child(2) a:contains("WEB"),a:contains("web"),a:contains("Web")
-      optional: true
-      filters:
-        - name: re_replace
-          args: [".", ""]
-        - name: append
-          args: "WEBDL."
-
-    title|append: # HDTV
-      selector: td:nth-child(2) a:contains("HDTV"),a:contains("HDtv"),a:contains("hdtv")
-      optional: true
-      filters:
-        - name: re_replace
-          args: [".", ""]
-        - name: append
-          args: "HDTV."
-
-    title|append: # DVD
-      selector: td:nth-child(2) a:contains("DVD"),a:contains("dvd"),a:contains("Dvd")
-      optional: true
-      filters:
-        - name: re_replace
-          args: [".", ""]
-        - name: append
-          args: "DVD.Spanish-PuntoTorrent"
-
-    title|append: # BluRay
-      selector: td:nth-child(2) a:not(:contains("HDTV"))a:not(:contains("hdtv"))a:not(:contains("REMUX"))a:not(:contains("Remux"))a:not(:contains("remux"))a:not(:contains("WEB"))a:not(:contains("web"))a:not(:contains("Web"))a:contains("1080"),:contains("2160"):contains("uhd")
-      optional: true
-      filters:
-        - name: re_replace
-          args: [".", ""]
-        - name: append
-          args: "BluRay."
-
-    title|append: # 2160p
-      selector: td:nth-child(2) a:contains("2160"),a:contains("4k"),a:contains("4K"),a:contains("uhd"),a:contains("UHD")
-      optional: true
-      filters:
-        - name: re_replace
-          args: [".", ""]
-        - name: append
-          args: "2160p.Spanish-PuntoTorrent"
-
-    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:
-        - name: re_replace
-          args: [".", ""]
-        - name: append
-          args: "1080p.Spanish-PuntoTorrent"
-
-    title|append: # 720p
-      selector: td:nth-child(2) a:contains("720")
-      optional: true
-      filters:
-        - name: re_replace
-          args: [".", ""]
-        - name: append
-          args: "720p.Spanish-PuntoTorrent"
-
-    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: "480p.Spanish-PuntoTorrent"
-
-    title:
+    title_vose:
       selector: td:nth-child(2) a:contains("VOSE")
       optional: true
       filters:
@@ -310,6 +312,12 @@ search:
           args: ["(?i)(\\d{1,2})(ª|\\D)?\\s?\\w*Temp\\w*\\b", " S$1 "]
         - name: re_replace
           args: ["(?i)(\\d{1,2})[x|\\/|\\\\](\\d{1,2})", "S$1E$2"]
+        - name: append
+          args: " {{ .Result.remux }}{{ .Result.webdl }}{{ .Result.hdtv }}{{ .Result.dvd }}{{ .Result.bluray }}{{ .Result.2160p }}{{ .Result.1080p }}{{ .Result.720p }}{{ .Result.480p }}"
+
+    title:
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_default }}{{ end }}"
+
     details:
       selector: a[href^="download.php"]
       attribute: href