From fa1cedb49d44f1f1b75be7ca0b5d637062039bed Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Sun, 19 Jan 2020 10:05:52 +1300
Subject: [PATCH] engine tags. #6822

---
 .../Definitions/kickasstorrent-kathow.yml       |  3 ++-
 .../Definitions/kickasstorrent.yml              |  9 ++++++---
 src/Jackett.Common/Definitions/kinozal.yml      |  1 +
 src/Jackett.Common/Definitions/leporno.yml      |  1 +
 src/Jackett.Common/Definitions/libranet.yml     | 11 ++++++-----
 src/Jackett.Common/Definitions/limetorrents.yml |  1 +
 src/Jackett.Common/Definitions/mactorrents.yml  | 11 ++++++-----
 src/Jackett.Common/Definitions/magnetdl.yml     |  3 ++-
 .../Definitions/marinetracker.yml               |  4 ++--
 src/Jackett.Common/Definitions/metaltracker.yml | 17 ++++++++++-------
 src/Jackett.Common/Definitions/moecat.yml       |  1 +
 src/Jackett.Common/Definitions/monova.yml       |  3 +++
 src/Jackett.Common/Definitions/movcr.yml        |  9 ++++++---
 src/Jackett.Common/Definitions/moviesdvdr.yml   |  1 +
 .../Definitions/muziekfabriek.yml               |  1 +
 src/Jackett.Common/Definitions/mvgroupforum.yml |  2 ++
 src/Jackett.Common/Definitions/mvgroupmain.yml  |  1 +
 17 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml b/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml
index 9687d81b2..f8cc19be6 100644
--- a/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrent-kathow.yml
@@ -55,6 +55,7 @@
 
     rows:
       selector: table[class="data"] tr[id]
+
     fields:
       category:
         optional: true
@@ -99,4 +100,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
-
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/kickasstorrent.yml b/src/Jackett.Common/Definitions/kickasstorrent.yml
index fe0f0e147..fbe4a4c30 100644
--- a/src/Jackett.Common/Definitions/kickasstorrent.yml
+++ b/src/Jackett.Common/Definitions/kickasstorrent.yml
@@ -91,11 +91,13 @@
 
   search:
     paths:
-      - path: "{{ if .Keywords }}katsearch/page/1/{{ .Keywords }}{{ else }}category/latest/page/1{{ end }}"
+      - path: "{{ if .Keywords }}katsearch/page/1/{{ .Keywords }}{{else}}category/latest/page/1{{end}}"
+
     rows:
       selector: table.torrents_table > tbody > tr
       filters:
         - name: andmatch
+
     fields:
       title:
         selector: a.torrents_table__torrent_title b
@@ -203,6 +205,7 @@
       leechers:
         selector: td[data-title="Leech"]
       downloadvolumefactor:
-        text: "0"
+        text: 0
       uploadvolumefactor:
-        text: "1"
+        text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/kinozal.yml b/src/Jackett.Common/Definitions/kinozal.yml
index 54b618677..c48f20d3a 100644
--- a/src/Jackett.Common/Definitions/kinozal.yml
+++ b/src/Jackett.Common/Definitions/kinozal.yml
@@ -221,3 +221,4 @@
           "*": 1
       uploadvolumefactor:
         text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/leporno.yml b/src/Jackett.Common/Definitions/leporno.yml
index 558a1bffe..38677b06a 100644
--- a/src/Jackett.Common/Definitions/leporno.yml
+++ b/src/Jackett.Common/Definitions/leporno.yml
@@ -102,3 +102,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/libranet.yml b/src/Jackett.Common/Definitions/libranet.yml
index e8ccf32e1..fde0c2c89 100644
--- a/src/Jackett.Common/Definitions/libranet.yml
+++ b/src/Jackett.Common/Definitions/libranet.yml
@@ -43,8 +43,8 @@
     # http://libranet.org/browse.php?cat56=1&cat57=1&search=&searchwhere=&subcat=&musicstyle=&format=
       - path: browse.php
     inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{.Keywords}}"
+      $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
       searchwhere: ""
       subcat: ""
       musicstyle: ""
@@ -52,6 +52,7 @@
 
     rows:
       selector: table.rounded tr:has(a[href^="browse.php?cat="])
