bitbazis: update row selector

Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>

README.md

@@ -25,7 +25,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
 
- * 01torrent
  * ØMagnet
  * 1337x
  * 24rolika
@@ -65,7 +64,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EXT Torrents
  * ExtraTorrent.st
  * EZTV
- * Filebase
  * FileListing
  * FireBit
  * Frozen Layer

src/Jackett.Common/Definitions/01torrent.yml

@@ -1,110 +0,0 @@
----
-id: 01torrent
-name: 01Torrent
-description: "01Torrent is a Public tracker"
-language: en-US
-type: public
-encoding: UTF-8
-testlinktorrent: false
-links:
-  - https://www4.01torrent.net/
-  - https://01torrent.unblockit.bz/
-legacylinks:
-  - https://01torrent.unblockit.ws/
-  - https://01torrent.unblockit.kim/
-
-caps:
-  categories:
-    "anime": TV/Anime
-    "application": PC
-    "book": Books
-    "game": PC/Games
-    "movie": Movies
-    "music": Audio
-    "tvshow": TV
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings: []
-
-download:
-  # https://www3.01torrent.net/movie/erasing-his-dark-past-2020-720p-webrip-800mb-x264-galaxyrg/163219/
-  # <script type="text/javascript">
-  #   $(document).ready(function(){
-  #     $("#forall").on('click','#clicktype',function(){
-  #       $("#showlinks").html("");
-  #       var datg=$(this).attr("name");
-  #       var dataString="id=163219&name="+datg;
-  #       $('#load').show(200);
-  #       setTimeout(function(){
-  #         $.ajax({type:"POST",
-  #           url:"/showme.php",
-  #           data:dataString,
-  #           cache:false,
-  #           success:function(html){
-  #             $("#showlinks").html(html)}
-  #           });
-  #         Ladda.stopAll();
-  #         $("#load").hide(200)}
-  #       ,3200)
-  #     })
-  #   });
-  # </script>
-  before:
-    path: showme.php
-    method: post
-    inputs:
-      id: "{{ re_replace .DownloadUri.AbsoluteUri \"^.*/(\\d+)/$\" \"$1\" }}"
-      name: torrent
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-      usebeforeresponse: true
-
-search:
-  paths:
-    # https://www4.01torrent.net/search/
-    - path: search/
-      method: post
-  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-
-  rows:
-    selector: table.table-striped > tbody > tr
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: span.icomoon
-      attribute: class
-      filters:
-        - name: split
-          args: [" ", 1]
-        - name: replace
-          args: ["icomoon-", ""]
-    title:
-      selector: a.screenshot
-    details:
-      selector: a.screenshot
-      attribute: href
-    download:
-      selector: a.screenshot
-      attribute: href
-    date:
-      text: now
-    size:
-      selector: span.label-default
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/bitbazis.yml

@@ -105,7 +105,7 @@ search:
     # site does not support imdbid searching or appear to have freeleech
 
   rows:
-    selector: table[ width="1000px"] tbody tr:has(a[href^="userdetails.php?id="])
+    selector: table[width="900px"]:last-child tbody tr:has(a[href^="userdetails.php?id="])
 
   fields:
     category:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -10,33 +10,32 @@ links:
 
 caps:
   categorymappings:
-    - {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: 10, cat: Movies/DVD, desc: "Film DVD rip"}
+    - {id: 111, cat: Movies/DVD, desc: "Film DVD Promo"}
+    - {id: 118, cat: Movies/DVD, desc: "Film DVD Kids"}
+    - {id: 113, cat: Movies, desc: "Films Independent"}
+    - {id: 129, cat: Movies/HD, desc: "Films HD DVD"}
     - {id: 130, cat: Movies/UHD, desc: "Films 4K"}
-    - {id: 143, cat: Movies/HD, desc: "DivX 720P"}
+    - {id: 143, cat: Movies/HD, desc: "Films DivX 720P"}
     - {id: 114, cat: Audio/MP3, desc: "Muziek MP3"}
