From ff3ef7c726d3a194f8a872696cf0e18fab0f9373 Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Mon, 2 Sep 2019 08:53:17 +1200
Subject: [PATCH] thegeeks: new download link. resolves #5938

also refresh categories
---
 src/Jackett.Common/Definitions/thegeeks.yml | 151 ++++++++++----------
 1 file changed, 79 insertions(+), 72 deletions(-)

diff --git a/src/Jackett.Common/Definitions/thegeeks.yml b/src/Jackett.Common/Definitions/thegeeks.yml
index a03751b4a..30f13a5a3 100644
--- a/src/Jackett.Common/Definitions/thegeeks.yml
+++ b/src/Jackett.Common/Definitions/thegeeks.yml
@@ -10,75 +10,84 @@
 
   caps:
     categorymappings:
-      - {id: 71, cat: Other, desc: "Antiques / Collecting"}
-      - {id: 46, cat: Other, desc: "Comp: Security/Encryption"}
-      - {id: 37, cat: Other, desc: "Game Shows / Quiz Shows"}
-      - {id: 16, cat: Other, desc: "Magic &amp; Illusion"}
-      - {id: 79, cat: Other, desc: "Reality: Competitions"}
-      - {id: 68, cat: Other, desc: "Arts &amp; Crafts / Jewelry"}
-      - {id: 52, cat: Other, desc: "Comp: Software Training"}
-      - {id: 2, cat: Other, desc: "Games: Cards / Gambling"}
-      - {id: 12, cat: Other, desc: "Math &amp; Statistics"}
-      - {id: 53, cat: Other, desc: "Reality: Social Experiment"}
-      - {id: 72, cat: Other, desc: "Astronomy / Space"}
-      - {id: 41, cat: Other, desc: "Comp: Theory/Ref/Mags"}
-      - {id: 63, cat: Other, desc: "Games: Tabletop / Roleplay"}
-      - {id: 10, cat: Other, desc: "Medicine &amp; Health"}
-      - {id: 61, cat: Other, desc: "Sci: Biology"}
-      - {id: 28, cat: Other, desc: "Business / Finance"}
-      - {id: 47, cat: Other, desc: "Comp: Web Development"}
-      - {id: 36, cat: Other, desc: "Gardening / Agriculture"}
-      - {id: 26, cat: Other, desc: "Music: History / Theory"}
-      - {id: 77, cat: Other, desc: "Sci: Chemistry"}
-      - {id: 38, cat: Other, desc: "Crime &amp; Investigation"}
-      - {id: 21, cat: Other, desc: "DIY / Workshop"}
-      - {id: 55, cat: Other, desc: "History of Civilization"}
-      - {id: 15, cat: Other, desc: "Music: Learning / Courses"}
-      - {id: 76, cat: Other, desc: "Sci: Physics"}
+      - {id: 212, cat: Other, desc: "AudioBook : Fiction"}
+      - {id: 56, cat: Other, desc: "Docu : History - War/Politics"}
+      - {id: 209, cat: Other, desc: "Business : Startup/Dev"}
+      - {id: 9, cat: Other, desc: "Food/Cooking/Nutrition"}
       - {id: 45, cat: Other, desc: "Photography"}