+
     fields:
       category:
         selector: a[href^="browse.php?cat="]
@@ -101,7 +102,7 @@
       downloadvolumefactor:
         case:
           img[src$="/pic/freeleech.gif"]: 0
-          "*": "1"
+          "*": 1
       uploadvolumefactor:
-        case:
-          "*": "1"
\ No newline at end of file
+        text: 1
+# TBdev
diff --git a/src/Jackett.Common/Definitions/limetorrents.yml b/src/Jackett.Common/Definitions/limetorrents.yml
index 26497374d..e046168cf 100644
--- a/src/Jackett.Common/Definitions/limetorrents.yml
+++ b/src/Jackett.Common/Definitions/limetorrents.yml
@@ -102,3 +102,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/mactorrents.yml b/src/Jackett.Common/Definitions/mactorrents.yml
index 222275f4d..b49dea0fe 100644
--- a/src/Jackett.Common/Definitions/mactorrents.yml
+++ b/src/Jackett.Common/Definitions/mactorrents.yml
@@ -25,7 +25,7 @@
     paths:
       - path: /
     inputs:
-      s: "{{.Keywords}}"
+      s: "{{ .Keywords }}"
     rows:
       selector: div.iso-item article:has(a.download)
     fields:
@@ -57,10 +57,11 @@
       size:
         text: "500 MB"
       seeders:
-        text: "1"
+        text: 1
       leechers:
-        text: "1"
+        text: 1
       downloadvolumefactor:
-        text: "0"
+        text: 0
       uploadvolumefactor:
-        text: "1"
+        text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/magnetdl.yml b/src/Jackett.Common/Definitions/magnetdl.yml
index 55e5ed759..0de2827bf 100644
--- a/src/Jackett.Common/Definitions/magnetdl.yml
+++ b/src/Jackett.Common/Definitions/magnetdl.yml
@@ -56,7 +56,7 @@
     paths:
       # return movie results if there are no search parms supplied (for use with the TEST button)
       # http://www.magnetdl.com/m/midnight-texas-s01e10/
-      - path: "{{if .Keywords}}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}{{ .Config.sort }}/{{ .Config.type }}/"     
+      - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}{{ .Config.sort }}/{{ .Config.type }}/"     
 
     rows:
       selector: tr:has(td.m)
@@ -90,3 +90,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/marinetracker.yml b/src/Jackett.Common/Definitions/marinetracker.yml
index 23d94ac24..d41c0325d 100644
--- a/src/Jackett.Common/Definitions/marinetracker.yml
+++ b/src/Jackett.Common/Definitions/marinetracker.yml
@@ -205,5 +205,5 @@
           img[src="images/tor_silver.gif"]: 0.5
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
+# Engine n/a
diff --git a/src/Jackett.Common/Definitions/metaltracker.yml b/src/Jackett.Common/Definitions/metaltracker.yml
index a70bc827d..efd8fd4ae 100644
--- a/src/Jackett.Common/Definitions/metaltracker.yml
+++ b/src/Jackett.Common/Definitions/metaltracker.yml
@@ -12,9 +12,9 @@
 
   caps:
     categories:
-      "Books": Audio/Audiobook
-      "Video": Audio/Video
-      "Music": Audio/MP3
+      Books: Audio/Audiobook
+      Video: Audio/Video
+      Music: Audio/MP3
 
     modes:
       search: [q]
@@ -64,12 +64,14 @@
       - path: torrents/search.html
         method: post
     inputs:
-      "SearchTorrentsForm[nameTorrent]": "{{ if .Query.Artist }}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+      "SearchTorrentsForm[nameTorrent]": "{{ if or (.Query.Artist) (.Query.Album) }}{{ or (.Query.Artist) (.Query.Album) }}{{else}}{{ .Keywords }}{{end}}"
       "SearchTorrentsForm[sort]": "{{ .Config.sort }}"
       "SearchTorrentsForm[sortType]": "{{ .Config.type }}"
       go-search: Search
+
     rows:
       selector: .smallalbum
+
     fields:
       title:
         selector: a h3
@@ -96,11 +98,12 @@
         selector: .smallalbum
         remove: div.thumb, div.center, a
         case:
-          ":contains(\"Type: Music\")": "Music"
-          ":contains(\"Type: Video\")": "Video"
-          ":contains(\"Type: Books\")": "Books"
+          ":contains(\"Type: Music\")": Music
+          ":contains(\"Type: Video\")": Video
+          ":contains(\"Type: Books\")": Books
       size:
         selector: .smallalbum
         filters:
           - name: regexp
             args: "Size:\\s+([\\w\\d\\.,]+ \\w\\w)"
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/moecat.yml b/src/Jackett.Common/Definitions/moecat.yml
index 67be7f2b2..1c56d2353 100644
--- a/src/Jackett.Common/Definitions/moecat.yml
+++ b/src/Jackett.Common/Definitions/moecat.yml
@@ -173,3 +173,4 @@
       description:
         selector: td:nth-child(2)
         remove: a, img
+# NexusPHP Standard v1.5 Beta 5
diff --git a/src/Jackett.Common/Definitions/monova.yml b/src/Jackett.Common/Definitions/monova.yml
index a2d4fca8e..c13736370 100644
--- a/src/Jackett.Common/Definitions/monova.yml
+++ b/src/Jackett.Common/Definitions/monova.yml
@@ -37,10 +37,12 @@
       # https://monova.to/search?term=vikings+s05e05
       # https://monova.to/video
       - path: "{{if .Keywords}}search?term={{.Keywords}}{{else}}video{{end}}"
+
     rows:
       selector: tr.desktop:has(a[href^="//"])
       filters:
         - name: andmatch
+
     fields:
       title:
         selector: td.torrent_name a
@@ -83,3 +85,4 @@
           - name: replace
             args: ["min.","minutes"]
           - name: timeago
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/movcr.yml b/src/Jackett.Common/Definitions/movcr.yml
index 5611ef90f..1b778a569 100644
--- a/src/Jackett.Common/Definitions/movcr.yml
+++ b/src/Jackett.Common/Definitions/movcr.yml
@@ -27,11 +27,13 @@
 
   search:
     paths:
-      - path: "{{if .Keywords}}search/search.php?q={{ .Keywords}}{{else}}/{{end}}"
+      - path: "{{ if .Keywords }}search/search.php?q={{ .Keywords }}{{else}}/{{end}}"
+
     rows:
       selector: tr:has(td.name a[href^="/download-"])
       filters:
         - name: andmatch
+
     fields:
       category:
         text: other
@@ -72,6 +74,7 @@
           - name: split
             args: ["/", 1]
       downloadvolumefactor:
-        text: "0"
+        text: 0
       uploadvolumefactor:
-        text: "1"
+        text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/moviesdvdr.yml b/src/Jackett.Common/Definitions/moviesdvdr.yml
index 05bd7095d..9ef348bb0 100644
--- a/src/Jackett.Common/Definitions/moviesdvdr.yml
+++ b/src/Jackett.Common/Definitions/moviesdvdr.yml
@@ -61,3 +61,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/muziekfabriek.yml b/src/Jackett.Common/Definitions/muziekfabriek.yml
index 68d1fa4a1..88902a561 100644
--- a/src/Jackett.Common/Definitions/muziekfabriek.yml
+++ b/src/Jackett.Common/Definitions/muziekfabriek.yml
@@ -142,3 +142,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
+# engine n/a
diff --git a/src/Jackett.Common/Definitions/mvgroupforum.yml b/src/Jackett.Common/Definitions/mvgroupforum.yml
index 29006e31f..301c5052a 100644
--- a/src/Jackett.Common/Definitions/mvgroupforum.yml
+++ b/src/Jackett.Common/Definitions/mvgroupforum.yml
@@ -117,6 +117,7 @@
       options:
         "DESC": "desc"
         "ASC": "asc"
+
   login:
     path: index.php?act=Login&CODE=00
     method: form
@@ -194,3 +195,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
+# Invision Power Board
diff --git a/src/Jackett.Common/Definitions/mvgroupmain.yml b/src/Jackett.Common/Definitions/mvgroupmain.yml
index 1cca57ff9..fad82d5cb 100644
--- a/src/Jackett.Common/Definitions/mvgroupmain.yml
+++ b/src/Jackett.Common/Definitions/mvgroupmain.yml
@@ -195,3 +195,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
+# Invision Power Board