From f5a39988ccdb9d6789b6daa7db41b09031e52a9b Mon Sep 17 00:00:00 2001
From: Garfield69 <garfield69@outlook.com>
Date: Wed, 2 Nov 2022 17:40:54 +1300
Subject: [PATCH] torrentsurf -> xtremebytes resolves #9951

---
 .../{torrentsurf.yml => xtremebytes.yml}      | 41 ++++++++++---------
 .../Services/IndexerManagerService.cs         |  1 +
 src/Jackett.Updater/Program.cs                |  1 +
 3 files changed, 24 insertions(+), 19 deletions(-)
 rename src/Jackett.Common/Definitions/{torrentsurf.yml => xtremebytes.yml} (83%)

diff --git a/src/Jackett.Common/Definitions/torrentsurf.yml b/src/Jackett.Common/Definitions/xtremebytes.yml
similarity index 83%
rename from src/Jackett.Common/Definitions/torrentsurf.yml
rename to src/Jackett.Common/Definitions/xtremebytes.yml
index d90655c5b..8b7fd577d 100644
--- a/src/Jackett.Common/Definitions/torrentsurf.yml
+++ b/src/Jackett.Common/Definitions/xtremebytes.yml
@@ -1,12 +1,12 @@
 ---
-id: torrentsurf
-name: Torrent Surf
-description: "Torrent Surf is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+id: xtremebytes
+name: Xtreme Bytes
+description: "Xtreme Bytes (TorrentSurf) is a Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://torrentsurf.net/
+  - https://xtremebytes.net/
 
 caps:
   categorymappings:
@@ -23,10 +23,14 @@ caps:
     - {id: 14, cat: Movies/DVD, desc: "Movies/DVD-R"}
     - {id: 18, cat: Movies/HD, desc: "Movies/HD"}
     - {id: 19, cat: Movies/SD, desc: "Movies/SD"}
+    - {id: 42, cat: Movies/HD, desc: "Movies/x264"}
+    - {id: 41, cat: Movies/SD, desc: "Movies/Xvid"}
     - {id: 29, cat: Audio, desc: "Music"}
     - {id: 30, cat: TV, desc: "Packs"}
     - {id: 24, cat: TV/HD, desc: "TV/HD"}
     - {id: 25, cat: TV/SD, desc: "TV/SD"}
+    - {id: 44, cat: TV/HD, desc: "TV/x264"}
+    - {id: 43, cat: TV/SD, desc: "TV/Xvid"}
     - {id: 36, cat: XXX, desc: "XXX"}
 
   modes:
@@ -85,14 +89,11 @@ login:
 
 search:
   paths:
-    # https://torrentsurf.net/browse.php?search=&cat=0&blah=0&incldead=1
-    # https://torrentsurf.net/browse.php?c37=1&c14=1&c18=1&c19=1&incldead=1
+    # https://xtremebytes.net/browse.php?search=&cat=0&incldead=1&c18=1&c42=1
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    # 0 name, 1 descr, 2 both
-    blah: 0
-    # 0 active, 1 incldead, 2 onlydead, 3 freeleech
+    # 0 active, 1 incldead, 2 onlydead, 3 freeleech, 4 descr
     incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
     search: "{{ .Keywords }}"
     sort: "{{ .Config.sort }}"
@@ -100,7 +101,7 @@ search:
     # site does not support imdbid searching or display imdb links in results.
 
   rows:
-    selector: table[background="tablebg.png"] tbody tr:has(a[href^="download.php?id="])
+    selector: table[border="0"][cellspacing="0"][cellpadding="5"] tr:has(a[href^="download.php?id="])
 
   fields:
     category:
@@ -123,21 +124,23 @@ search:
       attribute: href
     download:
       text: "{{ if .Config.seedbox }}{{ .Result.download_2 }}{{ else }}{{ .Result.download_1 }}{{ end }}"
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: append
-          args: " -07:00" # PDT
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    size:
-      selector: td:nth-child(5)
+    files:
+      selector: td:nth-child(3)
     grabs:
+      selector: td:nth-child(7)
+    size:
       selector: td:nth-child(6)
     seeders:
       selector: td:nth-last-child(3)
     leechers:
       selector: td:nth-last-child(2)
+    date:
+      selector: td:nth-child(5)
+      filters:
+        - name: append
+          args: " -07:00" # PDT
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
     downloadvolumefactor:
       case:
         img[src="pic/freeleech.png"]: 0
diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs
index 816023b87..dc1a56366 100644
--- a/src/Jackett.Common/Services/IndexerManagerService.cs
+++ b/src/Jackett.Common/Services/IndexerManagerService.cs
@@ -60,6 +60,7 @@ namespace Jackett.Common.Services
             {"tehconnectionme", "anthelion"},
             {"todotorrents", "dontorrent"},
             {"torrentgalaxyorg", "torrentgalaxy"},
+            {"torrentsurf", "xtremebytes"},
             {"transmithenet", "nebulance"},
             {"xtremezone", "speedapp"},
             {"yourexotic", "exoticaz"}
diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs
index eaead1f2a..2f18ddb43 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -551,6 +551,7 @@ namespace Jackett.Updater
                 "Definitions/torrentseed.yml", // renamed to latinop2p #9065
                 "Definitions/torrentseeds.yml", // migrated to c#
                 "Definitions/torrentsmd.yml",
+                "Definitions/torrentsurf.yml", // renamed xtremebytes #9951
                 "Definitions/torrentvault.yml",
                 "Definitions/torrentwal.yml",
                 "Definitions/torrentwtf.yml",