-    - {id: 140, cat: Books, desc: "E-Book"}
+    - {id: 140, cat: Books/EBook, 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: 106, cat: Other, desc: "Overig"}
-    - {id: 131, cat: Console/NDS, desc: "Nintendo Ds"}
-    - {id: 132, cat: TV/HD, desc: "HD Serie"}
+    - {id: 131, cat: Books/Comics, desc: "Stripboeken"}
+    - {id: 132, cat: TV/HD, desc: "TV HD Serie"}
     - {id: 116, cat: PC/Mac, desc: "Mac Software"}
-    - {id: 125, cat: Movies, desc: "DiVX Rip"}
-    - {id: 123, cat: Movies/SD, desc: "DiVX Cam"}
+    - {id: 125, cat: Movies/SD, desc: "Xvid Rip"}
+    - {id: 123, cat: Movies/HD, desc: "MKV/X265"}
     - {id: 108, cat: XXX, desc: "18+"}
-    - {id: 142, cat: XXX, desc: "HD XXX"}
+    - {id: 142, cat: XXX/x264, desc: "18+ HD"}
     - {id: 139, cat: TV, desc: "TV Series"}
     - {id: 128, cat: Audio/Video, desc: "muziek DVD"}
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
@@ -79,7 +78,7 @@ download:
       text: "{{ .Config.thankyou }}"
       submit: Opslaan
   selectors:
-    - selector: a[href^="download.php?id="]
+    - selector: a[href^="downloadv1.php?id="]
       attribute: href
 
 search:

src/Jackett.Common/Definitions/filebase.yml