-      - {id: 82, cat: Other, desc: "Docu: Architecture / Building"}
-      - {id: 56, cat: Other, desc: "History of War &amp; Politics"}
-      - {id: 75, cat: Other, desc: "Nature"}
-      - {id: 80, cat: Other, desc: "Sports - Live/Highlights"}
-      - {id: 85, cat: Other, desc: "Childrens Educational"}
-      - {id: 39, cat: Other, desc: "Docu: Fly on The Wall"}
-      - {id: 58, cat: Other, desc: "History: Biographies"}
-      - {id: 54, cat: Other, desc: "News / World Reports"}
-      - {id: 22, cat: Other, desc: "Sports/Exercise/Outdoors"}
-      - {id: 40, cat: Other, desc: "Comp: Certification Courses"}
-      - {id: 69, cat: Other, desc: "Documentaries: Misc"}
-      - {id: 31, cat: Other, desc: "History: Misc"}
-      - {id: 83, cat: Other, desc: "Nova"}
-      - {id: 24, cat: Other, desc: "Stock Media"}
-      - {id: 44, cat: Other, desc: "Comp: Digital Audio/Video"}
-      - {id: 59, cat: Other, desc: "Earth / Environment"}
-      - {id: 23, cat: Other, desc: "Hobbies: Misc"}
-      - {id: 27, cat: Other, desc: "Paleontology"}
-      - {id: 33, cat: Other, desc: "Style &amp; Fashion"}
-      - {id: 48, cat: Other, desc: "Comp: Games Dev/Guides"}
-      - {id: 18, cat: Other, desc: "Engineering"}
-      - {id: 35, cat: Other, desc: "Home / Property"}
-      - {id: 60, cat: Other, desc: "Performing Arts"}
-      - {id: 73, cat: Other, desc: "Survivalism"}
-      - {id: 3, cat: Other, desc: "Comp: Graphics "}
-      - {id: 25, cat: Other, desc: "Exam Prep / Education"}
-      - {id: 78, cat: Other, desc: "Horizon"}
-      - {id: 67, cat: Other, desc: "Pets / Animal Keeping"}
-      - {id: 86, cat: Other, desc: "Tattoos/Body Art"}
-      - {id: 42, cat: Other, desc: "Comp: Lang/DBs"}
-      - {id: 4, cat: Other, desc: "Fine &amp; Visual Arts"}
-      - {id: 1, cat: Other, desc: "Languages / Linguistics"}
-      - {id: 29, cat: Other, desc: "Philosophy"}
-      - {id: 32, cat: Other, desc: "Travel / Culture"}
-      - {id: 49, cat: Other, desc: "Comp: Network/Hardware"}
-      - {id: 9, cat: Other, desc: "Food / Cooking / Nutrition"}
-      - {id: 20, cat: Other, desc: "Law &amp; Justice"}
+      - {id: 213, cat: Other, desc: "AudioBook : Non-Fiction"}
+      - {id: 35, cat: Other, desc: "Docu : Home / Property"}
+      - {id: 28, cat: Other, desc: "Business :Misc"}
+      - {id: 37, cat: Other, desc: "Game Shows / Quiz Shows"}
       - {id: 11, cat: Other, desc: "Political Studies"}
-      - {id: 34, cat: Other, desc: "Vehicles &amp; Transport"}
-      - {id: 43, cat: Other, desc: "Comp: Operating Systems"}
-      - {id: 84, cat: Other, desc: "FrontLine"}
+      - {id: 71, cat: Other, desc: "Docu : Antiques / Collecting"}
+      - {id: 78, cat: Other, desc: "Docu : Horizon"}
+      - {id: 40, cat: Other, desc: "Comp: Certification Courses"}
+      - {id: 2, cat: Other, desc: "Games: Cards/Tabletop/etc"}
+      - {id: 61, cat: Other, desc: "Science: Biology"}
+      - {id: 82, cat: Other, desc: "Docu : Architecture/Building"}
+      - {id: 69, cat: Other, desc: "Docu : Misc"}
+      - {id: 44, cat: Other, desc: "Comp: Digital Audio/Video"}
+      - {id: 23, cat: Other, desc: "Hobbies: Misc"}
+      - {id: 77, cat: Other, desc: "Science: Chemistry"}
+      - {id: 72, cat: Other, desc: "Docu : Astronomy / Space"}
+      - {id: 75, cat: Other, desc: "Docu : Nature"}
+      - {id: 48, cat: Other, desc: "Comp: Games Dev/Guides"}
+      - {id: 1, cat: Other, desc: "Languages / Linguistics"}
+      - {id: 12, cat: Other, desc: "Science: Math/Statistics"}
+      - {id: 85, cat: Other, desc: "Docu : Childrens Ed"}
+      - {id: 54, cat: Other, desc: "Docu : News/World Reports"}
+      - {id: 3, cat: Other, desc: "Comp: Graphics "}
+      - {id: 20, cat: Other, desc: "Law & Justice"}
+      - {id: 10, cat: Other, desc: "Science: Medicine/Health "}
+      - {id: 38, cat: Other, desc: "Docu : Crime/ Investigation"}
+      - {id: 83, cat: Other, desc: "Docu : Nova"}
+      - {id: 42, cat: Other, desc: "Comp: Lang/DBs"}
       - {id: 30, cat: Other, desc: "Literature"}
