teamos: switch to cookie method

* bitru: remove advertising setting
http://bitru.org/browse.php?s=&rek=yes&sort= redirects to https://yandex.ru/

Tested, working

* bitru: fix march date
Co-authored-by: garfield69 <garfield69@outlook.com>

src/Jackett.Common/Definitions/bitru.yml

@@ -30,9 +30,9 @@ settings:
   - name: adverts
     type: select
     label: Include Advertising
-    default: "yes"
+    default: "_"
     options:
-      "yes": "yes"
+      "_": "yes"
       "no": "no"
   - name: sort
     type: select
@@ -48,8 +48,8 @@ search:
     - path: browse.php
   inputs:
     s: "{{ .Keywords }}"
-    rek: "{{ .Config.adverts }}"
-    sort: "{{ re_replace .Config.sort \"_\" \"\"}}"
+    rek: "{{ re_replace .Config.adverts \"_\" \"\" }}"
+    sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
 
   rows:
     selector: table.browse-list > tbody > tr
@@ -111,7 +111,7 @@ search:
         - name: replace
           args: ["февраля", "February"]
         - name: replace
-          args: ["марта ", "March"]
+          args: ["марта", "March"]
         - name: replace
           args: ["апреля", "April"]
         - name: replace

src/Jackett.Common/Definitions/btsow.yml

@@ -6,13 +6,14 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.space/
+  - https://btsow.site/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
   - https://btsow.club/
   - https://bteve.com/
   - https://btsow.fun/
+  - https://btsow.space/
 
 caps:
   categories:

src/Jackett.Common/Definitions/hdforever.yml

@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
   - https://hdf.world/
+certificates:
+  - 27c3fedf8c79ea2a90e9b09353053080f861364b # expired 13 July 2020
 
 settings:
   - name: username

src/Jackett.Common/Definitions/kickasstorrent.yml

@@ -7,12 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://katcr.co/
-  - https://kat.root.yt/
-  - https://kat.unblockit.id/
-  - https://katcr.unblocked.bar/
-  - https://katcr.proxyportal.pw/
-  - https://katcr.uk-unblock.pro/
+  - https://newkatcr.co/
 legacylinks:
   - https://kickasstorrent.cr/ # possible 3rd kickasstorrent site/clone?
   - https://katcr.to/ # possible 3rd kickasstorrent site/clone?
@@ -25,6 +20,12 @@ legacylinks:
   - https://kat.unblockit.me/
   - https://kat.unblockit.pw/
   - https://kickasstorrents.unblockninja.com/ # down
+  - https://katcr.co/
+  - https://kat.root.yt/
+  - https://kat.unblockit.id/
+  - https://katcr.unblocked.bar/
+  - https://katcr.proxyportal.pw/
+  - https://katcr.uk-unblock.pro/
 
 caps:
   categorymappings:
@@ -111,7 +112,7 @@ settings: []
 
 search:
   paths:
-    - path: "{{ if .Keywords }}katsearch/page/1/{{ .Keywords }}{{else}}category/latest/page/1{{end}}"
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}{{ else }}v2/category/latest/1/6/{{ end }}"
 
   rows:
     selector: table.torrents_table > tbody > tr
@@ -128,7 +129,10 @@ search:
       selector: a[href^="magnet:?xt="]
       attribute: href
     category:
+      text: 138
+    category|noappend:
       selector: span.torrents_table__upload_info
+      optional: true
       case:
         ":has(a:contains(\"Anime\")):contains(\"English Translated\")": 118
         ":has(a:contains(\"Anime\")):contains(\"Other\")": 133
@@ -208,19 +212,13 @@ search:
     files:
       selector: td[data-title="Files"]
     date:
-      selector: td[data-title="Age"]:contains("-")
+      selector: td[data-title="Age"][title]
       attribute: title
-      optional: true
       filters:
+        - name: replace
+          args: ["(UTC)", "+00:00"]
         - name: dateparse
-          args: "2006-01-02"
-    date:
-      selector: td[data-title="Age"]:not(:contains("-"))
-      attribute: title
-      optional: true
-      filters:
-        - name: dateparse
-          args: "2006-01-02 15:04:05"
+          args: "2006-01-02 15:04:05 -07:00"
     seeders:
       selector: td[data-title="Seed"]
     leechers:

src/Jackett.Common/Definitions/liaorencili.yml

