From ff83bc2785b5f34c13bcc3b2b61f6a21abd5ec91 Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Mon, 26 Oct 2020 15:29:40 +1300
Subject: [PATCH] kickasstorrent-kathow: code tidy and

---
 README.md                                     |  2 +-
 .../Definitions/kickasstorrent-kathow.yml     | 29 ++++++++++---------
 .../Definitions/kickasstorrents-to.yml        |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 0ec2a4a38..3b50b4f35 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
- * KickAssTorrent (kat.li)
  * KickAssTorrent (KATcr)
+ * kickasstorrents (kickass.ws)
  * kickasstorrents.to
  * Legit Torrents
  * LePorno.info
diff --git a/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml b/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml
index 21776bdf0..2af05df40 100644
--- a/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml
@@ -1,7 +1,7 @@
 ---
 id: kickasstorrent-kathow
-name: KickAssTorrent (kat.li)
-description: "kat.li is a Public KickAssTorrent clone for TV / MOVIES / GENERAL"
+name: kickasstorrents (kickass.ws)
+description: "kickasstorrents (kickass.ws) is a Public KickAssTorrent clone for TV / MOVIES / GENERAL"
 language: en-us
 type: public
 encoding: UTF-8
@@ -28,18 +28,18 @@ legacylinks:
 
 caps:
   categories:
-    movies: Movies
-    tv: TV
-    music: Audio
+    applications: PC
     books: Books
     games: Console
-    applications: PC
-    xxx: XXX
+    movies: Movies
+    music: Audio
     other: Other
+    tv: TV
+    xxx: XXX
     # additional from proxy
-    video: TV # Movies
-    porn: XXX
     audio: Audio
+    porn: XXX
+    video: TV # Movies
 
   modes:
     search: [q]
@@ -65,13 +65,12 @@ settings:
       desc: desc
       asc: asc
 
-
 search:
   paths:
-    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{else}}new/{{end}}?field={{ .Config.sort }}&sorder={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}?field={{ .Config.sort }}&sorder={{ .Config.type }}"
 
   rows:
-    selector: table[class="data"] tr[id]
+    selector: table.data tr[id]
 
   fields:
     category:
@@ -92,9 +91,9 @@ search:
         - name: replace
           args: ["Video", "movies"]
     title:
-      selector: td:nth-child(1) > div > div > a[class="cellMainLink"]
+      selector: a[class="cellMainLink"]
     details:
-      selector: td:nth-child(1) > div > div > a[class="cellMainLink"]
+      selector: a[class="cellMainLink"]
       attribute: href
     download:
       optional: true
@@ -118,6 +117,8 @@ search:
           args: ["[.](?=.*[.])", ""]
     date:
       selector: td:nth-child(3)
+      filters:
+        - name: timeago
     seeders:
       selector: td:nth-child(4)
       filters:
diff --git a/src/Jackett.Common/Definitions/kickasstorrents-to.yml b/src/Jackett.Common/Definitions/kickasstorrents-to.yml
index 03cd9a8a4..895b06eb8 100644
--- a/src/Jackett.Common/Definitions/kickasstorrents-to.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrents-to.yml
@@ -51,7 +51,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{else}}new/{{end}}?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
 
   rows:
     selector: table.data tr.odd, table.data tr.even