worldoftomorrow: fix cat 95

arabafenice: fix cats 47 and 40
downloadville: update categories
2025-09-12 15:04:13 +02:00 · 2020-03-20 20:23:02 +13:00 · 2020-03-20 20:22:12 +13:00 · 2020-03-20 20:20:03 +13:00 · 2020-03-20 20:13:16 +13:00 · 2020-03-20 20:09:13 +13:00
24 changed files with 517 additions and 212 deletions
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * AlexFilm
 * AniDUB
 * ArenaBG
+ * BaibaKo
 * BookTracker
 * CasStudioTV
 * Crazy's Corner
@@ -220,7 +221,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Audiobook Torrents (ABT)
 * Avistaz (AsiaTorrents)
 * Awesome-HD (AHD)
- * BaibaKo
 * BIGTorrent
 * BIT-HDTV
 * BJ-Share (BJ)
@@ -337,6 +337,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * HacheDe
 * Hebits
 * Hon3y HD
+ * Horror Site
 * HuSh
 * ICE Torrent
 * IPTorrents (IPT)
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -44,12 +44,12 @@
      - {id: 3, cat: Movies, desc: "Movies/SVCD/VCD"}
      - {id: 4, cat: Movies/Foreign, desc: "Movies/Dubs/Dual Audio"}
      - {id: 42, cat: Movies/HD, desc: "Movies/HD"}
-      - {id: 54, cat: Movies, desc: "Movies/h.264/x264"}
+      - {id: 54, cat: Movies/HD, desc: "Movies/h.264/x264"}
      - {id: 55, cat: Movies, desc: "Movies/Mp4"}
      - {id: 66, cat: Movies/3D, desc: "Movies/3D"}
-      - {id: 70, cat: Movies, desc: "Movies/HEVC/x265"}
+      - {id: 70, cat: Movies/HD, desc: "Movies/HEVC/x265"}
      - {id: 73, cat: Movies, desc: "Movies/Bollywood"}
-      - {id: 76, cat: Movies, desc: "Movies/UHD"}
+      - {id: 76, cat: Movies/UHD, desc: "Movies/UHD"}

      #TV
      - {id: 5, cat: TV, desc: "TV/DVD"}
@@ -138,7 +138,7 @@
        "asc": "asc"

  download:
-    # the .torrent url is on the on the details page 
+    # the .torrent url is on the on the details page
    selector: ul li a[href^="{{ .Config.downloadlink }}"]
    attribute: href