-      - {id: 14, cat: Other, desc: "Psychology/Sociology"}
+      - {id: 29, cat: Other, desc: "Science: Philosophy"}
+      - {id: 59, cat: Other, desc: "Docu : Earth / Environment"}
+      - {id: 27, cat: Other, desc: "Docu : Paleontology"}
+      - {id: 49, cat: Other, desc: "Comp: Network/Hardware"}
+      - {id: 16, cat: Other, desc: "Magic & Illusion"}
+      - {id: 76, cat: Other, desc: "Science: Physics"}
+      - {id: 18, cat: Other, desc: "Docu : Engineering"}
+      - {id: 67, cat: Other, desc: "Docu : Pets/Animal Keeping"}
+      - {id: 43, cat: Other, desc: "Comp: Operating Systems"}
+      - {id: 26, cat: Other, desc: "Music: History / Theory"}
+      - {id: 14, cat: Other, desc: "Science: Psych/Sociolgy"}
+      - {id: 4, cat: Other, desc: "Docu : Fine/Visual Arts"}
+      - {id: 53, cat: Other, desc: "Docu : Social Experiment"}
+      - {id: 46, cat: Other, desc: "Comp: Security/Encryption"}
+      - {id: 15, cat: Other, desc: "Music: Learning / Courses"}
+      - {id: 80, cat: Other, desc: "Sports - Live/Highlights"}
+      - {id: 39, cat: Other, desc: "Docu : Fly on The Wall"}
+      - {id: 73, cat: Other, desc: "Docu : Survivalism"}
+      - {id: 52, cat: Other, desc: "Comp: Software Training"}
+      - {id: 206, cat: Other, desc: "Native American Studies"}
+      - {id: 22, cat: Other, desc: "Sports/Exercise/Outdoors"}
+      - {id: 84, cat: Other, desc: "Docu : FrontLine"}
+      - {id: 32, cat: Other, desc: "Docu : Travel / Culture"}
+      - {id: 41, cat: Other, desc: "Comp: Theory/Ref/Mags"}
+      - {id: 201, cat: Other, desc: "Occultism: Academic / Referenc"}
+      - {id: 24, cat: Other, desc: "Stock Media"}
+      - {id: 36, cat: Other, desc: "Docu : Gardening/Agriculture"}
+      - {id: 34, cat: Other, desc: "Docu : Vehicles/Transport"}
+      - {id: 47, cat: Other, desc: "Comp: Web Development"}
+      - {id: 202, cat: Other, desc: "Occultism: Mythology Folklore"}
+      - {id: 33, cat: Other, desc: "Style & Fashion"}
+      - {id: 58, cat: Other, desc: "Docu : History - Biographies"}
+      - {id: 207, cat: Other, desc: "Business : Economics"}
+      - {id: 68, cat: Other, desc: "Crafts/Jewelry"}
+      - {id: 203, cat: Other, desc: "Paranormal"}
+      - {id: 210, cat: Other, desc: "Tattoos/Body Art"}
+      - {id: 55, cat: Other, desc: "Docu : History - Civilization"}
+      - {id: 211, cat: Other, desc: "Business : Investing"}
+      - {id: 21, cat: Other, desc: "DIY / Workshop"}
+      - {id: 204, cat: Other, desc: "Parapsychology"}
+      - {id: 31, cat: Other, desc: "Docu : History - Misc"}
+      - {id: 208, cat: Other, desc: "Business : Marketing"}
+      - {id: 25, cat: Other, desc: "Exam Prep / Education"}
+      - {id: 60, cat: Other, desc: "Performing Arts"}
 
     modes:
       search: [q]
@@ -107,7 +116,8 @@
       - path: browse.php
     inputs:
       $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{ .Keywords }}"
+      incldead: 1
     rows:
       selector: table[border="0"] > tbody > tr.ttable:has(a[href^="browse.php?cat="])
     fields:
@@ -121,11 +131,8 @@
         filters:
         selector: td:nth-child(2) b
       download:
-        selector: a[href^="details.php?id="]
+        selector: a[href^="download.php/"]
         attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?id="]
       details:
         selector: a[href^="details.php?id="]
         attribute: href
@@ -133,7 +140,7 @@
         selector: td:nth-child(8)
         filters:
           - name: regexp
-            args: ([\d,]+)
+            args: (\d+)
       files:
         selector: td:nth-child(4)
       size: