Merge branch 'master' into feature/cloudproxy

README.md

@@ -316,7 +316,6 @@ Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) be
  * EpubLibre
  * eShareNet
  * eStone (XiDER, BeLoad)
- * Ethor.net (Thor's Land)
  * ExoticaZ (YourExotic)
  * ExtremeBits
  * ExtremeTorrents [![(invite needed)][inviteneeded]](#)

src/Jackett.Common/Definitions/brasiltracker.yml

@@ -133,8 +133,8 @@ search:
         - name: append
           args: " {{ .Result.title_details }}"
     minimumratio:
-      text: 0.6
+      text: 1.0
     minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # Project Gazelle

src/Jackett.Common/Definitions/fouducinema.yml

@@ -1,9 +1,9 @@
 ---
 id: fouducinema
 name: Fou-Du-Cinema
-description: "Fou-Du-Cinema (FdC) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+description: "Fou-Du-Cinema (FdC) is a FRENCH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: fr-fr
-type: private
+type: semi-private
 encoding: UTF-8
 links:
   - https://fou-du-cinema.net/

src/Jackett.Common/Definitions/gigatorrents.yml

@@ -165,6 +165,11 @@ search:
       filters:
         - name: trim
           args: "x"
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
     date:
       selector: td:nth-child(2)
       remove: a

src/Jackett.Common/Definitions/greekdiamond.yml

@@ -182,4 +182,7 @@ search:
       text: 1
     minimumratio:
       text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # xbtit dt fm v20.0

src/Jackett.Common/Definitions/hddisk.yml

@@ -165,6 +165,8 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 0.8
     description:
       selector: td:nth-child(2)
       remove: a, img

src/Jackett.Common/Definitions/hdturk.yml

@@ -162,4 +162,9 @@ search:
       case:
         img[src$="/x2.gif"]: 2
         "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3.75days (as seconds =  3.75 x 24 x 60 x 60)
+      text: 324000
 # TS Special Edition v.7.5

src/Jackett.Common/Definitions/hdzone.yml

@@ -191,6 +191,12 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 1.2
+# does not appear to be implemented, no h&r tag found
+#     minimumseedtime:
+#       # 14 days (as seconds = 2 x 24 x 60 x 60)
+#       text: 1209600
     description:
       selector: td:nth-child(2)
       remove: a, img

src/Jackett.Common/Definitions/keepfriends.yml

@@ -37,19 +37,13 @@ caps:
     music-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 2facode
-    type: text
-    label: 2FA code
-  - name: info_2fa
+    label: Cookie
+  - name: info
     type: info
-    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the KeepFriends Web Site. Otherwise just leave it empty."
+    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>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -80,15 +74,9 @@ settings:
     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
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    token: "{{ .Config.2facode }}"
-    logout: ""
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href*="logout.php"]

src/Jackett.Common/Definitions/polishsource.yml

@@ -158,4 +158,7 @@ search:
       text: 0
     uploadvolumefactor:
       text: 1
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # engine n/a

src/Jackett.Common/Definitions/torrentview.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentview23.net/
+  - https://torrentview24.com/
 legacylinks:
   - https://torrentview.net/
   - https://torrentview3.net/
@@ -30,6 +30,7 @@ legacylinks:
   - https://torrentview20.net/
   - https://torrentview21.net/
   - https://torrentview22.net/
+  - https://torrentview23.net/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/uniongang.yml

@@ -120,4 +120,6 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.3
 # engine tbd

src/Jackett.Common/Indexers/DigitalCore.cs

@@ -164,7 +164,7 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
                     var tags = new List<string>();
 
                     release.MinimumRatio = 1.1;
-                    release.MinimumSeedTime = 172800; // 48 hours
+                    release.MinimumSeedTime = 432000; // 120 hours
                     release.Title = row.name;
                     release.Category = MapTrackerCatToNewznab(row.category.ToString());
                     release.Size = row.size;

src/Jackett.Updater/Program.cs

@@ -303,6 +303,7 @@ private void ProcessUpdate(UpdaterConsoleOptions options)
                 "Definitions/elittracker.yml",
                 "Definitions/eotforum.yml",
                 "Definitions/estrenosdtl.yml",
+                "Definitions/ethor.yml",
                 "Definitions/evolutionpalace.yml",
                 "Definitions/extratorrent-ag.yml",
                 "Definitions/exoticaz.yml", // migrated to C#