@@ -148,7 +148,7 @@
      - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/Movies{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/1/"
      - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/TV{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}2{{else}}1{{end}}/"
      - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/Music{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}3{{else}}1{{end}}/"
-    keywordsfilters: 
+    keywordsfilters:
      - name: replace # use this as a workaround till #893 is implemented
        args: ["Greys Anatomy", "Grey's Anatomy"]

--- a/src/Jackett.Common/Definitions/arabafenice.yml
+++ b/src/Jackett.Common/Definitions/arabafenice.yml
@@ -14,7 +14,7 @@
    categorymappings:
      # HRS
      - {id: 34, cat: Movies/HD, desc: "1080p HRS x264"}
-      - {id: 47, cat: Movies/HD, desc: "2160p 4k UltraHD HRS"}
+      - {id: 47, cat: Movies/UHD, desc: "2160p 4k UltraHD HRS"}
      - {id: 35, cat: TV, desc: "Serie TV HRS"}
      - {id: 36, cat: Movies/SD, desc: "DVDRip HRS"}
      - {id: 41, cat: Movies/SD, desc: "BDRip 576p HRS"}
@@ -38,7 +38,7 @@
      - {id: 42, cat: TV, desc: "Serie Tv Sub Ita"}
      - {id: 15, cat: TV/Documentary, desc: "documentaries"}
      - {id: 33, cat: TV, desc: "mp4"}
-      - {id: 40, cat: TV/HD, desc: "2160p 4K UltraHD"}
+      - {id: 40, cat: TV/UHD, desc: "2160p 4K UltraHD"}
      - {id: 38, cat: XXX, desc: "xXx"}
      - {id: 43, cat: Other, desc: "Arabic for social"}

--- a/src/Jackett.Common/Definitions/baibako.yml
+++ b/src/Jackett.Common/Definitions/baibako.yml
@@ -1,9 +1,9 @@
 ---
  site: baibako
  name: BaibaKo
-  description: "BaibaKo is a RUSSIAN Private Torrent Tracker for TV"
+  description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
  language: ru-ru
-  type: private
+  type: semi-private
  encoding: windows-1251
  links:
    - http://baibako.tv/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -56,6 +56,10 @@
      movie-search: [q]

  settings:
+    - name: info_alert
+      type: info
+      label: Alert about Cookie
+      default: "If during your cookie save you get the following error:</br><b>The 'Value'='xzlogin,xzrecover,xzsignup' part of the cookie is invalid.</b></br>Then remove <b>acopendivids=xzlogin,xzrecover,xzsignup; </b> from the cookie string before proceeding to save."
    - name: cookie
      type: text
      label: Cookie
--- a/src/Jackett.Common/Definitions/btnext.yml
+++ b/src/Jackett.Common/Definitions/btnext.yml
@@ -24,7 +24,10 @@
      - {id: 16, cat: Movies/SD, desc: "Movies CAM"}
      - {id: 74, cat: Movies/DVD, desc: "Movies DvD-R"}
      - {id: 76, cat: Movies, desc: "Movies Packs"}
-      - {id: 91, cat: Movies/Other, desc: "Movies Kids"}
+      - {id: 115, cat: Movies/Other, desc: "Movies Kids"}
+      - {id: 91, cat: Movies/Other, desc: "Movies Kids Inglês"}
+      - {id: 113, cat: Movies/Other, desc: "Movies Kids PT-BR"}
+      - {id: 114, cat: Movies/Other, desc: "Movies Kids PT-PT"}
      - {id: 77, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
      - {id: 85, cat: Movies/DVD, desc: "Movies Custom-DVDR"}
      - {id: 14, cat: Movies/SD, desc: "Movies DVDRip/XViD"}
@@ -49,13 +52,14 @@
      - {id: 7, cat: Audio, desc: "Music"}
      - {id: 20, cat: Audio/Video, desc: "Music MVideo"}
      - {id: 21, cat: Audio/MP3, desc: "Music MP3"}
-      - {id: 33, cat: Audio/Other, desc: "Music MP4"}
+      - {id: 33, cat: Audio/Video, desc: "Music MP4"}
      - {id: 32, cat: Audio/Lossless, desc: "Music FLAC"}
      - {id: 2, cat: Console, desc: "Games"}
      - {id: 78, cat: PC/Games, desc: "Games Linux"}
      - {id: 79, cat: PC/Mac, desc: "Games MacOSX"}
      - {id: 28, cat: Console/NDS, desc: "Games Nintendo DS"}
      - {id: 27, cat: PC/Games, desc: "Games PC/Windows"}
+      - {id: 111, cat: Console, desc: "Games Nintendo Sw"}
      - {id: 80, cat: Console/PS3, desc: "Games PS2"}
      - {id: 81, cat: Console/PS3, desc: "Games PS3"}
      - {id: 82, cat: Console/PS4, desc: "Games PS4"}
@@ -70,10 +74,10 @@
      - {id: 34, cat: PC/ISO, desc: "Applications Linux"}
      - {id: 44, cat: Other, desc: "Miscellaneous"}
      - {id: 54, cat: Audio/Audiobook, desc: "Books Audiobook"}
-      - {id: 57, cat: Books, desc: "Books E-Books"}
+      - {id: 57, cat: Books/Ebook, desc: "Books E-Books"}
      - {id: 58, cat: Books/Comics, desc: "Books Comics"}
      - {id: 59, cat: Books, desc: "Books Educational"}
-      - {id: 60, cat: Books, desc: "Books Magazines/Journals"}
+      - {id: 60, cat: Books/Magazines, desc: "Books Magazines/Journals"}
      - {id: 61, cat: Other, desc: "Pics/Wallpapers"}
      - {id: 62, cat: PC/Phone-Android, desc: "Android"}
      - {id: 63, cat: PC/Phone-IOS, desc: "iOS"}
@@ -92,9 +96,9 @@
      - {id: 69, cat: XXX/Imageset, desc: "XXX-Pics/Wallpapers"}

    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]

  settings:
    - name: username
@@ -122,6 +126,10 @@
      options:
        "desc": "desc"
        "asc": "asc"
+    - name: info_results
+      type: info
+      label: Search results
+      default: "If you get 0 results check the log for error: <b>An error has occured!You can't view this page unless you read all your unread messages</b>, then access the site with your browser and <b>mark as read</b> all PMs."

  login:
    path: ?p=home&pid=1
@@ -155,9 +163,9 @@
      p: torrents
      pid: 32
      $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
-      keywords: "{{ .Keywords }}"
-      search_type: name
-      searchin: title
+      keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # name , description , both , uploader
+      search_type: "{{ if .Query.IMDBID }}description{{else}}name{{end}}"
      "sortOptions[sortBy]": "{{ .Config.sort }}"
      "sortOptions[sortOrder]": "{{ .Config.type }}"
    error:
@@ -193,28 +201,62 @@
        selector: a[rel="fancybox"]
        optional: true
        attribute: href
+      imdb:
+      # a href="http://tracker.btnext.com/data/torrents/imdb/tt0249677.jpg"
+        optional: true
+        selector: a[href*="/imdb/tt"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "imdb/(.+?).jpg"
+          - name: prepend
+            args: "https://www.imdb.com/title/"
      downloadvolumefactor:
        case:
          "img[title=\"FREE!\"]": 0
          "*": 1
      uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
      date:
        selector: td.torrent_name > abbr.timeago
        optional: true
        attribute: data-time
      date:
-        selector: td.torrent_name:not(:has(abbr.timeago))
+        selector: td.torrent_name:not(:has(abbr.timeago)):not(:contains("day")):not(:contains("Domingo")):not(:contains("Sábado")):not(:contains("Sexta")):not(:contains("Quinta")):not(:contains("Quarta")):not(:contains("Terça")):not(:contains("Segunda")):not(:contains("ontem")):not(:contains("Hoje"))
        optional: true
        remove: span, a, br
        filters:
          - name: replace
            args: ["Enviado ", ""] # Uploaded
+          - name: replace
+            args: ["Uploaded ", ""]
          - name: replace
            args: [" por", ""] # by
+          - name: replace
+            args: [" by", ""]
          - name: replace
            args: ["às ", ""] # at
+          - name: replace
+            args: ["at ", ""]
+          - name: dateparse
+            args: "02-01-2006 15:04"
+      date:
+        selector: td.torrent_name:not(:has(abbr.timeago)):contains("day"), td.torrent_name:not(:has(abbr.timeago)):contains("Domingo"), td.torrent_name:not(:has(abbr.timeago)):contains("Sábado"), td.torrent_name:not(:has(abbr.timeago)):contains("Quinta"), td.torrent_name:not(:has(abbr.timeago)):contains("Sexta"), td.torrent_name:not(:has(abbr.timeago)):contains("Quarta"), td.torrent_name:not(:has(abbr.timeago)):contains("Terça"), td.torrent_name:not(:has(abbr.timeago)):contains("Segunda"), td.torrent_name:not(:has(abbr.timeago)):contains("ontem"), td.torrent_name:not(:has(abbr.timeago)):contains("Hoje")
+        optional: true
+        remove: span, a, br
+        filters:
+          - name: replace
+            args: ["Enviado ", ""] # Uploaded
+          - name: replace
+            args: ["Uploaded ", ""]
+          - name: replace
+            args: [" por", ""] # by
+          - name: replace
+            args: [" by", ""]
+          - name: replace
+            args: ["às ", ""] # at
+          - name: replace
+            args: ["at ", ""]
          - name: replace
            args: ["Hoje", "Today"]
          - name: replace
@@ -233,6 +275,5 @@
            args: ["Sábado", "Saturday"]
          - name: replace
            args: ["Domingo", "Sunday"]
-          - name: dateparse
-            args: "02-01-2006 15:04"
+          - name: fuzzytime
 # TSUE 2.2
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@@ -38,9 +38,33 @@
      - {id: 110, cat: XXX, desc: "XXX"}

    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "5"
+      options:
+        "5": "created"
+        "8": "seeders"
+        "6": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  login:
    path: takelogin.php
@@ -55,13 +79,18 @@
    paths:
      - path: browse.php
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}https://www.imdb.com/title/{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 both 1 only active 2 only dead
      incldead: 0
      onlyname: 1
      onlyname2: true
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
    rows:
      selector: table[id!="torrent_ajanlo"] > tbody > tr[id]
+
    fields:
      download:
        selector: a[href^="download.php/"]
@@ -84,7 +113,7 @@
        selector: a[id][href^="details.php?"]
        attribute: href
      imdb:
-        selector: a[href*="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
        optional: true
        attribute: href
      banner:
@@ -99,7 +128,7 @@
        selector: td:nth-child(7)
        filters:
          - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
      seeders:
        selector: td:nth-child(8)
      leechers:
@@ -123,9 +152,10 @@
            args: ["hete", "week"]
          - name: timeago
      downloadvolumefactor:
-        case:
-          "*": "1"
+        text: 1
      uploadvolumefactor:
        case:
-          img[src="pic/double.png"]: "2"
-          "*": "1"
+          img[src="pic/double.png"]: 2
+          img[src="pic/doubledouble2.png"]: 4
+          "*": 1
+# TBDev & XBTT
--- a/src/Jackett.Common/Definitions/downloadville.yml
+++ b/src/Jackett.Common/Definitions/downloadville.yml
@@ -14,70 +14,70 @@
    categorymappings:
        # Films
      - {id: 1, cat: Movies, desc: "Films"}
-      - {id: 13, cat: Movies, desc: "Films BD-Rip / BRRip"}
-      - {id: 15, cat: Movies, desc: "Films DVD-Rip"}
-      - {id: 18, cat: Movies, desc: "Films HD 720p"}
-      - {id: 19, cat: Movies, desc: "Films WEB-DL / WEB-Rip"}
-      - {id: 20, cat: Movies, desc: "Films HD 1080p"}
-      - {id: 26, cat: Movies, desc: "Films mHD 720p"}
-      - {id: 27, cat: Movies, desc: "Films mHD 1080p"}
-      - {id: 28, cat: Movies, desc: "Films x265"}
-      - {id: 30, cat: Movies, desc: "Films Blu-Ray (complet)"}
-      - {id: 31, cat: Movies, desc: "Films 3D"}
-      - {id: 32, cat: Movies, desc: "Films 4K UHD"}
-      - {id: 33, cat: Movies, desc: "Films Québécois SD"}
-      - {id: 34, cat: Movies, desc: "Films Québécois HD"}
-      - {id: 35, cat: Movies, desc: "Films Québécois DVD-R"}
-      - {id: 37, cat: Movies, desc: "Films DVD-R"}
-      - {id: 38, cat: Movies, desc: "Films V.O.S.T. SD"}
-      - {id: 39, cat: Movies, desc: "Films V.O.S.T. HD"}
-      - {id: 40, cat: Movies, desc: "Films V.O. SD"}
-      - {id: 41, cat: Movies, desc: "Films V.O. HD"}
+      - {id: 13, cat: Movies/BluRay, desc: "Films BD-Rip / BRRip"}
+      - {id: 15, cat: Movies/DVD, desc: "Films DVD-Rip"}
+      - {id: 18, cat: Movies/HD, desc: "Films HD 720p"}
+      - {id: 19, cat: Movies/WEBDL, desc: "Films WEB-DL / WEB-Rip"}
+      - {id: 20, cat: Movies/HD, desc: "Films HD 1080p"}
+      - {id: 26, cat: Movies/HD, desc: "Films mHD 720p"}
+      - {id: 27, cat: Movie/HD, desc: "Films mHD 1080p"}
+      - {id: 28, cat: Movies/HD, desc: "Films x265"}
+      - {id: 30, cat: Movies/BluRay, desc: "Films Blu-Ray (complet)"}
+      - {id: 31, cat: Movies/3D, desc: "Films 3D"}
+      - {id: 32, cat: Movies/UHD, desc: "Films 4K UHD"}
+      - {id: 33, cat: Movies/SD, desc: "Films Québécois SD"}
+      - {id: 34, cat: Movies/HD, desc: "Films Québécois HD"}
+      - {id: 35, cat: Movies/DVD, desc: "Films Québécois DVD-R"}
+      - {id: 37, cat: Movies/DVD, desc: "Films DVD-R"}
+      - {id: 38, cat: Movies/SD, desc: "Films V.O.S.T. SD"}
+      - {id: 39, cat: MovieS/HD, desc: "Films V.O.S.T. HD"}
+      - {id: 40, cat: Movies/SD, desc: "Films V.O. SD"}
+      - {id: 41, cat: Movies/HD, desc: "Films V.O. HD"}
      - {id: 42, cat: Movies, desc: "Films TV-Rip"}
        # 4K LIGHT
      - {id: 95, cat: Movies, desc: "4K LIGHT"}
        # Séries-Télé
      - {id: 16, cat: TV, desc: "Séries-Télé"}
-      - {id: 17, cat: TV, desc: "Séries-Télé TV Pack SD"}
-      - {id: 21, cat: TV, desc: "Séries-Télé SD"}
-      - {id: 22, cat: TV, desc: "Séries-Télé HD"}
-      - {id: 23, cat: TV, desc: "Séries-Télé TV Pack HD"}
-      - {id: 45, cat: TV, desc: "Séries-Télé Québécois SD"}
-      - {id: 46, cat: TV, desc: "Séries-Télé Québécois HD"}
-      - {id: 47, cat: TV, desc: "Séries-Télé V.O.S.T. SD"}
-      - {id: 48, cat: TV, desc: "Séries-TéléV.O.S.T. HD"}
-      - {id: 49, cat: TV, desc: "Séries-Télé Émissions TV SD"}
-      - {id: 50, cat: TV, desc: "Séries-Télé Émissions TV HD"}
+      - {id: 17, cat: TV/SD, desc: "Séries-Télé TV Pack SD"}
+      - {id: 21, cat: TV/SD, desc: "Séries-Télé SD"}
+      - {id: 22, cat: TV/HD, desc: "Séries-Télé HD"}
+      - {id: 23, cat: TV/HD, desc: "Séries-Télé TV Pack HD"}
+      - {id: 45, cat: TV/SD, desc: "Séries-Télé Québécois SD"}
+      - {id: 46, cat: TV/HD, desc: "Séries-Télé Québécois HD"}
+      - {id: 47, cat: TV/SD, desc: "Séries-Télé V.O.S.T. SD"}
+      - {id: 48, cat: TV/HD, desc: "Séries-TéléV.O.S.T. HD"}
+      - {id: 49, cat: TV/SD, desc: "Séries-Télé Émissions TV SD"}
+      - {id: 50, cat: TV/HD, desc: "Séries-Télé Émissions TV HD"}
      - {id: 51, cat: TV, desc: "Séries-Télé Blu-Ray"}
      - {id: 52, cat: TV, desc: "Séries-Télé DVD-R"}
-      - {id: 94, cat: TV, desc: "Séries-Télé x265 - TV"}
+      - {id: 94, cat: TV/HD, desc: "Séries-Télé x265 - TV"}
        # Musique
      - {id: 2, cat: Audio, desc: "Musique"}
-      - {id: 54, cat: Audio, desc: "Musique MP3"}
-      - {id: 55, cat: Audio, desc: "Musique FLAC"}
+      - {id: 54, cat: Audio/MP3, desc: "Musique MP3"}
+      - {id: 55, cat: Audio/Lossless, desc: "Musique FLAC"}
      - {id: 56, cat: Audio, desc: "Musique DSD"}
      - {id: 57, cat: Audio, desc: "Musique Karaoke"}
      - {id: 58, cat: Audio, desc: "Musique Autres"}
        # Jeux
      - {id: 3, cat: PC/Games, desc: "Jeux"}
      - {id: 59, cat: PC/Games, desc: "Jeux PC"}
-      - {id: 60, cat: PC/Games, desc: "Jeux Consoles"}
+      - {id: 60, cat: Console, desc: "Jeux Consoles"}
      - {id: 84, cat: PC/Games, desc: "Jeux Android"}
        # Livres
      - {id: 6, cat: Books, desc: "Livres"}
-      - {id: 61, cat: Books, desc: "Livres epub"}
+      - {id: 61, cat: Books/Ebook, desc: "Livres epub"}
      - {id: 62, cat: Books, desc: "Livres pdf"}
      - {id: 63, cat: Books, desc: "Livres Journaux"}
-      - {id: 64, cat: Books, desc: "Livres Magazines"}
+      - {id: 64, cat: Books/Magazines, desc: "Livres Magazines"}
      - {id: 65, cat: Books, desc: "Livres Bandes Dessinées"}
      - {id: 66, cat: Books, desc: "Livres Multi-Format"}
-      - {id: 85, cat: Books, desc: "Livres Audio"}
+      - {id: 85, cat: Audio/Audiobook, desc: "Livres Audio"}
        # Logiciels
      - {id: 67, cat: PC, desc: "Logiciels"}
-      - {id: 68, cat: PC, desc: "Logiciels Windows"}
-      - {id: 69, cat: PC, desc: "Logiciels Mac"}
+      - {id: 68, cat: PC/0day, desc: "Logiciels Windows"}
+      - {id: 69, cat: PC/Mac, desc: "Logiciels Mac"}
      - {id: 86, cat: PC, desc: "Logiciels Linux"}
-      - {id: 87, cat: PC, desc: "Logiciels Android"}
+      - {id: 87, cat: PC/Phone-Android, desc: "Logiciels Android"}
        # Spectacles
      - {id: 70, cat: TV/Other, desc: "Spectacles"}
      - {id: 71, cat: TV/Other, desc: "Spectacles Humour"}
--- a/src/Jackett.Common/Definitions/extremetorrents.yml
+++ b/src/Jackett.Common/Definitions/extremetorrents.yml
@@ -10,24 +10,25 @@

  caps:
    categorymappings:
-      - {id: 10, cat: Movies/DVD, desc: "Dvd rip"}
-      - {id: 111, cat: Movies/DVD, desc: "DVD Promo"}
-      - {id: 118, cat: Movies, desc: "Kids"}
-      - {id: 113, cat: XXX, desc: "DVD xxx"}
-      - {id: 129, cat: Movies/HD, desc: "Hd DVD"}
-      - {id: 130, cat: Movies/UHD, desc: "4K Films"}
-      - {id: 143, cat: Movies/HD, desc: "Divx 720P"}
-      - {id: 114, cat: Audio, desc: "Muziek"}
+      - {id: 10, cat: Movies/DVD, desc: "Film DVD"}
+      - {id: 111, cat: Movies/DVD, desc: "DVD Promo/R5"}
+      - {id: 118, cat: Movies/DVD, desc: "Kids DVD"}
+      - {id: 113, cat: XXX, desc: "DVD XXX"}
+      - {id: 108, cat: XXX, desc: "Xvid XXX"}
+      - {id: 129, cat: Movies/HD, desc: "HD DVD"}
+      - {id: 130, cat: Movies/UHD, desc: "Films 4K"}
+      - {id: 143, cat: Movies/HD, desc: "DivX 720P"}
+      - {id: 114, cat: Audio/MP3, desc: "Muziek MP3"}
      - {id: 140, cat: Books, desc: "E-Book"}
      - {id: 105, cat: TV/Documentary, desc: "Documentaire"}
-      - {id: 115, cat: PC, desc: "pc apps"}
-      - {id: 120, cat: PC/Games, desc: "Pc Games"}
+      - {id: 115, cat: PC, desc: "PC apps"}
+      - {id: 120, cat: PC/Games, desc: "PC Games"}
      - {id: 106, cat: Other, desc: "Overig"}
      - {id: 131, cat: Console/NDS, desc: "Nintendo Ds"}
      - {id: 132, cat: TV/HD, desc: "HD Serie"}
-      - {id: 116, cat: PC/Mac, desc: "Mac"}
-      - {id: 125, cat: Movies, desc: "Xvid rip"}
-      - {id: 123, cat: Movies, desc: "Xvid Tc"}
+      - {id: 116, cat: PC/Mac, desc: "Mac Software"}
+      - {id: 125, cat: Movies, desc: "DiVX Rip"}
+      - {id: 123, cat: Movies/SD, desc: "DiVX Cam"}
      - {id: 108, cat: XXX, desc: "18+"}
      - {id: 142, cat: XXX, desc: "HD XXX"}
      - {id: 139, cat: TV, desc: "TV Series"}
@@ -85,6 +86,7 @@
      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
      search: "{{ .Keywords }}"
      incldead: 1
+      # does not support imdbid search and does not return imdb link in results

    rows:
      selector: table.mainouter
@@ -108,7 +110,7 @@
        attribute: href
      banner:
        selector: div[id^="Style"] img
-        attribute: src        
+        attribute: src
      size:
        selector: a[href^="details_bestanden.php?torrent_id="]
        filters:
--- a/src/Jackett.Common/Definitions/fanoin.yml
+++ b/src/Jackett.Common/Definitions/fanoin.yml
@@ -49,10 +49,36 @@
      - {id: 23, cat: TV/Sport, desc: "TV/Sport"}
      - {id: 51, cat: Console, desc: "Games/Misc"}
      - {id: 1, cat: PC/0day, desc: "Appz/PC ISO"}
+      - {id: 55, cat: Movies/UHD, desc: "Movies/4K"}

    modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"

  login:
    path: takelogin.php
@@ -64,7 +90,7 @@
      - selector: td.embedded:has(h2:contains("failed"))
    test:
      path: browse_old.php
-      
+
  ratio:
    path: browse_old.php
    selector: img[title="Reitings:"]+font
@@ -73,13 +99,16 @@
    paths:
      - path: browse_old.php
    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 active 1 incldead 2 onlydead
      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
    rows:
      selector: tr.browse_actions
-      filters:
-        - name: andmatch
+
    fields:
      title:
        selector: a[href^="details.php?id="]
@@ -113,7 +142,7 @@
          - name: regexp
            args: (\d+)
      date:
-        selector: td:nth-child(2) > small:nth-last-child(2)
+        selector: td:nth-child(2) > small:nth-last-child(2), td:nth-child(2) > small
        filters:
          - name: replace
            args: ["Šodien", "Today"]
@@ -121,12 +150,13 @@
            args: ["Vakar", "Yesterday"]
      downloadvolumefactor:
        case:
-          img[alt="Free"]: "0"
-          "*": "1"
+          img[alt="Free"]: 0
+          "*": 1
      uploadvolumefactor:
        case:
-          img[alt="x2"]: "2"
-          "*": "1"
+          img[alt="x2"]: 2
+          "*": 1
      description:
        selector: td:nth-child(2) > small:nth-last-child(1)
        remove: a[href^="details.php?id="]
+# engine n/a
--- a/src/Jackett.Common/Definitions/film-paleis.yml
+++ b/src/Jackett.Common/Definitions/film-paleis.yml
@@ -35,9 +35,9 @@
      - {id: 32, cat: Audio/Audiobook, desc: " Luister Boeken"}

    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]

  settings:
    - name: username
@@ -83,8 +83,9 @@
      - path: browse.php
    inputs:
      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
      incldead: 1
+      # does not return imdb link in results

    rows:
      selector: table.mainouter
@@ -106,6 +107,9 @@
      download:
        selector: a[href^="details.php?id="]
        attribute: href
+      banner:
+        selector: img[src*="/covers/"]
+        attribute: src
      size:
        selector: td:nth-child(4) table tr td:nth-child(2)
        filters:
@@ -163,7 +167,9 @@
        optional: true
        selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
      downloadvolumefactor:
-        text: 0
+        case:
+          img[src="pic/freedlfsu.gif"]: 0
+          "*": 1
      uploadvolumefactor:
        text: 1
 # engine n/a
--- a/src/Jackett.Common/Definitions/galeriens.yml
+++ b/src/Jackett.Common/Definitions/galeriens.yml
@@ -260,6 +260,7 @@
      langue: "{{ .Config.torrentlanguage }}"
      # freeleech oui (yes) non (no) peuimporte (ignore)
      tl: "peuimporte"
+      # does bot support imdbid search and does not return imdb link in results.

    rows:
      selector: table.sortable tbody tr
@@ -322,6 +323,5 @@
          img[src$="/images/Torrents/TLibre.png"]: "0"
          "*": "1"
      uploadvolumefactor:
-        case:
-          "*": "1"
+        text: 1
 # TT3.00 FRENCH
--- a/src/Jackett.Common/Definitions/generationfree.yml
+++ b/src/Jackett.Common/Definitions/generationfree.yml
@@ -28,6 +28,7 @@
      - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
      - {id: 67, cat: TV/OTHER, desc: "Autres: Emission TV"}
      - {id: 141, cat: TV/OTHER, desc: "Autres: Noel"}
+      - {id: 142, cat: TV/Sport, desc: "Autres: Emission sport"}
      - {id: 90, cat: Books/Ebook, desc: "BD: Livres"}
      - {id: 132, cat: TV/Documentary, desc: "Documentaires: BluRay"}
      - {id: 133, cat: TV/Documentary, desc: "Documentaires: 4k"}
@@ -35,7 +36,6 @@
      - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
      - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
      - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"}
-      - {id: 118, cat: TV/Documentary, desc: "Documentaires: Sport"}
      - {id: 139, cat: TV/Documentary, desc: "Documentaires: Noel"}
      - {id: 138, cat: Books/Ebook, desc: "E-Books: Noel"}
      - {id: 53, cat: Books/Ebook, desc: "E-Books: Livre Anglais"}
@@ -63,8 +63,8 @@
      - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"}
      - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
      - {id: 65, cat: Movies, desc: "Films: VO"}
-      - {id: 1, cat: Movies/HD, desc: "Films: Remux Bluray 4K"}
-      - {id: 130, cat: Movies/UHD, desc: "Films: HD720P"}
+      - {id: 1, cat: Movies/UHD, desc: "Films: Remux Bluray 4K"}
+      - {id: 130, cat: Movies/HD, desc: "Films: HD720P"}
      - {id: 102, cat: Movies/WEBDL, desc: "Films: WEB-DL 720P"}
      - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"}
      - {id: 111, cat: Movies/WEBDL, desc: "Films: WEBRip-720P"}
@@ -172,11 +172,10 @@

  download:
    before:
-      path: "list_thanks.php"
-      method: "get"
+      path: list_thanks.php
      inputs:
        id: "{{ .DownloadUri.Query.id }}"
-        to: "give"
+        to: give
        torrent: "{{ .DownloadUri.Query.id }}"
    selector: a[href^="download.php?id="]
    attribute: href
@@ -192,12 +191,15 @@
 #      multi cats unsupported, defaulting to all
      cat: 0
      search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead
      incldead: 1
+      # 0 all 1 notfree 2 freeonly
      freeleech: 0
-      inclexternal: 0
+      # 0 all 1 French 2 English 3 etc
      lang: 0
      sort: "{{ .Config.sort }}"
      order: "{{ .Config.type }}"
+      # does not support imdbid search and does not return imdb link in results

    rows:
      selector: table.ttable_headinner > tbody > tr.t-row
@@ -239,6 +241,5 @@
          img[src="images/fl.gif"]: 0
          "*": 1
      uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
 # engine n/a
--- a/src/Jackett.Common/Definitions/girotorrent.yml
+++ b/src/Jackett.Common/Definitions/girotorrent.yml
@@ -27,15 +27,15 @@
      # VIDEOTECA
      - {id: 22, cat: Movies/SD, desc: "Movie BDRip"}
      - {id: 23, cat: Movies/SD, desc: "Movie DvdRip"}
-      - {id: 23, cat: Movies/SD, desc: "Movie WEBRip"}
+      - {id: 95, cat: Movies/SD, desc: "Movie WEBRip"}
      - {id: 24, cat: Movies/DVD, desc: "Movie DVD-R 5"}
      - {id: 25, cat: Movies/DVD, desc: "Movie DVD-R 9"}
      - {id: 26, cat: Movies/HD, desc: "Movie Blu-Ray HD"}
-      - {id: 27, cat: Movies/3D, desc: "Movie 3D-SBS"}
-      - {id: 96, cat: Movies/HD, desc: "Movie x265 HEVC"}
-      - {id: 28, cat: Movies/Foreign, desc: "Movie Subbet-ita"}
+      - {id: 27, cat: Movies/UHD, desc: "Movie 4K Ultra HD"}
+      - {id: 96, cat: Movies/HD, desc: "Movie HD Hevc"}
+      - {id: 28, cat: Movies/Foreign, desc: "Movie Subbed-ita"}
      - {id: 73, cat: Movies/SD, desc: "Movie MP4"}
-      - {id: 29, cat: Movies/Foreign, desc: "Movie Ligua Originale"}
+      - {id: 29, cat: Movies/Foreign, desc: "Movie Lingua Originale"}
      # ANIMAZIONE
      - {id: 32, cat: TV/Anime, desc: "Anime Disney"}
      - {id: 33, cat: TV/Anime, desc: "Anime"}
@@ -56,11 +56,13 @@
      - {id: 45, cat: Audio, desc: "Musica Compilation"}
      - {id: 46, cat: Audio/Video, desc: "Musica Video Clip"}
      - {id: 58, cat: Audio, desc: "Musica Discografie"}
+      - {id: 97, cat: Audio/Lossless, desc: "Musica Flac"}
      # SALA GIOCHI
      - {id: 47, cat: PC/Games, desc: "PC Games"}
      - {id: 48, cat: Console/PS3, desc: "PC Giochi PS2-PS3"}
      - {id: 49, cat: Console/Wii, desc: "PC Giochi Nintendo Wii"}
      - {id: 50, cat: Console/Xbox, desc: "PC Giochi Xbox"}
+      - {id: 51, cat: Console/PSP, desc: "PC Giochi PSP"}
      - {id: 52, cat: Console/3DS, desc: "PC Giochi DS-DS3"}
      # SOFTWARE
      - {id: 54, cat: PC, desc: "PC Programmi Windows"}
@@ -117,10 +119,10 @@
  download:
    before:
      path: thanks.php
-      method: "post"
+      method: post
      inputs:
        infohash: "{{ .DownloadUri.Query.id }}"
-        thanks: "1"
+        thanks: 1
        rndval: "1487013827343"
    selector: a[href^="download.php?id="]
    attribute: href
@@ -160,6 +162,7 @@
        args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
      - name: re_replace # S01E01 to 1 1
        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
+    # does not support imdbid search and does not return imdb link in results

    rows:
      selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
--- a/src/Jackett.Common/Definitions/hachede.yml
+++ b/src/Jackett.Common/Definitions/hachede.yml
@@ -98,7 +98,7 @@
      - {id: 130, cat: Movies/3D, desc: "H265 3D"}
      - {id: 128, cat: Movies/HD, desc: "H265 Animación"}
      - {id: 129, cat: Movies/HD, desc: "H265 Documentales"}
-      - {id: 125, cat: Movies, desc: "UHD"}
+      - {id: 125, cat: Movies/UHD, desc: "UHD"}
      - {id: 131, cat: Movies/UHD, desc: "UHD Películas"}
      - {id: 132, cat: TV/UHD, desc: "UHD Series"}

--- a/src/Jackett.Common/Definitions/hdme.yml
+++ b/src/Jackett.Common/Definitions/hdme.yml
@@ -10,33 +10,33 @@

  caps:
    categorymappings:
-      - {id: 24, cat: TV/Anime      , desc: "Anime"}
-      - {id: 25, cat: PC/0day       , desc: "Appz"}
-      - {id: 47, cat: Movies/HD     , desc: "AVCHD"}
+      - {id: 24, cat: TV/Anime, desc: "Anime"}
+      - {id: 25, cat: PC/0day, desc: "Appz"}
+      - {id: 47, cat: Movies/HD, desc: "AVCHD"}
      - {id: 26, cat: Movies/BluRay , desc: "Bluray"}
-      - {id: 54, cat: Movies/HD     , desc: "dbREMUX"}
-      - {id: 41, cat: Movies/HD     , desc: "Documentaries"}
-      - {id: 50, cat: Movies/HD     , desc: "FourGHD"}
-      - {id: 44, cat: Movies/HD     , desc: "HDME"}
+      - {id: 54, cat: Movies/HD, desc: "dbREMUX"}
+      - {id: 41, cat: Movies/HD, desc: "Documentaries"}
+      - {id: 50, cat: Movies/HD, desc: "FourGHD"}
+      - {id: 44, cat: Movies/HD, desc: "HDME"}
      - {id: 28, cat: Audio/Lossless, desc: "HQ Music"}
-      - {id: 48, cat: Movies/HD     , desc: "iCandy"}
-      - {id: 45, cat: Movies/HD     , desc: "INtL"}
-      - {id: 29, cat: Other         , desc: "Misc"}
+      - {id: 48, cat: Movies/HD, desc: "iCandy"}
+      - {id: 45, cat: Movies/HD, desc: "INtL"}
+      - {id: 29, cat: Other, desc: "Misc"}
      - {id: 49, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 30, cat: Movies/HD     , desc: "Movie 1080i"}
-      - {id: 31, cat: Movies/HD     , desc: "Movie 1080p"}
-      - {id: 32, cat: Movies/HD     , desc: "Movie 720p"}
-      - {id: 33, cat: Audio/Video   , desc: "Music Videos"}
-      - {id: 34, cat: TV            , desc: "Packs"}
-      - {id: 53, cat: Movies/HD     , desc: "Remux"}
-      - {id: 56, cat: Movies/HD     , desc: "RUXi"}
-      - {id: 55, cat: Movies/HD     , desc: "SiNiSteR"}
-      - {id: 36, cat: TV/Sport      , desc: "Sports"}
-      - {id: 37, cat: TV/HD         , desc: "TV Series 1080i"}
-      - {id: 38, cat: TV/HD         , desc: "TV Series 1080p"}
-      - {id: 39, cat: TV/HD         , desc: "TV Series 720p"}
-      - {id: 57, cat: Movies        , desc: "UHD 2160p"}
-      - {id: 40, cat: XXX           , desc: "XXX"}
+      - {id: 30, cat: Movies/HD, desc: "Movie 1080i"}
+      - {id: 31, cat: Movies/HD, desc: "Movie 1080p"}
+      - {id: 32, cat: Movies/HD, desc: "Movie 720p"}
+      - {id: 33, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 34, cat: TV, desc: "Packs"}
+      - {id: 53, cat: Movies/HD, desc: "Remux"}
+      - {id: 56, cat: Movies/HD, desc: "RUXi"}
+      - {id: 55, cat: Movies/HD, desc: "SiNiSteR"}
+      - {id: 36, cat: TV/Sport, desc: "Sports"}
+      - {id: 37, cat: TV/HD, desc: "TV Series 1080i"}
+      - {id: 38, cat: TV/HD, desc: "TV Series 1080p"}
+      - {id: 39, cat: TV/HD, desc: "TV Series 720p"}
+      - {id: 57, cat: Movies/UHD, desc: "UHD 2160p"}
+      - {id: 40, cat: XXX, desc: "XXX"}

    modes:
      search: [q]
--- a/src/Jackett.Common/Definitions/hdreactor.yml
+++ b/src/Jackett.Common/Definitions/hdreactor.yml
@@ -14,7 +14,7 @@
  caps:
    categorymappings:
      - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
-      - {id: 5006, cat: Movies/HD, desc: "Кино 4K"}
+      - {id: 5006, cat: Movies/UHD, desc: "Кино 4K"}
      - {id: 2007, cat: Movies/Other, desc: "Анимация"}
      - {id: 2006, cat: TV/HD, desc: "Сериалы"}
      - {id: 5005, cat: TV/Sport, desc: "Спорт"}
--- a/src/Jackett.Common/Definitions/horrorsite.yml
+++ b/src/Jackett.Common/Definitions/horrorsite.yml
@@ -0,0 +1,153 @@
+---
+  site: horrorsite
+  name: Horror Site
+  description: "Horror Site is a Hungarian Private site for MOVIES / TV"
+  language: hu-hu
+  type: private
+  encoding: iso-8859-1
+  links:
+    - https://horror-site.net/
+
+  caps:
+    categorymappings:
+      - {id: 76, cat: PC/Phone-Android, desc: "Android"}
+      - {id: 81, cat: Movies/BluRay, desc: "BDRip"}
+      - {id: 82, cat: Movies/SD, desc: "Cam"}
+      - {id: 61, cat: Books, desc: "eBook/Hun"}
+      - {id: 80, cat: Movies, desc: "Film /PACK"}
+      - {id: 38, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+      - {id: 71, cat: Movies/HD, desc: "Film/HD/Hun"}
+      - {id: 40, cat: Movies/SD, desc: "Film/XviD/Eng"}
+      - {id: 39, cat: Movies/SD, desc: "Film/XviD/Hun"}
+      - {id: 59, cat: XXX, desc: "Film/XXX"}
+      - {id: 52, cat: PC/Games, desc: "Játék/RIP/ISO"}
+      - {id: 75, cat: Other, desc: "Képek"}
+      - {id: 74, cat: XXX, desc: "Képek/XXX"}
+      - {id: 47, cat: Audio/Video, desc: "Klip"}
+      - {id: 50, cat: Audio/MP3, desc: "Mp3/Eng"}
+      - {id: 49, cat: Audio/MP3, desc: "Mp3/Hun"}
+      - {id: 45, cat: PC, desc: "Program ISO /RIP"}
+      - {id: 43, cat: TV, desc: "Rajzfilm/Hun"}
+      - {id: 57, cat: TV, desc: "Sorozat/Eng"}
+      - {id: 58, cat: TV, desc: "Sorozat/Hun"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
+    - name: info
+      type: info
+      label: Results Per Page
+      default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      post_kuldes: engedelyezve
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table.browse:contains("hiba")
+    test:
+      path: /
+      selector: a[href="/logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 active&dead 2 dead 3 recomended 4 double 5 free
+      incldead: 1
+      # 0 name 1 descr 2 both
+      blah: 0
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+      # does not support imdbid search
+
+    rows:
+      selector: table > tbody > tr.sor:has(a[href^="/download.php/"])
+#    error:
+#      - selector: div.content:contains("Meg van vonva a letöltési jogod")
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="/download.php/"]
+        attribute: href
+      imdb:
+        selector: a[href*="www.imdb.com/title/tt"]
+        optional: true
+        attribute: href
+      banner:
+        selector: a[onmouseover]
+        optional: true
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?) "
+      files:
+        selector: td:nth-last-child(8)
+      date:
+        selector: td:nth-last-child(6)
+        filters:
+          - name: regexp
+            args: (\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2})
+          - name: replace
+            args: ["\xA0", " "]
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      size:
+        selector: td:nth-last-child(5) > u
+      grabs:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        case:
+          img[src="../pic/freedownload.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+#          img[src="../pic/????????.gif"]: 2 # there is a double (according to incldead=4) but not found at this time.
+          "*": 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/insanetracker.yml
+++ b/src/Jackett.Common/Definitions/insanetracker.yml
@@ -15,26 +15,26 @@
      - {id: 41, cat: Movies/SD, desc: "Film/Hun/SD"}
      - {id: 15, cat: Movies/DVD, desc: "Film/Hun/DVD-R"}
      - {id: 27, cat: Movies/HD, desc: "Film/Hun/HD"}
-      - {id: 44, cat: Movies/HD, desc: "Film/Hun/UHD"}
+      - {id: 44, cat: Movies/UHD, desc: "Film/Hun/UHD"}
      - {id: 2, cat: Books, desc: "eBook/Hun"}
      - {id: 7, cat: TV/SD, desc: "Sorozat/Eng"}
      - {id: 39, cat: TV/HD, desc: "Sorozat/Eng/HD"}
      - {id: 42, cat: Movies/SD, desc: "Film/Eng/SD"}
      - {id: 14, cat: Movies/DVD, desc: "Film/Eng/DVD-R"}
      - {id: 25, cat: Movies/HD, desc: "Film/Eng/HD"}
-      - {id: 45, cat: Movies/HD, desc: "Film/Eng/UHD"}
+      - {id: 45, cat: Movies/UHD, desc: "Film/Eng/UHD"}
      - {id: 1, cat: Books, desc: "eBook/Eng"}
      - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
      - {id: 21, cat: XXX, desc: "XXX"}
      - {id: 4, cat: PC/ISO, desc: "Program/ISO"}
-      - {id: 19, cat: Audio/Other, desc: "Zene/Hun"}
+      - {id: 19, cat: Audio/MP3, desc: "Zene/Hun"}
      - {id: 37, cat: Audio/Lossless, desc: "Lossless/Hun"}
      - {id: 9, cat: PC/Games, desc: "Játék/ISO"}
      - {id: 43, cat: Console, desc: "Játék/Konzol"}
      - {id: 29, cat: Other, desc: "Képek"}
      - {id: 28, cat: XXX/Imageset, desc: "XXX Képek"}
      - {id: 3, cat: PC/0day, desc: "Program/Egyéb"}
-      - {id: 18, cat: Audio/Other, desc: "Zene/Eng"}
+      - {id: 18, cat: Audio/MP3, desc: "Zene/Eng"}
      - {id: 26, cat: Audio/Lossless, desc: "Lossless/Eng"}
      - {id: 11, cat: PC/Games, desc: "Játék/Rip"}
      - {id: 13, cat: PC/Phone-Other, desc: "Mobil"}
@@ -45,13 +45,37 @@
      tv-search: [q, season, ep, imdbid]
      movie-search: [q, imdbid]

+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: login.php
    method: post
    inputs:
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
-      notsecure: "1"
+      notsecure: 1
    error:
      - selector: div.login_error_content_text
    test:
@@ -63,7 +87,10 @@
    inputs:
      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      t: all
+      # 0 active 1 both 2 dead
+      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"

    rows:
      selector: table.torrenttable > tbody > tr:has(td.torrentmain)
@@ -123,8 +150,9 @@
        filters:
          - name: replace
            args: [".", ""]
+          - name: replace
+            args: [" ", ""]
        remove: div.uploader, div.moderation, a.leftborder
-
      date:
        selector: td.center.date
        filters:
@@ -142,5 +170,6 @@
          "*" : 1
      description:
        selector: div.contenttext
+        optional: true
        remove: div.contenttitle
-# engine tbd
+# custom v2.0b
--- a/src/Jackett.Common/Definitions/sktorrent.yml
+++ b/src/Jackett.Common/Definitions/sktorrent.yml
@@ -28,7 +28,7 @@
      - {id: 5, cat: Movies, desc: "Filmy Kreslené"}
      - {id: 19, cat: Movies/HD, desc: "HD Filmy"}
      - {id: 29, cat: Movies/3D, desc: "3D Blu-ray"}
-      - {id: 43, cat: Movies/HD, desc: "UHD Filmy"}
+      - {id: 43, cat: Movies/UHD, desc: "UHD Filmy"}
      - {id: 28, cat: Movies/BluRay, desc: "Blu-ray"}
      - {id: 18, cat: PC/Games, desc: "Hry na Windows"}
      - {id: 30, cat: PC/Games, desc: "Hry na Konzole"}
@@ -85,9 +85,9 @@
          - name: diacritics
            args: replace
          - name: replace
-            args: ["serie", ""] 
+            args: ["serie", ""]
          - name: replace
-            args: ["Serie", ""] 
+            args: ["Serie", ""]
          - name: re_replace
            args: ["(\\d{2})\\.", "S$1"]
          - name: re_replace
--- a/src/Jackett.Common/Definitions/torrent-explosiv.yml
+++ b/src/Jackett.Common/Definitions/torrent-explosiv.yml
@@ -10,59 +10,59 @@

  caps:
    categorymappings:
-      # App						
-      - {id: 12, cat: PC/0day, desc: "App Win"}						
-      - {id: 10, cat: PC/Mac, desc: "App Mac"}						
+      # App
+      - {id: 12, cat: PC/0day, desc: "App Win"}
+      - {id: 10, cat: PC/Mac, desc: "App Mac"}
      - {id: 127, cat: PC/Phone-Android, desc: "App Android"}
-      # Doku						
-      - {id: 177, cat: TV/Documentary, desc: "Doku HD "}						
+      # Doku
+      - {id: 177, cat: TV/Documentary, desc: "Doku HD "}
      - {id: 178, cat: TV/Documentary, desc: "Doku SD "}
-      # Game						
-      - {id: 263, cat: Console/Other, desc: "Game Sonstiege"}						
-      - {id: 264, cat: Console, desc: "Game PDA / Handy"}						
-      - {id: 265, cat: Console/PSP, desc: "Game PlayStation"}						
-      - {id: 299, cat: Console, desc: "Game Wimmelbild"}						
+      # Game
+      - {id: 263, cat: Console/Other, desc: "Game Sonstiege"}
+      - {id: 264, cat: Console, desc: "Game PDA / Handy"}
+      - {id: 265, cat: Console/PSP, desc: "Game PlayStation"}
+      - {id: 299, cat: Console, desc: "Game Wimmelbild"}
      - {id: 17, cat: PC/Games, desc: "Game PC"}
-      # Movie						
-      - {id: 277, cat: Movies, desc: "Movie Pack"}						
-      - {id: 300, cat: Movies/3D, desc: "Movie 3D"}						
-      - {id: 258, cat: Movies/Uhd, desc: "Movie UHD "}						
-      - {id: 262, cat: Movies/DVD, desc: "Movie DVD-R"}						
-      - {id: 301, cat: Movies/BluRay, desc: "Movie Bluray"}						
-      - {id: 28, cat: Movies/SD, desc: "Movie SD "}						
+      # Movie
+      - {id: 277, cat: Movies, desc: "Movie Pack"}
+      - {id: 300, cat: Movies/3D, desc: "Movie 3D"}
+      - {id: 258, cat: Movies/UHD, desc: "Movie UHD "}
+      - {id: 262, cat: Movies/DVD, desc: "Movie DVD-R"}
+      - {id: 301, cat: Movies/BluRay, desc: "Movie Bluray"}
+      - {id: 28, cat: Movies/SD, desc: "Movie SD "}
      - {id: 32, cat: Movies/HD, desc: "Movie HD "}
-      # Music						
-      - {id: 48, cat: Audio, desc: "Music Album"}						
-      - {id: 288, cat: Audio, desc: "Music Discographie"}						
-      - {id: 201, cat: Audio/Lossless, desc: "Music FLAC"}						
-      - {id: 121, cat: Audio/MP3, desc: "Music MP3"}						
-      - {id: 124, cat: Audio, desc: "Music Mixe"}						
-      - {id: 55, cat: Audio/Video, desc: "Music Video SD"}						
-      - {id: 53, cat: Audio, desc: "Music Sampler"}						
-      - {id: 52, cat: Audio, desc: "Music Pack"}						
-      - {id: 49, cat: Audio, desc: "Music Charts/Single"}						
+      # Music
+      - {id: 48, cat: Audio, desc: "Music Album"}
+      - {id: 288, cat: Audio, desc: "Music Discographie"}
+      - {id: 201, cat: Audio/Lossless, desc: "Music FLAC"}
+      - {id: 121, cat: Audio/MP3, desc: "Music MP3"}
+      - {id: 124, cat: Audio, desc: "Music Mixe"}
+      - {id: 55, cat: Audio/Video, desc: "Music Video SD"}
+      - {id: 53, cat: Audio, desc: "Music Sampler"}
+      - {id: 52, cat: Audio, desc: "Music Pack"}
+      - {id: 49, cat: Audio, desc: "Music Charts/Single"}
      - {id: 303, cat: Audio, desc: "Music Soundtrack"}
-      # Tv Serien						
-      - {id: 286, cat: TV/Anime, desc: "Tv Serien Anime HD"}						
-      - {id: 226, cat: TV/SD, desc: "Tv Serien SD"}						
-      - {id: 209, cat: TV/HD, desc: "Tv Serien HD "}						
-      - {id: 287, cat: TV/Anime, desc: "Tv Serien Anime SD"}						
+      # Tv Serien
+      - {id: 286, cat: TV/Anime, desc: "Tv Serien Anime HD"}
+      - {id: 226, cat: TV/SD, desc: "Tv Serien SD"}
+      - {id: 209, cat: TV/HD, desc: "Tv Serien HD "}
+      - {id: 287, cat: TV/Anime, desc: "Tv Serien Anime SD"}
      - {id: 273, cat: TV, desc: "Tv Serien Pack"}
-      # Sport						
-      - {id: 62, cat: TV/Sport, desc: "Sport SD "}						
+      # Sport
+      - {id: 62, cat: TV/Sport, desc: "Sport SD "}
      - {id: 282, cat: TV/Sport, desc: "Sport HD"}
-      # Sonstiges						
-      - {id: 216, cat: Books, desc: "Sonstiges Pdf"}						
-      - {id: 202, cat: Books/Magazines, desc: "Sonstiges Magazine"}						
-      - {id: 217, cat: Books, desc: "Sonstiges EPaper"}						
-      - {id: 269, cat: Books, desc: "Sonstiges Hörspiel"}						
-      - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges A-Book"}						
+      # Sonstiges
+      - {id: 216, cat: Books, desc: "Sonstiges Pdf"}
+      - {id: 202, cat: Books/Magazines, desc: "Sonstiges Magazine"}
+      - {id: 217, cat: Books, desc: "Sonstiges EPaper"}
+      - {id: 269, cat: Books, desc: "Sonstiges Hörspiel"}
+      - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges A-Book"}
      - {id: 96, cat: Books/Ebook, desc: "Sonstiges E-Book"}
-      # XXX						
-      - {id: 73, cat: XXX, desc: "XXX HD "}						
-      - {id: 75, cat: XXX, desc: "XXX Pack"}						
-      - {id: 76, cat: XXX, desc: "XXX SD "}						
-      - {id: 147, cat: XXX, desc: "XXX Bilder//Clips"}						
+      # XXX
+      - {id: 73, cat: XXX, desc: "XXX HD "}
+      - {id: 75, cat: XXX, desc: "XXX Pack"}
+      - {id: 76, cat: XXX, desc: "XXX SD "}
+      - {id: 147, cat: XXX, desc: "XXX Bilder//Clips"}
      - {id: 302, cat: XXX, desc: "XXX DVD-R"}

    modes:
--- a/src/Jackett.Common/Definitions/torrentsectorcrew.yml
+++ b/src/Jackett.Common/Definitions/torrentsectorcrew.yml
@@ -42,8 +42,8 @@
      - {id: 20, cat: Movies/DVD, desc: "Filme DVDR"}
      - {id: 120, cat: Movies/Foreign, desc: "Filme Int."}
      - {id: 119, cat: Movies, desc: "Filme Remux"}
-      - {id: 121, cat: Movies/HD, desc: "Filme UHD"}
-      - {id: 124, cat: Movies/HD, desc: "Filme UHD Remux"}
+      - {id: 121, cat: Movies/UHD, desc: "Filme UHD"}
+      - {id: 124, cat: Movies/UHD, desc: "Filme UHD Remux"}
      - {id: 36, cat: Movies/HD, desc: "Filme SD"}
      # Serien
      - {id: 112, cat: TV/Anime, desc: "Serien Anime"}
@@ -115,7 +115,7 @@
      - selector: "#login_box_desc"
    test:
      path: my.php
-      
+
  ratio:
    path: my.php
    selector: td.navi_top:contains("Deine Ratio:")
--- a/src/Jackett.Common/Definitions/world-of-tomorrow.yml
+++ b/src/Jackett.Common/Definitions/world-of-tomorrow.yml
@@ -18,7 +18,7 @@
      - {id: 11, cat: Movies/SD, desc: "DVD-R"}
      - {id: 60, cat: Movies/HD, desc: "HDTV"}
      - {id: 62, cat: Movies/SD, desc: "SD"}
-      - {id: 89, cat: Movies/HD, desc: "UHD"}
+      - {id: 89, cat: Movies/UHD, desc: "UHD"}
      - {id: 91, cat: Movies, desc: "Packs"}

      # Serien
@@ -27,7 +27,7 @@
      - {id: 77, cat: TV/SD, desc: "Serien-SD"}
      - {id: 78, cat: TV/HD, desc: "Serien-720p"}
      - {id: 79, cat: TV/HD, desc: "Serien-1080p"}
-      - {id: 95, cat: TV/HD, desc: "Serien-2160p"}
+      - {id: 95, cat: TV/UHD, desc: "Serien-2160p"}

      # Games
      - {id: 4, cat: PC/Games, desc: "Windows"}
--- a/src/Jackett.Common/Indexers/CardigannIndexer.cs
+++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -1102,7 +1102,12 @@ namespace Jackett.Common.Indexers
                    case "strdump":
                        // for debugging
                        var DebugData = Data.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\xA0", "\\xA0");
-                        logger.Debug(string.Format("CardigannIndexer ({0}): strdump: {1}", ID, DebugData));
+                        var strTag = (string)Filter.Args;
+                        if (strTag != null)
+                            strTag = string.Format("({0}):", strTag);
+                        else
+                            strTag = ":";
+                        logger.Debug(string.Format("CardigannIndexer ({0}): strdump{1} {2}", ID, strTag, DebugData));
                        break;
                    default:
                        break;
Author	SHA1	Message	Date
Garfield69	943ddba22b	worldoftomorrow: fix cat 95	2020-03-20 20:23:02 +13:00
Garfield69	79fa4da2bf	arabafenice: fix cats 47 and 40	2020-03-20 20:22:12 +13:00
Garfield69	da7589838f	downloadville: update categories	2020-03-20 20:20:03 +13:00
Garfield69	2a4be14998	1337x: fix cats 54, 70, 76	2020-03-20 20:13:16 +13:00
Garfield69	c81a2163ce	sktorrent: fix cat 43	2020-03-20 20:09:13 +13:00
Garfield69	d3ada91c3a	hdreactor: fix cat 5006	2020-03-20 20:08:10 +13:00
Garfield69	653dcca2af	worldoftomorrow: fix cat 89	2020-03-20 20:06:41 +13:00
Garfield69	c2a24cae22	hdme: fix cat 57	2020-03-20 20:05:32 +13:00
Garfield69	babd49c082	torrent-explosive: fix cat 258	2020-03-20 20:02:15 +13:00
Garfield69	1007366471	torrentsectorcrew: fix cat 121 and 124	2020-03-20 20:00:40 +13:00
Garfield69	e747d4e2fa	hachede: fix cat 125	2020-03-20 19:58:00 +13:00
Garfield69	efab277714	generationfree: fix cat 1 and 130	2020-03-20 19:56:38 +13:00
Garfield69	7f8cfa7eca	insanetracker: update categories add config sort options add includedead fix grabs > 999 description is optional add engine tag	2020-03-20 19:40:09 +13:00
Garfield69	6abc8adcd1	horrorsite: update engine tag	2020-03-20 16:54:52 +13:00
Garfield69	8e1d171937	girotorrent: update categories	2020-03-20 16:54:26 +13:00
Garfield69	9f433dd0de	generationfree: update categories	2020-03-20 16:53:50 +13:00
Garfield69	65da3e83af	add horrorsite a Hungarian private tracker. resolves #7736	2020-03-20 13:04:47 +13:00
Garfield69	21250c275f	galeriens:	2020-03-20 12:38:21 +13:00
Garfield69	e612c111c6	bithorlo: add cookie alert	2020-03-20 12:38:02 +13:00
Garfield69	e24c95d4e2	Revert "baibako: switch to private." This reverts commit `6e8726c197`.	2020-03-20 07:09:41 +13:00
Garfield69	2920caf7c0	film-paleis: add imdbid search. #4859 also add banner add freeleech DLVF	2020-03-19 21:01:50 +13:00
Garfield69	f73a047ed9	extremetorrents: update categories	2020-03-19 18:52:01 +13:00
Garfield69	313ade66f4	btnext: add imdbid search. #4859 also update categories add info about uread mail add imdb link in results fix date parsing	2020-03-19 15:51:56 +13:00
Garfield69	392a0d7b7e	cardigannindexer: add optional arg to strdump when you are using multiple strdumps it is useful to tag them with an unique eyecatcher so you can tell them apart in the enhanced log.	2020-03-19 09:09:58 +13:00
Garfield69	324afbcd0f	fanoin: add imdbid search. #4859 also add config sort options add uhd category add movie-search fix date selectors no engine tag	2020-03-19 06:39:08 +13:00
Garfield69	7f003427fd	carpathians: add imdbid search. #4859 also add config sort options add x4 ULVF add engine tag	2020-03-19 05:55:36 +13:00