@@ -6,32 +6,61 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://www.lrcili1.xyz/
-  - https://www.lrcili2.xyz/
   - https://www.lrcili3.xyz/
   - https://www.lrcili4.xyz/
   - https://www.lrcili5.xyz/
   - https://www.lrcili6.xyz/
-  - https://www.lrcili7.xyz/
   - https://www.lrcili8.xyz/
   - https://www.lrcili9.xyz/
   - https://www.lrcili10.xyz/
-legacylinks:
-  - http://www.cili180.com/
-  - http://www.cilijj.xyz/
-  - https://www.cilijj.xyz/
-  - https://www.liaorenso.xyz/
-  - https://www.liaorenso11.xyz/
-  - https://www.liaorenso12.xyz/
+  - https://www.liaorenso1.xyz/
+  - https://www.liaorenso2.xyz/
+  - https://www.liaorenso3.xyz/
+  - https://www.liaorenso4.xyz/
+  - https://www.liaorenso5.xyz/
+  - https://www.liaorenso6.xyz/
+  - https://www.liaorenso7.xyz/
+  - https://www.liaorenso8.xyz/
+  - https://www.liaorenso9.xyz/
   - https://www.liaorenso13.xyz/
   - https://www.liaorenso14.xyz/
   - https://www.liaorenso15.xyz/
   - https://www.liaorenso16.xyz/
   - https://www.liaorenso17.xyz/
   - https://www.liaorenso18.xyz/
+  - http://www.lrsoso1.xyz/
+  - http://www.lrsoso2.xyz/
+  - http://www.lrsoso3.xyz/
+  - http://www.lrsoso4.xyz/
+  - http://www.lrsoso5.xyz/
+  - http://www.lrsoso6.xyz/
+  - http://www.lrsoso7.xyz/
+  - http://www.lrsoso8.xyz/
+  - http://www.lrsoso9.xyz/
+  - http://www.lrsoso10.xyz/
+  - http://www.cilinb1.xyz/
+  - http://www.cilinb2.xyz/
+  - http://www.cilinb3.xyz/
+  - http://www.cilinb4.xyz/
+  - http://www.cilinb5.xyz/
+  - http://www.cilinb6.xyz/
+  - http://www.cilinb7.xyz/
+  - http://www.cilinb8.xyz/
+  - http://www.cilinb9.xyz/
+  - http://www.cilinb10.xyz/
+  - http://www.cilijj.xyz/
+legacylinks:
+  - http://www.cili180.com/
+  - https://www.cilijj.xyz/
+  - https://www.liaorenso.xyz/
+  - https://www.liaorenso11.xyz/
+  - https://www.liaorenso12.xyz/
   - https://www.liaorenso19.xyz/
   - http://lrcili.xyz/ # proxy list only
   - http://www.lrcili.xyz/ # proxy list only
+  - https://www.lrcili1.xyz/ # ERR_CONNECTION_TIMED_OUT
+  - https://www.lrcili2.xyz/ # ERR_CONNECTION_TIMED_OUT
+  - https://www.lrcili7.xyz/ # 404 Not Found
 
 caps:
   categories:

src/Jackett.Common/Definitions/teamos.yml

@@ -96,15 +96,31 @@ caps:
   modes:
     search: [q]
 
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+# login:
+#  path: login/login
+#  method: post
+#  inputs:
+#    login: "{{ .Config.username }}"
+#    password: "{{ .Config.password }}"
+#    remember: 1
+#  error:
+#    - selector: div.blockMessage--error
+#  test:
+#    path: /
+#    selector: a[href="/account/"]
 login:
-  path: login/login
-  method: post
+  method: cookie
   inputs:
-    login: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: 1
-  error:
-    - selector: div.blockMessage--error
+    cookie: "{{ .Config.cookie }}"
   test:
     path: /
     selector: a[href="/account/"]

src/Jackett.Common/Definitions/torrentz2.yml

@@ -8,6 +8,8 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://torrentz2.is/
+  - https://torrentsmirror.com/
+  - https://torrentz.pl/
   - https://torrentz.unblockit.id/
   - https://torrentz2.unblocked.bar/
   - https://torrentz2.proxyportal.pw/

src/Jackett.Common/Definitions/xfsub.yml

@@ -6,8 +6,9 @@ language: zh-cn
 type: public
 encoding: UTF-8
 links:
-  - https://bt.xfsub.org/
   - http://share.xfapi.top:88/
+legacylinks:
+  - https://bt.xfsub.org/
 
 settings: []