@@ -1,205 +0,0 @@
----
-id: filebase
-name: Filebase
-description: "Filebase is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - http://www.filebase.ws/ # https is not supported ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    - {id: cartoons, cat: Movies, desc: "Мультики (cartoons)"}
-    - {id: tv, cat: TV, desc: "ТВ Передача (tv)"}
-    - {id: sport, cat: Movies, desc: "Спорт (sport)"}
-    - {id: action, cat: Movies, desc: "Боевик (action)"}
-    - {id: comedy, cat: Movies, desc: "Комедия (comedy)"}
-    - {id: thriller, cat: Movies, desc: "Триллер (thriller)"}
-    - {id: classic, cat: Movies, desc: "Классика (classic)"}
-    - {id: history, cat: Movies, desc: "Исторический (history)"}
-    - {id: mystic, cat: Movies, desc: "Мистика (mystic)"}
-    - {id: sci-fi, cat: Movies, desc: "Фантастика (sci-fi)"}
-    - {id: horror, cat: Movies, desc: "Ужасы (horror)"}
-    - {id: drama, cat: Movies, desc: "Драма (drama)"}
-    - {id: adventure, cat: Movies, desc: "Приключения (adventure)"}
-    - {id: detective, cat: Movies, desc: "Детектив (detective)"}
-    - {id: concert, cat: Movies, desc: "Концерт (concert)"}
-    - {id: anime, cat: TV/Anime, desc: "Аниме (anime)"}
-    - {id: epic, cat: Movies, desc: "Мелодрама (epic)"}
-    - {id: documental, cat: TV/Documentary, desc: "Док. Фильм (documental)"}
-    - {id: serials, cat: TV, desc: "Сериал (serials)"}
-    - {id: fantasy, cat: Movies, desc: "Фентези (fantasy)"}
-    - {id: war, cat: Movies, desc: "Военный (war)"}
-    - {id: family, cat: Movies, desc: "Семейный (family)"}
-    - {id: tales, cat: Movies, desc: "Сказка (tales)"}
-    - {id: catastroph, cat: Movies, desc: "Катастрофа (catastroph)"}
-    - {id: games, cat: Console, desc: "Игры (games)"}
-    - {id: software, cat: PC, desc: "Программы (software)"}
-    - {id: videoclips, cat: Audio/Video, desc: "Видеоклип (videoclips)"}
-    - {id: wallpapers, cat: Other, desc: "Картинки (wallpapers)"}
-    - {id: eng-music, cat: Audio, desc: "Eng Музыка (eng-music)"}
-    - {id: rus-music, cat: Audio, desc: "Rus Музыка (rus-music)"}
-    - {id: books, cat: Books, desc: "Книги (books)"}
-    - {id: phone, cat: PC/Mobile-Other, desc: "Телефон (phone)"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-  - name: cat
-    type: select
-    label: Category
-    default: 0
-    options:
-      0: all
-      cartoons: "Мультики (cartoons)"
-      tv: "ТВ Передача (tv)"
-      sport: "Спорт (sport)"
-      action: "Боевик (action)"
-      comedy: "Комедия (comedy)"
-      thriller: "Триллер (thriller)"
-      classic: "Классика (classic)"
-      history: "Исторический (history)"
-      mystic: "Мистика (mystic)"
-      sci-fi: "Фантастика (sci-fi)"
-      horror: "Ужасы (horror)"
-      drama: "Драма (drama)"
-      adventure: "Приключения (adventure)"
-      detective: "Детектив (detective)"
-      concert: "Концерт (concert)"
-      anime: "Аниме (anime)"
-      epic: "Мелодрама (epic)"
-      documental: "Док. Фильм (documental)"
-      serials: "Сериал (serials)"
-      fantasy: "Фентези (fantasy)"
-      war: "Военный (war)"
-      family: "Семейный (family)"
-      tales: "Сказка (tales)"
-      catastroph: "Катастрофа (catastroph)"
-      games: "Игры (games)"
-      software: "Программы (software)"
-      videoclips: "Видеоклип (videoclips)"
-      wallpapers: "Картинки (wallpapers)"
-      eng-music: "Eng Музыка (eng-music)"
-      rus-music: "Rus Музыка (rus-music)"
-      books: "Книги (books)"
-      phone: "Телефон (phone)"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: dateD
-    options:
-      dateD: created desc
-      dateA: created asc
-      seedD: seeders desc
-      seedA: seeders asc
-      sizeD: size desc
-      sizeA: size asc
-
-search:
-  paths:
-    # http://www.filebase.ws/torrents/search/?s=dateD&t=all&c=serials&search=mandalorian
-    - path: torrents/search/
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
-    - name: re_replace # S01E01 to 1 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
-  inputs:
-    # all, liveonly, deadonly
-    t: all
-    c: "{{ .Config.cat }}"
-    s: "{{ .Config.sort }}"
-    search: "{{ .Keywords }}"
-
-  rows:
-    selector: table#torrents_list > tbody > tr[data-fid]
-
-  fields:
-    category:
-      selector: td:nth-child(1) > a
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 2]
-    torrent_id:
-      selector: td:nth-child(2) > a
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 3]
-    title:
-      selector: td:nth-child(2)
-      filters:
-        # normalize to SXXEYY format
-        - name: replace
-          args: [" [/|:|\\||\\.] ", " "]
-        - name: replace
-          args: ["Кураж-Бамбей", "kurazh"]
-        - name: replace
-          args: ["Кубик в Кубе", "Kubik"]
-        - name: replace
-          args: ["Кравец", "Kravec"]
-        - name: re_replace
-          args: ["\\((\\d+)\\s+[Сс]езон:\\s+(?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s\\[([12][0-9]{3})\\]\\s(.*)", "$3 - S$1E$2 - rus $5"]
-        - name: re_replace
-          args: ["\\((\\d+)\\s+[Сс]езон:\\s+(\\d+)\\s+[Сс]ери[ия]\\)(.*)\\s\\[([12][0-9]{3})\\]\\s(.*)", "S$1E$2 - rus $3"]
-        - name: re_replace
-          args: ["\\((?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s\\[([12][0-9]{3})\\]\\s(.*)", "$2 - S1E$1 - rus $4"]
-        - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["\\((\\d+[p|i])\\)", "$1"]
-        - name: replace
-          args: ["-Rip", "Rip"]
-        - name: replace
-          args: ["WEB-DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-    details:
-      selector: td:nth-child(2) > a
-      attribute: href
-    download:
-      text: "{{ .Config.sitelink }}download.php?id={{ .Result.torrent_id }}"
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "02/01/06 -07:00"
-    size:
-      selector: td:nth-child(5)
-      filters:
-        - name: replace
-          args: ["ТБ", "TB"]
-        - name: replace
-          args: ["ГБ", "GB"]
-        - name: replace
-          args: ["МБ", "MB"]
-        - name: replace
-          args: ["КБ", "KB"]
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    grabs:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/ilcorsaroverde.yml

@@ -118,6 +118,10 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: compatItal
+    type: checkbox
+    label: Improve Sonarr compatibility with the tracker's Italian season naming scheme by renaming Sxx to Stagione xx in searches. Can cause results already using Sxx to not be found.
+    default: false
   - name: info30s
     type: info
     label: 30s Delay for Searches
@@ -164,6 +168,8 @@ search:
   keywordsfilters:
     - name: re_replace
       args: ["(\\w+)", " +$1"] # prepend + to each word, all keywords must be 2 characters or more
+    - name: re_replace
+      args: ["(?i)(\\bS(\\d+)(E\\d+)?\\b)", "{{ if .Config.compatItal }}Stagione +$2 $3{{ else }}S$2$3{{ end }}"] # Replace SXXEYY with Stagione XX EYY
 
   rows:
     selector: div.search_results_posts

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -87,8 +87,10 @@ settings:
 
 download:
   selectors:
-    - selector: a[href^="magnet:?"]
-      attribute: href
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
 
 search:
   paths:

src/Jackett.Common/Definitions/skipthecommercials-api.yml

@@ -12,7 +12,7 @@ caps:
   # dont forget to update the case block in the search fields category
   categorymappings:
     - {id: 15, cat: TV, desc: "TV Show"}
-    - {id: 16, cat: Movies, desc: "Movie"}
+    - {id: 16, cat: Movies, desc: "TV Movie"}
 
   modes:
     search: [q]
@@ -67,7 +67,7 @@ search:
       selector: category
       case:
         "TV Show": 15
-        "Movie": 16
+        "TV Movie": 16
     title:
       selector: name
     details:

src/Jackett.Common/Definitions/skipthecommercials.yml

@@ -11,7 +11,7 @@ links:
 caps:
   categorymappings:
     - {id: 15, cat: TV, desc: "TV Show"}
-    - {id: 16, cat: Movies, desc: "Movie"}
+    - {id: 16, cat: Movies, desc: "TV Movie"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq118.com/
+  - https://torrentqq119.com/
 legacylinks:
   - https://torrentqq100.com/
   - https://torrentqq101.com/
@@ -26,6 +26,7 @@ legacylinks:
   - https://torrentqq114.com/
   - https://torrentqq115.com/
   - https://torrentqq117.com/
+  - https://torrentqq118.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Indexers/BeyondHDAPI.cs

@@ -90,20 +90,13 @@ namespace Jackett.Common.Indexers
             {
                 { BHDParams.action, "search" },
                 { BHDParams.rsskey, configData.RSSKey.Value },
-                { BHDParams.search, query.SanitizedSearchTerm },
+                { BHDParams.search, query.GetQueryString() },
             };
 
             if (query.IsTVSearch)
-            {
                 postData.Add(BHDParams.categories, "TV");
-
-                if (query.Season != 0)
-                    postData[BHDParams.search] = $"{query.SanitizedSearchTerm} {query.GetEpisodeSearchString()}";
-            }
             else if (query.IsMovieSearch)
-            {
                 postData.Add(BHDParams.categories, "Movies");
-            }
 
             var imdbId = ParseUtil.GetImdbID(query.ImdbID);
             if (imdbId != null)

src/Jackett.Updater/Program.cs

@@ -254,6 +254,7 @@ namespace Jackett.Updater
                 "CsQuery.dll",
                 "CurlSharp.dll",
                 "CurlSharp.pdb",
+                "Definitions/01torrent.yml",
                 "Definitions/32pages.yml",
                 "Definitions/3evils.yml",
                 "Definitions/420files.yml",
@@ -325,6 +326,7 @@ namespace Jackett.Updater
                 "Definitions/extratorrent-it.yml",
                 "Definitions/extratorrentclone.yml",
                 "Definitions/feedurneed.yml", // merged with devilsplayground #6872
+                "Definitions/filebase.yml",
                 "Definitions/filmsclub.yml",
                 "Definitions/focusx.yml",
                 "Definitions/freakstrackingsystem.yml",