From 964803d1708ac00c74616cf9a18d9529165e8ad8 Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Wed, 1 Apr 2020 20:10:32 +1300
Subject: [PATCH] assorted: refresh missing cat handling.

---
 src/Jackett.Common/Definitions/1337x.yml      |  2 ++
 .../Definitions/estrenosdtl.yml               | 27 +++++++++++--------
 src/Jackett.Common/Definitions/ettv.yml       |  8 ++----
 .../Definitions/extratorrent-cd.yml           |  6 ++---
 .../Definitions/frozenlayer.yml               |  4 +--
 src/Jackett.Common/Definitions/glodls.yml     |  8 ++----
 6 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/Jackett.Common/Definitions/1337x.yml b/src/Jackett.Common/Definitions/1337x.yml
index 0716d25d7..8b723d9c9 100644
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -174,6 +174,8 @@
           - name: replace
             args: ["\u000f", ""] # get rid of unwanted character
       category:
+        text: 40
+      category|noappend:
         optional: true
         selector:  td[class^="coll-1"] a[href^="/sub/"]
         attribute: href
diff --git a/src/Jackett.Common/Definitions/estrenosdtl.yml b/src/Jackett.Common/Definitions/estrenosdtl.yml
index 01d08bca3..29030d4f3 100644
--- a/src/Jackett.Common/Definitions/estrenosdtl.yml
+++ b/src/Jackett.Common/Definitions/estrenosdtl.yml
@@ -10,30 +10,31 @@
 
   caps:
     categories:
-      "1080p": Movies/HD
-      "720p": Movies/HD
+      "1080P": Movies/HD
+      "720P": Movies/HD
       "BR-RIP": Movies/BluRay
       "BR-SCREENER": Movies/Other
-      "DVDRip": Movies/DVD
-      "DVDScreener": Movies/Other
-      "HC HDRip": Movies/HD
+      "DVDRIP": Movies/DVD
+      "DVDSCREENER": Movies/Other
+      "HC HDRIP": Movies/HD
       "HD-RIP": Movies/HD
       "HD-TC": Movies/HD
       "HD-TS": Movies/HD
-      "HDRip": Movies/HD
+      "HDRIP": Movies/HD
       "HDTC-SCREENER": Movies/Other
       "HDTV-SCREENER": Movies/Other
       "HQ-TC": Movies
       "MKV": Movies
-      "TeleCine": Movies
+      "TELECINE": Movies
       "TS-HQ": Movies
-      "TS-Screener": Movies/Other
-      "V.O. Subtituladas": Movies
-      "VHS-Screener": Movies/Other
+      "TS-SCREENER": Movies/Other
+      "V.O. SUBTITULADAS": Movies
+      "VHS-SCREENER": Movies/Other
       "Web DL": Movies/WEBDL
       "WEB-RIP": Movies/WEBDL
-      "WEB-Screener": Movies/Other
+      "WEB-SCREENER": Movies/Other
       "WEB-SCREENER HC": Movies/Other
+      "NOCAT": Movies/Other
 
     modes:
       search: [q]
@@ -65,8 +66,12 @@
         selector: div.nombre_big1 a
         attribute: href
       category:
+        text: NOCAT
+      category|noappend:
         selector: div.nombre_big1 p b
         optional: true
+        filters:
+          - name: toupper
       download:
         selector: div.nombre_big1 a
         attribute: href
diff --git a/src/Jackett.Common/Definitions/ettv.yml b/src/Jackett.Common/Definitions/ettv.yml
index 520c709c2..66e825ae2 100644
--- a/src/Jackett.Common/Definitions/ettv.yml
+++ b/src/Jackett.Common/Definitions/ettv.yml
@@ -135,12 +135,8 @@
           - name: re_replace
             args: ["( torrent)$", ""]
       category:
-        optional: true
-        selector: td:nth-child(1):contains("-")
-        filters:
-          - name: replace #7110 provide default for missing category
-            args: ["-", "78"]
-      category:
+        text: 78 #7110
+      category|noappend:
         optional: true
         selector: a[href^="/torrents.php?cat="]
         attribute: href
diff --git a/src/Jackett.Common/Definitions/extratorrent-cd.yml b/src/Jackett.Common/Definitions/extratorrent-cd.yml
index a480b5b67..ae6a59aac 100644
--- a/src/Jackett.Common/Definitions/extratorrent-cd.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-cd.yml
@@ -948,11 +948,11 @@
 
     fields:
       category:
-        selector:  a[href*="/category/"], a[href="#"]
+        text: 9 #7108
+      category|noappend:
+        selector:  a[href*="/category/"]
         attribute: href
         filters:
-          - name: replace #7108 provide default for missing category
-            args: ["#", "/category/9/"]
           - name: regexp
             args: "/category/(\\d+)/"
       title:
diff --git a/src/Jackett.Common/Definitions/frozenlayer.yml b/src/Jackett.Common/Definitions/frozenlayer.yml
index 898085703..a3143f48e 100644
--- a/src/Jackett.Common/Definitions/frozenlayer.yml
+++ b/src/Jackett.Common/Definitions/frozenlayer.yml
@@ -93,12 +93,12 @@
         attribute: href
       category:
         text: Anime
-      category:
+      category|noappend:
         optional: true
         selector: td.tit span
       date:
         # 1d
-        # 2d 
+        # 2d
         # 1d 3h
         # 3 dias
         # 3h 14m
diff --git a/src/Jackett.Common/Definitions/glodls.yml b/src/Jackett.Common/Definitions/glodls.yml
index 9cf9e2521..40786b0fe 100644
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -87,12 +87,8 @@
 
     fields:
       category:
-        optional: true
-        selector: td:nth-child(1):contains("-")
-        filters:
-          - name: replace #7113 provide default for missing category
-            args: ["-", "33"]
-      category:
+        text: 33 #7113
+      category|noappend:
         optional: true
         selector: a[href^="/search.php?cat="]
         attribute: href