Fixed: deprecate v10 schema version and migrate indexers to v11

- Migrated 485+ indexer definitions from v10 to v11 directory - Preserved existing v11 indexers (skipped 15 duplicates to keep v11 versions) - Updated VERSIONS file: MIN_VERSION changed from 10 to 11 - Updated documentation in README.md and CONTRIBUTING.md: * Marked v10 as deprecated (removed from active versions) * Updated v11 as single active version with 522+ indexers * Added deprecation warnings and migration notes - Kept v10/schema.json for historical reference - All validation passes with migrated indexers Breaking change: v10 no longer contains active indexer definitions. Prowlarr will continue to work as it falls back to available versions.
2026-02-14 23:19:03 +00:00 · 2025-08-24 07:38:43 -05:00
parent f3fe0f0d94
commit 03d43b4b70
514 changed files with 53 additions and 2634 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,22 +92,22 @@ python3 scripts/validate.py --find-best-version file.yml
 ## Validation Process

 The validation script automatically detects directory structure and validates accordingly:
- **Prowlarr structure**: Uses versioned directories (currently `v10/`, `v11/`) with individual schemas
+- **Prowlarr structure**: Uses versioned directories (currently `v11/`) with individual schemas
 - **Jackett structure**: Uses flat directory with root `schema.json`

 ### Schema Versions

-Each Cardigann version has its own schema in `definitions/v{VERSION}/schema.json`. Current active versions are:
+Each Cardigann version has its own schema in `definitions/v{VERSION}/schema.json`. Current active version is:

- **v11** - Latest version with newest features including:
+- **v11** - Active version with all indexer definitions (522+ indexers) including:
  - Predefined setting type: `info_category_8000`
  - Optional `selectorinputs` and `getselectorinputs` for login section
  - Extended language support and enhanced SelectorBlock validation

- **v10** - Current stable version including:
-  - Predefined settings type: `info_cookie`, `info_flaresolverr` and `info_useragent`
-  - Enhanced login validation with conditional requirements
-  - Extended SelectorBlock functionality
+> [!WARNING]
+> **v10** - DEPRECATED as of 2025-08-24
+> - All indexers migrated to v11
+> - Schema remains for historical reference only

 > [!NOTE]
 > For historical version information and deprecated schemas (v1-v9), see the main [README.md](README.md).
@@ -316,14 +316,14 @@ git push origin feature/new-indexer
 ### Adding New Fields

 When adding fields to schemas:
-1. Update the appropriate `definitions/v{VERSION}/schema.json` (currently v10 or v11)
+1. Update the appropriate `definitions/v{VERSION}/schema.json` (currently v11)
 2. Test against existing indexer definitions
 3. Consider backward compatibility

 ### Version Management

 - New breaking changes require a new schema version (v12+)
- Current active versions (v10, v11) should remain stable
+- Current active version (v11) should remain stable
 - Deprecated versions (v1-v9) are frozen and no longer updated
 - Test schema changes against the full definition set

--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ python scripts/validate.py --find-best-version "file.yml"
 ```

 The validation script supports:
- **Flexible directory structures**: Works with Prowlarr's versioned directories (`v10/`, `v11/`) and Jackett's flat structure with root `schema.json`
+- **Flexible directory structures**: Works with Prowlarr's versioned directories (`v11/`) and Jackett's flat structure with root `schema.json`
 - **All errors by default**: Shows all validation issues at once instead of stopping at the first error
 - **Concise error messages**: Clean output showing only validation type, schema path, and invalid values
 - **Auto-detection**: Automatically detects directory structure and uses appropriate validation method
@@ -78,26 +78,32 @@ The validation script supports:
 ## Active Versions

 > [!NOTE]
-> The repository currently supports indexer definition schemas from v1 through v11. The latest available versions are:
+> The repository currently supports indexer definition schemas from v1 through v11. The active version is:

- **V11 Indexers** - [Dev 1.20.0.4590](https://github.com/Prowlarr/Prowlarr/releases/tag/v1.20.0.4590)
+- **V11 Indexers** - [Dev 1.20.0.4590](https://github.com/Prowlarr/Prowlarr/releases/tag/v1.20.0.4590) - **ACTIVE**
+  - Contains all active indexer definitions (522+ indexers)
  - Prowlarr Cardigann v11 includes several changes such as:
    - Predefined setting type: `info_category_8000`
    - Optional `selectorinputs` and `getselectorinputs` for login section
    - Extended language support with duplicated language codes
    - Enhanced SelectorBlock validation with dependency rules

- **V10 Indexers** - [Dev 1.18.0.4543](https://github.com/Prowlarr/Prowlarr/releases/tag/v1.18.0.4543)
-  - Prowlarr Cardigann v10 includes several changes such as:
-    - Predefined settings type: `info_cookie`, `info_flaresolverr` and `info_useragent`
-    - Enhanced login validation with conditional requirements
-    - Extended SelectorBlock functionality with type restrictions
-
 ## Deprecated Versions

 > [!WARNING]
 > These versions are deprecated and no longer maintained

+### V10 Indexers - DEPRECATED
+
+- **V10 Indexers** - [Dev 1.18.0.4543](https://github.com/Prowlarr/Prowlarr/releases/tag/v1.18.0.4543)
+  - All indexers migrated to v11 as of 2025-08-24
+  - Schema remains for historical reference
+  - No active indexer definitions
+  - Prowlarr Cardigann v10 included:
+    - Predefined settings type: `info_cookie`, `info_flaresolverr` and `info_useragent`
+    - Enhanced login validation with conditional requirements
+    - Extended SelectorBlock functionality with type restrictions
+
 ### V1 Indexers - Legacy Beta

 - Prowlarr Cardigann v1 are base level standard YML
--- a/2
+++ b/2
@@ -8,7 +8,7 @@ CURRENT_VERSION=11
 MAX_VERSION=11

 # Minimum supported schema version (below this are deprecated/frozen)
-MIN_VERSION=10
+MIN_VERSION=11

 # Development/next schema version (if being worked on)
 NEXT_VERSION=12
--- a/definitions/v10/chdbits.yml
+++ b/definitions/v10/chdbits.yml
@@ -1,183 +0,0 @@
---
-id: chdbits
-name: CHDBits
-description: "CHDBits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-CN
-type: private
-encoding: UTF-8
-links:
-  - https://ptchdbits.co/
-  - https://chdbits.co/
-
-caps:
-  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 405, cat: TV/Anime, desc: "Animations"}
-    - {id: 402, cat: TV, desc: "TV Series"}
-    - {id: 403, cat: TV, desc: "TV Shows"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 407, cat: TV/Sport, desc: "Sports"}
-    - {id: 409, cat: Other, desc: "Misc"}
-    - {id: 408, cat: Audio, desc: "HQ Audio"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Prowlarr requires <a href="https://wiki.servarr.com/prowlarr/faq#can-i-use-flaresolverr-indexers" target="_blank" rel="noreferrer">FlareSolverr</a> to access it.<br><br>
-  - name: info_tpp
-    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.
-  - 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: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[alt="CAPTCHA"]
-    input: imagestring
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("failed"))
-    - selector: td.embedded:has(h2:contains("错误"))
-    - selector: td.embedded:has(h2:contains("error"))
-    - selector: font[color="red"]
-  test:
-    path: torrents.php
-    selector: a[href*="logout"]
-
-download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
-    search_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    notnewword: 1
-
-  rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
-
-  fields:
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title_default:
-      selector: a[href^="details.php?id="]
-    title:
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    date_elapsed:
-      # time type: time elapsed (default)
-      selector: td.rowfollow:nth-last-child(7) > span[title]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date_added:
-      # time added
-      selector: td.rowfollow:nth-last-child(7):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
-    size:
-      selector: td.rowfollow:nth-last-child(6)
-    seeders:
-      selector: td.rowfollow:nth-last-child(5)
-    leechers:
-      selector: td.rowfollow:nth-last-child(4)
-    grabs:
-      selector: td.rowfollow:nth-last-child(3)
-    downloadvolumefactor:
-      case:
-        img.pro_free: 0
-        img.pro_free2up: 0
-        img.pro_50pctdown: 0.5
-        img.pro_50pctdown2up: 0.5
-        img.pro_30pctdown: 0.3
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
-        "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4 (customised)
--- a/definitions/v10/cpasbienclone.yml
+++ b/definitions/v10/cpasbienclone.yml
@@ -1,141 +0,0 @@
---
-id: cpasbienclone
-name: cpasbien clone
-description: "cpasbien clone is a FRENCH Public site for TV / MOVIES / GENERAL"
-language: fr-FR
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://www1.cpasbien.to/
-legacylinks:
-  - https://www1.cpasbiens.ws/
-  - https://www2.cpasbiens.ws/
-  - https://cpasbiens.cm/
-  - https://www1.cpasbiens.cm/
-  - https://wwv.cpasbien.to/
-  - https://cpasbiens.black-mirror.xyz/
-  - https://cpasbiens.unblocked.casa/
-  - https://cpasbiens.proxyportal.fun/
-  - https://cpasbiens.uk-unblock.xyz/
-  - https://cpasbiens.ind-unblock.xyz/
-  - https://www.cpasbien.gg/
-  - https://www.cpasbien.vip/
-  - https://cpasbien.to/
-  - https://www.cpasbien.tw/
-  - https://www.cpasbien.love/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-  allowrawsearch: true
-
-settings:
-  - name: info_category_8000
-    type: info
-    label: About cpasbienclone Categories
-    default: cpasbienclone does not return categories in its search results. To sync to your apps, include 8000(Other) in your Apps' Sync Categories.
-  - name: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTi FRENCH: MULTi FRENCH
-      ENGLISH: ENGLISH
-      MULTi ENGLISH: MULTi ENGLISH
-      VOSTFR: VOSTFR
-      MULTi VOSTFR: MULTi VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR and SUBFRENCH with ENGLISH
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site (Works only for searches with Keywords)
-    default: trie-date-d
-    options:
-      trie-date-d: created desc
-      trie-date-a: created asc
-      trie-seeds-d: seeders desc
-      trie-seeds-a: seeders asc
-      trie-poid-d: size desc
-      trie-poid-a: size asc
-      trie-nom-d: title desc
-      trie-nom-a: title asc
-
-download:
-  before:
-    # request target
-    path: "download_magnet?id={{ re_replace .DownloadUri.AbsoluteUri \"^.*-(\\d+)\\.html\" \"$1\" }}"
-  selectors:
-    - selector: body
-      usebeforeresponse: true
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search_torrent/{{ .Keywords }}.html,{{ .Config.sort }}{{ else }}home/{{ end }}"
-
-  rows:
-    selector: table.table-corps > tbody > tr:has(a)
-
-  fields:
-    category:
-      text: Other
-    title_phase1:
-      selector: a
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b((19|20)\\d{2})\\b)$", "$3 $1$2"]
-    title_vostfr:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
-    title_phase2:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a
-      attribute: href
-    download:
-      selector: a
-      attribute: href
-    size:
-      selector: div.poid
-      filters:
-        - name: re_replace
-          args: ["(\\w)o", "$1B"]
-          # keyword search returns nnnnn.n in MB but without unit indicator
-        - name: re_replace
-          args: ["(\\d+\\.\\d)$", "$1MB"]
-    date:
-      text: now
-    seeders:
-      selector: div.up
-      optional: true
-      default: 0
-    leechers:
-      selector: div.down
-      optional: true
-      default: 0
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/definitions/v10/megapeer.yml
+++ b/definitions/v10/megapeer.yml
@@ -1,213 +0,0 @@
---
-id: megapeer
-name: MegaPeer
-description: "MegaPeer is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
-language: ru-RU
-type: public
-encoding: windows-1251
-links:
-  - https://megapeer.vip/
-legacylinks:
-  - http://megapeer.ru/ # https is not supported
-  - http://alt.megapeer.ru/
-
-caps:
-  categorymappings:
-    - {id: 79, cat: Movies, desc: "Наши фильмы (Russian Movies)"}
-    - {id: 5, cat: TV, desc: "Наши сериалы (Russian Series)"}
-    - {id: 174, cat: Movies/Foreign, desc: "Зарубежные фильмы (Foreign Movies)"}
-    - {id: 6, cat: TV/Foreign, desc: "Зарубежные сериалы (Foreign Series)"}
-    - {id: 76, cat: TV/Anime, desc: "Мультипликация (Animation)"}
-    - {id: 89, cat: Audio/Video, desc: "Концерты / Клипы (Concerts / Clips)"}
-    - {id: 57, cat: TV, desc: "Телепередачи / Шоу / Юмор (TV)"}
-    - {id: 145, cat: TV/Other, desc: "Обучающее видео (Instructional Video)"}
-    - {id: 55, cat: TV/Documentary, desc: "Документалистика (Documentary)"}
-    - {id: 164, cat: TV/Other, desc: "Прочее (Other)"}
-    - {id: 21, cat: TV/Sport, desc: "Спорт (Sport)"}
-    - {id: 94, cat: Audio, desc: "Музыка (Music)"}
-    - {id: 28, cat: Console, desc: "Игры (Games)"}
-    - {id: 107, cat: PC/0day, desc: "Софт / ОС / Оформление (Software)"}
-    - {id: 41, cat: PC/Mobile-Other, desc: "Мобильные устройства (Mobile)"}
-    - {id: 52, cat: Books, desc: "Книги / Журналы (Books)"}
-    - {id: 169, cat: Other/Misc, desc: "Разное (Misc)"}
-    - {id: 178, cat: Other, desc: "Страницы (Pages)"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info_category_8000
-    type: info
-    label: About MegaPeer Categories
-    default: MegaPeer does not return categories in its search results. To sync to your apps, include 8000(Other) in your Apps' Sync Categories.
-  - name: info_flaresolverr
-    type: info_flaresolverr
-  - name: stripcyrillic
-    type: checkbox
-    label: Strip Cyrillic Letters
-    default: false
-  - name: addrussiantotitle
-    type: checkbox
-    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 0
-    options:
-      0: created
-      1: title
-      2: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 0
-    options:
-      0: desc
-      1: asc
-
-search:
-  # https://megapeer.vip/browse.php?search=%25%25&age=&cat=0&stype=0&sort=0&ascdesc=0
-  paths:
-    - path: browse.php
-  inputs:
-    search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    # does not support multi category searches
-    cat: 0
-    # 0 title, 1 descr, 2 phrase, 3 infohash
-    stype: 0
-    sort: "{{ .Config.sort }}"
-    ascdesc: "{{ .Config.type }}"
-
-  headers:
-    # prevent redirect
-    Referer: ["{{ .Config.sitelink }}browse.php"]
-
-  keywordsfilters:
-    - name: re_replace # S01 to сезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
-    - name: re_replace # E02 to сери 1
-      args: ["(?i)\\bE0*(\\d+)\\b", "сери $1"]
-    - name: re_replace # S01E02 to сезон 1 сери 2
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 сери $2"]
-    # prepend % to each word - allow 1 character keywords
-    - name: re_replace
-      args: ["(\\w+)", "%$1"]
-
-  rows:
-    selector: tr.table_fon
-
-  fields:
-    category:
-      text: 169
-    title:
-      selector: a[href^="/torrent/"]
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
-        - name: re_replace
-          args: ["(?i)\\bFiles-х\\b", "Files-x"]
-        - name: re_replace
-          args: ["(?i)\\sот\\s([\\w\\p{P}\\p{S}]+)$", "-$1"]
-        - name: re_replace
-          args: ["\\s\\|\\s(\\w{4,})$", "-$1"]
-        - name: re_replace
-          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
-        - name: re_replace
-          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
-        - name: append
-          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href^="/download/"]
-      attribute: href
-    size:
-      selector: td:nth-last-child(2)
-    seeders:
-      selector: td:last-child font:first-of-type
-    leechers:
-      selector: td:last-child font:last-of-type
-    date:
-      # 28 Мая 24
-      selector: td:first-child
-      filters:
-        - name: replace
-          args: ["Янв", "January"]
-        - name: replace
-          args: ["Фев", "February"]
-        - name: replace
-          args: ["Мар", "March"]
-        - name: replace
-          args: ["Апр", "Apr"]
-        - name: replace
-          args: ["Мая", "May"]
-        - name: replace
-          args: ["Июн", "Jun"]
-        - name: replace
-          args: ["Июл", "Jul"]
-        - name: replace
-          args: ["Авг", "Aug"]
-        - name: replace
-          args: ["Сен", "Sep"]
-        - name: replace
-          args: ["Окт", "Oct"]
-        - name: replace
-          args: ["Ноя", "Nov"]
-        - name: replace
-          args: ["Дек", "Dec"]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "d MMM yy zzz"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/definitions/v10/mvgroupforum.yml
+++ b/definitions/v10/mvgroupforum.yml
@@ -1,227 +0,0 @@
---
-id: mvgroupforum
-name: MVGroup Forum
-description: "MVGroup is a Semi-Private Torrent Tracker dedicated to UK TV and DOCUMENTARIES. This definition is for the Forum Tracker site."
-language: en-US
-type: semi-private
-encoding: UTF-8
-links:
-  - https://forums.mvgroup.org/
-legacylinks:
-  - http://forums.mvgroup.org/
-
-caps:
-  categories:
-    Other: Other
-
-  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: info_category_8000
-    type: info
-    label: About MVGroup Categories
-    default: MVGroup does not return categories in its search results. To sync to your apps, include 8000(Other) in your Apps' Sync Categories.
-  - name: hidef
-    type: checkbox
-    label: Show MVGroup HiDef Releases only
-    default: false
-  - name: withsubs
-    type: select
-    label: Subtitles
-    default: _
-    options:
-      _: -OFF-
-      alb: Albanian
-      ara: Arabic
-      arm: Armenian
-      ass: Assyrian
-      bos: Bosnian
-      bul: Bulgarian
-      cat: Catalan
-      chi: "Chinese, simplified"
-      zho: "Chinese, traditional"
-      hrv: Croatian
-      cze: Czech
-      dan: Danish
-      dut: Dutch
-      eng: English
-      est: Estonian
-      fin: Finnish
-      fre: French
-      glg: Galician
-      geo: Georgian
-      ger: German
-      ell: Greek
-      heb: Hebrew
-      hin: Hindi
-      hun: Hungarian
-      ice: Icelandic
-      ind: Indonesian
-      ita: Italian
-      jpn: Japanese
-      kaz: Kazakh
-      kor: Korean
-      lav: Latvian
-      lit: Lithuanian
-      ltz: Luxembourgish
-      mac: Macedonian
-      may: Malay
-      nor: Norwegian
-      per: Persian
-      pol: Polish
-      por: Portuguese
-      rum: Romanian
-      rus: Russian
-      scc: Serbian
-      slo: Slovak
-      slv: Slovenian
-      spa: Spanish
-      swe: Swedish
-      tha: Thai
-      tur: Turkish
-      ukr: Ukrainian
-      vie: Vietnamese
-  - name: seed
-    type: checkbox
-    label: Only released and seeded torrents
-    default: false
-  - name: dropbbc
-    type: checkbox
-    label: Drop BBC & other channels from the front of result titles
-    default: false
-  - name: stripS01E01
-    type: checkbox
-    label: Strip the S01E01 from the Torznab search requests
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      filename: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-login:
-  path: index.php?act=Login&CODE=00
-  method: form
-  form: form[action$="act=Login&CODE=01"]
-  inputs:
-    UserName: "{{ .Config.username }}"
-    PassWord: "{{ .Config.password }}"
-    Privacy: 1
-    CookieDate: 1
-    CODE: 01
-    referer: "https://forums.mvgroup.org/index.php?"
-    act: Login
-  error:
-    - selector: div.borderwrap:has(div.tablepad)
-      message:
-        selector: div.borderwrap div.tablepad
-  test:
-    path: index.php
-    selector: tr td.nav_mem div span[id="member_menu"], a[href^="/maintracker.php?filter="]
-
-search:
-  paths:
-    - path: forumtracker.php
-  inputs:
-    seed: "{{ if .Config.seed }}1{{ else }}0{{ end }}"
-    withsubs: "{{ re_replace .Config.withsubs \"_\" \"\" }}"
-    filter: "{{ if .Config.hidef }}hd+{{ else }}{{ end }}{{ .Keywords }}"
-    orderby: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)S01E01", "{{ if .Config.stripS01E01 }}{{ else }}S01E01{{ end }}"] # optionally remove S01E01 from search
-
-  rows:
-    selector: tr:has(a.magnetlink)
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: td.doubleindent, td.singleindent a[href^="/index.php?showtopic="]
-      optional: true
-      # fallback title (to prevent abend if optional is not found)
-      default: "title not found"
-      filters:
-        - name: re_replace
-          args: ["(?i)^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^PBS (.*)", "{{ if .Config.dropbbc }}{{ else }}PBS {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^CH5 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch5 {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^CH4 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch4 {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^DC (.*)", "{{ if .Config.dropbbc }}{{ else }}DC {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^DW (.*)", "{{ if .Config.dropbbc }}{{ else }}DW {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^HC (.*)", "{{ if .Config.dropbbc }}{{ else }}HC {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^RTE (.*)", "{{ if .Config.dropbbc }}{{ else }}RTE {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^ITV (.*)", "{{ if .Config.dropbbc }}{{ else }}ITV {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^HBO (.*)", "{{ if .Config.dropbbc }}{{ else }}HBO {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^NHK (.*)", "{{ if .Config.dropbbc }}{{ else }}NHK {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^UKTV (.*)", "{{ if .Config.dropbbc }}{{ else }}UKTV {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^NOVA (.*)", "{{ if .Config.dropbbc }}{{ else }}NOVA {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^TV5Monde (.*)", "{{ if .Config.dropbbc }}{{ else }}TV5Monde {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^Al-Jazeera (.*)", "{{ if .Config.dropbbc }}{{ else }}Al-Jazeera {{ end }}$1"]
-        - name: append
-          args: "{{ if .Config.stripS01E01 }}{{ else }} S01E01{{ end }}"
-    details:
-      optional: true
-      selector: td.singleindent a[href^="/index.php?showtopic="]
-      attribute: href
-    download:
-      selector: td a.torrentlink
-      attribute: href
-    magnet:
-      selector: td a.magnetlink
-      attribute: href
-    size:
-      text: "512 MB"
-    date:
-      selector: td:nth-of-type(3)
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "yyyy/MM/dd zzz"
-    seeders:
-      selector: td:nth-of-type(4)
-    leechers:
-      selector: td:nth-of-type(5)
-    grabs:
-      selector: td:nth-of-type(6)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# Invision Power Board
--- a/definitions/v10/mvgroupmain.yml
+++ b/definitions/v10/mvgroupmain.yml
@@ -1,227 +0,0 @@
---
-id: mvgroupmain
-name: MVGroup Main
-description: "MVGroup is a Semi-Private Torrent Tracker dedicated to UK TV and DOCUMENTARIES. This definition is for the Main Tracker site."
-language: en-US
-type: semi-private
-encoding: UTF-8
-links:
-  - https://forums.mvgroup.org/
-legacylinks:
-  - http://forums.mvgroup.org/
-
-caps:
-  categories:
-    Other: Other
-
-  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: info_category_8000
-    type: info
-    label: About MVGroup Categories
-    default: MVGroup does not return categories in its search results. To sync to your apps, include 8000(Other) in your Apps' Sync Categories.
-  - name: hidef
-    type: checkbox
-    label: Show MVGroup HiDef Releases only
-    default: false
-  - name: withsubs
-    type: select
-    label: Subtitles
-    default: _
-    options:
-      _: -OFF-
-      alb: Albanian
-      ara: Arabic
-      arm: Armenian
-      ass: Assyrian
-      bos: Bosnian
-      bul: Bulgarian
-      cat: Catalan
-      chi: "Chinese, simplified"
-      zho: "Chinese, traditional"
-      hrv: Croatian
-      cze: Czech
-      dan: Danish
-      dut: Dutch
-      eng: English
-      est: Estonian
-      fin: Finnish
-      fre: French
-      glg: Galician
-      geo: Georgian
-      ger: German
-      ell: Greek
-      heb: Hebrew
-      hin: Hindi
-      hun: Hungarian
-      ice: Icelandic
-      ind: Indonesian
-      ita: Italian
-      jpn: Japanese
-      kaz: Kazakh
-      kor: Korean
-      lav: Latvian
-      lit: Lithuanian
-      ltz: Luxembourgish
-      mac: Macedonian
-      may: Malay
-      nor: Norwegian
-      per: Persian
-      pol: Polish
-      por: Portuguese
-      rum: Romanian
-      rus: Russian
-      scc: Serbian
-      slo: Slovak
-      slv: Slovenian
-      spa: Spanish
-      swe: Swedish
-      tha: Thai
-      tur: Turkish
-      ukr: Ukrainian
-      vie: Vietnamese
-  - name: seed
-    type: checkbox
-    label: Only released and seeded torrents
-    default: false
-  - name: dropbbc
-    type: checkbox
-    label: Drop BBC & other channels from the front of result titles
-    default: false
-  - name: stripS01E01
-    type: checkbox
-    label: Strip the S01E01 from the Torznab search requests
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      filename: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-login:
-  path: index.php?act=Login&CODE=00
-  method: form
-  form: form[action$="act=Login&CODE=01"]
-  inputs:
-    UserName: "{{ .Config.username }}"
-    PassWord: "{{ .Config.password }}"
-    Privacy: 1
-    CookieDate: 1
-    CODE: 01
-    referer: "https://forums.mvgroup.org/index.php?"
-    act: Login
-  error:
-    - selector: div.borderwrap:has(div.tablepad)
-      message:
-        selector: div.borderwrap div.tablepad
-  test:
-    path: index.php
-    selector: tr td.nav_mem div span[id="member_menu"], a[href^="/forumtracker.php?filter="]
-
-search:
-  paths:
-    - path: maintracker.php
-  inputs:
-    seed: "{{ if .Config.seed }}1{{ else }}0{{ end }}"
-    withsubs: "{{ re_replace .Config.withsubs \"_\" \"\" }}"
-    filter: "{{ if .Config.hidef }}hd+{{ else }}{{ end }}{{ .Keywords }}"
-    orderby: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)S01E01", "{{ if .Config.stripS01E01 }}{{ else }}S01E01{{ end }}"] # optionally remove S01E01 from search
-
-  rows:
-    selector: tr:has(a.magnetlink)
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: td.doubleindent, td.singleindent a[href^="/index.php?showtopic="]
-      optional: true
-      # fallback title (to prevent abend if optional is not found)
-      default: "title not found"
-      filters:
-        - name: re_replace
-          args: ["(?i)^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^PBS (.*)", "{{ if .Config.dropbbc }}{{ else }}PBS {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^CH5 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch5 {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^CH4 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch4 {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^DC (.*)", "{{ if .Config.dropbbc }}{{ else }}DC {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^DW (.*)", "{{ if .Config.dropbbc }}{{ else }}DW {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^HC (.*)", "{{ if .Config.dropbbc }}{{ else }}HC {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^RTE (.*)", "{{ if .Config.dropbbc }}{{ else }}RTE {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^ITV (.*)", "{{ if .Config.dropbbc }}{{ else }}ITV {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^HBO (.*)", "{{ if .Config.dropbbc }}{{ else }}HBO {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^NHK (.*)", "{{ if .Config.dropbbc }}{{ else }}NHK {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^UKTV (.*)", "{{ if .Config.dropbbc }}{{ else }}UKTV {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^NOVA (.*)", "{{ if .Config.dropbbc }}{{ else }}NOVA {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^TV5Monde (.*)", "{{ if .Config.dropbbc }}{{ else }}TV5Monde {{ end }}$1"]
-        - name: re_replace
-          args: ["(?i)^Al-Jazeera (.*)", "{{ if .Config.dropbbc }}{{ else }}Al-Jazeera {{ end }}$1"]
-        - name: append
-          args: "{{ if .Config.stripS01E01 }}{{ else }} S01E01{{ end }}"
-    details:
-      optional: true
-      selector: td.singleindent a[href^="/index.php?showtopic="]
-      attribute: href
-    download:
-      selector: td a.torrentlink
-      attribute: href
-    magnet:
-      selector: td a.magnetlink
-      attribute: href
-    size:
-      text: "512 MB"
-    date:
-      selector: td:nth-of-type(3)
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "yyyy/MM/dd zzz"
-    seeders:
-      selector: td:nth-of-type(4)
-    leechers:
-      selector: td:nth-of-type(5)
-    grabs:
-      selector: td:nth-of-type(6)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# Invision Power Board
--- a/definitions/v10/pornolab.yml
+++ b/definitions/v10/pornolab.yml
@@ -1,259 +0,0 @@
---
-id: pornolab
-name: PornoLab
-description: "PornoLab is a Semi-Private Russian site for 3X"
-language: ru-RU
-type: semi-private
-encoding: windows-1251
-links:
-  - https://pornolab.net/
-
-caps:
-  categorymappings:
-    - {id: 1670, cat: XXX, desc: "Эротическое видео / Erotic & Softcore"}
-    - {id: 1768, cat: XXX, desc: "Эротические фильмы / Erotic Movies"}
-    - {id: 60, cat: XXX, desc: "Документальные фильмы / Documentary & Reality"}
-    - {id: 1671, cat: XXX, desc: "Эротические ролики и сайтрипы / Erotic Clips & SiteRips"}
-    - {id: 1644, cat: XXX, desc: "Нудизм-Натуризм / Nudity"}
-
-    - {id: 1672, cat: XXX, desc: "Зарубежные порнофильмы / Full Length Movies"}
-    - {id: 1111, cat: XXX/Pack, desc: "Паки полных фильмов / Full Length Movies Packs"}
-    - {id: 508, cat: XXX, desc: "Классические фильмы / Classic"}
-    - {id: 555, cat: XXX, desc: "Фильмы с сюжетом / Feature & Vignettes"}
-    - {id: 1845, cat: XXX, desc: "Гонзо-фильмы 1991-2010 / Gonzo 1991-2010"}
-    - {id: 1673, cat: XXX, desc: "Гонзо-фильмы 2011-2025 / Gonzo 2011-2025"}
-    - {id: 1112, cat: XXX, desc: "Фильмы без сюжета 1991-2010 / All Sex & Amateur 1991-2010"}
-    - {id: 1718, cat: XXX, desc: "Фильмы без сюжета 2011-2025 / All Sex & Amateur 2011-2025"}
-    - {id: 553, cat: XXX, desc: "Лесбо-фильмы / All Girl & Solo"}
-    - {id: 1143, cat: XXX, desc: "Этнические фильмы / Ethnic-Themed"}
-    - {id: 1646, cat: XXX, desc: "Видео для телефонов и КПК / Pocket РС & Phone Video"}
-
-    - {id: 1717, cat: XXX, desc: "Зарубежные фильмы в высоком качестве (DVD&HD) / Full Length Movies High-Quality"}
-    - {id: 1851, cat: XXX/DVD, desc: "Эротические и Документальные видео (DVD) / Erotic, Documentary & Reality (DVD)"}
-    - {id: 1713, cat: XXX/DVD, desc: "Фильмы с сюжетом, Классические (DVD) / Feature & Vignetts, Classic (DVD)"}
-    - {id: 512, cat: XXX/DVD, desc: "Гонзо, Лесбо и Фильмы без сюжета (DVD) / Gonzo, All Girl & Solo, All Sex (DVD)"}
-    - {id: 1712, cat: XXX, desc: "Эротические и Документальные видео (HD Video) / Erotic, Documentary & Reality (HD Video)"}
-    - {id: 1775, cat: XXX, desc: "Фильмы с сюжетом, Классические (HD Video) / Feature & Vignettes, Classic (HD Video)"}
-    - {id: 1450, cat: XXX, desc: "Гонзо, Лесбо и Фильмы без сюжета (HD Video) / Gonzo, All Girl & Solo, All Sex (HD Video)"}
-
-    - {id: 1674, cat: XXX, desc: "Русское порно / Russian Video"}
-    - {id: 902, cat: XXX, desc: "Русские порнофильмы / Russian Full Length Movies"}
-    - {id: 1675, cat: XXX/Pack, desc: "Паки русских порнороликов / Russian Clips Packs"}
-    - {id: 36, cat: XXX, desc: "Сайтрипы с русскими актрисами 1991-2015 / Russian SiteRip's 1991-2015"}
-    - {id: 1830, cat: XXX, desc: "Сайтрипы с русскими актрисами 1991-2015 (HD Video) / Russian SiteRip's 1991-2015 (HD Video)"}
-    - {id: 1803, cat: XXX, desc: "Сайтрипы с русскими актрисами 2016-2025 / Russian SiteRip's 2016-2025"}
-    - {id: 1831, cat: XXX, desc: "Сайтрипы с русскими актрисами 2016-2025 (HD Video) / Russian SiteRip's 2016-2025 (HD Video)"}
-    - {id: 1741, cat: XXX, desc: "Русские Порноролики Разное / Russian Clips (various)"}
-    - {id: 1676, cat: XXX, desc: "Русское любительское видео / Russian Amateur Video"}
-
-    - {id: 1677, cat: XXX, desc: "Зарубежные порноролики / Clips"}
-    - {id: 1780, cat: XXX/Pack, desc: "Паки сайтрипов (HD Video) / SiteRip's Packs (HD Video)"}
-    - {id: 1110, cat: XXX/Pack, desc: "Паки сайтрипов (SD Video) / SiteRip's Packs (SD Video)"}
-    - {id: 1678, cat: XXX/Pack, desc: "Паки порнороликов по актрисам / Actresses Clips Packs"}
-    - {id: 1124, cat: XXX, desc: "Сайтрипы 1991-2010 (HD Video) / SiteRip's 1991-2010 (HD Video)"}
-    - {id: 1784, cat: XXX, desc: "Сайтрипы 2011-2012 (HD Video) / SiteRip's 2011-2012 (HD Video)"}
-    - {id: 1769, cat: XXX, desc: "Сайтрипы 2013 (HD Video) / SiteRip's 2013 (HD Video)"}
-    - {id: 1793, cat: XXX, desc: "Сайтрипы 2014 (HD Video) / SiteRip's 2014 (HD Video)"}
-    - {id: 1797, cat: XXX, desc: "Сайтрипы 2015 (HD Video) / SiteRip's 2015 (HD Video)"}
-    - {id: 1804, cat: XXX, desc: "Сайтрипы 2016 (HD Video) / SiteRip's 2016 (HD Video)"}
-    - {id: 1819, cat: XXX, desc: "Сайтрипы 2017 (HD Video) / SiteRip's 2017 (HD Video)"}
-    - {id: 1825, cat: XXX, desc: "Сайтрипы 2018 (HD Video) / SiteRip's 2018 (HD Video)"}
-    - {id: 1836, cat: XXX, desc: "Сайтрипы 2019 (HD Video) / SiteRip's 2019 (HD Video)"}
-    - {id: 1842, cat: XXX, desc: "Сайтрипы 2020 (HD Video) / SiteRip's 2020 (HD Video)"}
-    - {id: 1846, cat: XXX, desc: "Сайтрипы 2021 (HD Video) / SiteRip's 2021 (HD Video)"}
-    - {id: 1857, cat: XXX, desc: "Сайтрипы 2022 (HD Video) / SiteRip's 2022 (HD Video)"}
-    - {id: 1861, cat: XXX, desc: "Сайтрипы 2023 (HD Video) / SiteRip's 2023 (HD Video)"}
-    - {id: 1867, cat: XXX, desc: "Сайтрипы 2024 (HD Video) / SiteRip's 2024 (HD Video)"}
-    - {id: 1872, cat: XXX, desc: "Сайтрипы 2025 (HD Video) / SiteRip's 2025 (HD Video)"}
-    - {id: 1451, cat: XXX, desc: "Сайтрипы 1991-2010 / SiteRip's 1991-2010"}
-    - {id: 1788, cat: XXX, desc: "Сайтрипы 2011-2012 / SiteRip's 2011-2012"}
-    - {id: 1789, cat: XXX, desc: "Сайтрипы 2013 / SiteRip's 2013"}
-    - {id: 1792, cat: XXX, desc: "Сайтрипы 2014 / SiteRip's 2014"}
-    - {id: 1798, cat: XXX, desc: "Сайтрипы 2015 / SiteRip's 2015"}
-    - {id: 1805, cat: XXX, desc: "Сайтрипы 2016 / SiteRip's 2016"}
-    - {id: 1820, cat: XXX, desc: "Сайтрипы 2017 / SiteRip's 2017"}
-    - {id: 1826, cat: XXX, desc: "Сайтрипы 2018 / SiteRip's 2018"}
-    - {id: 1837, cat: XXX, desc: "Сайтрипы 2019 / SiteRip's 2019"}
-    - {id: 1843, cat: XXX, desc: "Сайтрипы 2020 / SiteRip's 2020"}
-    - {id: 1847, cat: XXX, desc: "Сайтрипы 2021 / SiteRip's 2021"}
-    - {id: 1856, cat: XXX, desc: "Сайтрипы 2022 / SiteRip's 2022"}
-    - {id: 1862, cat: XXX, desc: "Сайтрипы 2023 / SiteRip's 2023"}
-    - {id: 1868, cat: XXX, desc: "Сайтрипы 2024 / SiteRip's 2024"}
-    - {id: 1873, cat: XXX, desc: "Сайтрипы 2025 / SiteRip's 2025"}
-    - {id: 1707, cat: XXX, desc: "Сцены из фильмов / Movie Scenes (кроме SiteRip)"}
-    - {id: 284, cat: XXX, desc: "Порноролики Разное / Clips (various)"}
-    - {id: 1853, cat: XXX, desc: "Компиляции и Музыкальные порно клипы / Compilations & Porn Music Video (PMV)"}
-    - {id: 1823, cat: XXX, desc: "Порноролики в 3D и Virtual Reality (VR) / 3D & Virtual Reality Videos"}
-
-    - {id: 1800, cat: XXX, desc: "Японское и китайское порно / Japanese & Chinese Adult Video (JAV)"}
-    - {id: 1801, cat: XXX/Pack, desc: "Паки японских фильмов и сайтрипов / Full Length Japanese Movies Packs & SiteRip's Packs"}
-    - {id: 1719, cat: XXX, desc: "Японские фильмы и сайтрипы (DVD и HD Video) / Japanese Movies & SiteRip's (DVD & HD Video)"}
-    - {id: 997, cat: XXX, desc: "Японские фильмы и сайтрипы 1991-2014 / Japanese Movies & SiteRip's 1991-2014"}
-    - {id: 1818, cat: XXX, desc: "Японские фильмы и сайтрипы 2015-2025 / Japanese Movies & SiteRip's 2015-2025"}
-    - {id: 1849, cat: XXX, desc: "Китайские фильмы и сайтрипы (DVD и HD Video) / Chinese Movies & SiteRip's (DVD & HD Video)"}
-    - {id: 1815, cat: XXX, desc: "Архив (Японское и китайское порно)"}
-
-    - {id: 1723, cat: XXX, desc: "Фото и журналы / Photos & Magazines"}
-    - {id: 1726, cat: XXX, desc: "MetArt & MetModels"}
-    - {id: 883, cat: XXX/ImageSet, desc: "Эротические студии Разное / Erotic Picture Gallery (various)"}
-    - {id: 1728, cat: XXX/ImageSet, desc: "Любительское фото / Amateur Picture Gallery"}
-    - {id: 1729, cat: XXX/Pack, desc: "Подборки по актрисам / Actresses Picture Packs"}
-    - {id: 38, cat: XXX/ImageSet, desc: "Подборки сайтрипов / SiteRip's Picture Packs"}
-    - {id: 1757, cat: XXX/ImageSet, desc: "Подборки сетов / Picture Sets Packs"}
-    - {id: 1735, cat: XXX/ImageSet, desc: "Тематическое и нетрадиционное фото / Misc & Special Interest Picture Packs"}
-    - {id: 1731, cat: XXX/ImageSet, desc: "Журналы / Magazines"}
-    - {id: 1802, cat: XXX, desc: "Архив (Фото)"}
-
-    - {id: 1745, cat: XXX, desc: "Хентай и Манга, Мультфильмы и Комиксы, Рисунки, Аудио / Hentai & Manga, Cartoons & Comics, Artwork & Audio"}
-    - {id: 1679, cat: XXX, desc: "Хентай: основной подраздел / Hentai: main subsection"}
-    - {id: 1740, cat: XXX, desc: "Хентай в высоком качестве (DVD и HD) / Hentai DVD & HD"}
-    - {id: 1834, cat: XXX, desc: "Хентай: ролики 2D / Hentai: 2D video"}
-    - {id: 1752, cat: XXX, desc: "Хентай: ролики 3D / Hentai: 3D video"}
-    - {id: 1760, cat: XXX, desc: "Хентай: Манга / Hentai: Manga"}
-    - {id: 1781, cat: XXX, desc: "Хентай: Арт и HCG / Hentai: Artwork & HCG"}
-    - {id: 1711, cat: XXX, desc: "Мультфильмы / Cartoons"}
-    - {id: 1296, cat: XXX, desc: "Комиксы, рисунки, аудио / Comics, Artwork & Audio"}
-    - {id: 1863, cat: XXX, desc: "Обсуждение / Discussion"}
-    - {id: 1864, cat: XXX, desc: "Архив (Хентай и Манга, Мультфильмы и Комиксы, Рисунки, А.."}
-
-    - {id: 1838, cat: XXX, desc: "Игры / Games"}
-    - {id: 1750, cat: XXX, desc: "Игры: основной подраздел / Games: main subsection"}
-    - {id: 1756, cat: XXX, desc: "Игры: визуальные новеллы (профессиональная студия) / Games: Visual Novels (Pro)"}
-    - {id: 1869, cat: XXX, desc: "Игры: визуальные новеллы (независимый разработчик) / Games: Visual Novels (Indie)"}
-    - {id: 1785, cat: XXX, desc: "Игры: ролевые / Games: role-playing (RPG Maker and WOLF RPG Editor)"}
-    - {id: 1790, cat: XXX, desc: "Игры и Софт: Анимация / Software: Animation"}
-    - {id: 1827, cat: XXX, desc: "Игры: В разработке и Демо (основной подраздел) / Games: In Progress and Demo (main subsection)"}
-    - {id: 1870, cat: XXX, desc: "Игры: В разработке и Демо (визуальные новеллы - независимый разработчик) / Games: In Progress and Demo (visual novels - Indie)"}
-    - {id: 1828, cat: XXX, desc: "Игры: В разработке и Демо (ролевые) / Games: In Progress and Demo (role-playing - RPG Maker and WOLF RPG Editor)"}
-    - {id: 1829, cat: XXX, desc: "Обсуждение игр / Games Discussion"}
-    - {id: 1865, cat: XXX, desc: "Архив (Игры)"}
-
-    - {id: 11, cat: XXX, desc: "Нетрадиционное порно / Special Interest Movies & Clips"}
-    - {id: 1715, cat: XXX, desc: "Транссексуалы (DVD и HD) / Transsexual (DVD & HD)"}
-    - {id: 1680, cat: XXX, desc: "Транссексуалы / Transsexual"}
-    - {id: 1758, cat: XXX, desc: "Бисексуалы / Bisexual"}
-    - {id: 1682, cat: XXX, desc: "БДСМ / BDSM"}
-    - {id: 1733, cat: XXX, desc: "Женское доминирование и страпон / Femdom & Strapon"}
-    - {id: 1754, cat: XXX, desc: "Подглядывание / Voyeur"}
-    - {id: 1734, cat: XXX, desc: "Фистинг и дилдо / Fisting & Dildo"}
-    - {id: 1791, cat: XXX, desc: "Беременные / Pregnant"}
-    - {id: 509, cat: XXX, desc: "Буккаке / Bukkake"}
-    - {id: 1859, cat: XXX, desc: "Гэнг-бэнг / GangBang"}
-    - {id: 1685, cat: XXX, desc: "Мочеиспускание / Peeing"}
-    - {id: 1762, cat: XXX, desc: "Фетиш / Fetish"}
-    - {id: 1681, cat: XXX, desc: "Дефекация / Scat"}
-    - {id: 1683, cat: XXX, desc: "Архив (общий)"}
-
-    - {id: 1688, cat: XXX, desc: "Гей-порно / Gay Forum"}
-    - {id: 903, cat: XXX, desc: "Полнометражные гей-фильмы / Full Length Movies (Gay)"}
-    - {id: 1765, cat: XXX, desc: "Полнометражные азиатские гей-фильмы / Full-length Asian (Gay)"}
-    - {id: 1767, cat: XXX, desc: "Классические гей-фильмы (до 1990 года) / Classic Gay Films (Pre-1990's)"}
-    - {id: 1755, cat: XXX, desc: "Гей-фильмы в высоком качестве (DVD и HD) / High-Quality Full Length Movies (Gay DVD & HD)"}
-    - {id: 1787, cat: XXX, desc: "Азиатские гей-фильмы в высоком качестве (DVD и HD) / High-Quality Full Length Asian Movies (Gay DVD & HD)"}
-    - {id: 1763, cat: XXX/Pack, desc: "ПАКи гей-роликов и сайтрипов / Clip's & SiteRip's Packs (Gay)"}
-    - {id: 1777, cat: XXX, desc: "Гей-ролики в высоком качестве (HD Video) / Gay Clips (HD Video)"}
-    - {id: 1691, cat: XXX, desc: "Ролики, SiteRip'ы и сцены из гей-фильмов / Clips & Movie Scenes (Gay)"}
-    - {id: 1692, cat: XXX/ImageSet, desc: "Гей-журналы, фото, разное / Magazines, Photo, Rest (Gay)"}
-    - {id: 1720, cat: XXX, desc: "Архив (Гей-порно)"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: stripcyrillic
-    type: checkbox
-    label: Strip Cyrillic Letters
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-login:
-  path: forum/index.php
-  method: form
-  form: form[action="/forum/login.php"]
-  inputs:
-    login_username: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-  error:
-    - selector: div:contains("Форум временно отключен")
-    - selector: h4.warnColor1.tCenter.mrg_16
-  test:
-    path: forum/index.php
-    selector: div.topmenu a[onclick*=logout]
-
-search:
-  paths:
-    - path: forum/tracker.php
-  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
-    o: "{{ .Config.sort }}"
-    s: "{{ .Config.type }}"
-    nm: "{{ .Keywords }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\W+", " "]
-    - name: trim
-
-  rows:
-    selector: table#tor-tbl > tbody > tr:has(a.tr-dl)
-
-  fields:
-    category:
-      selector: a.f
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    title:
-      selector: a.tLink
-      filters:
-        - name: re_replace
-          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: trim
-    details:
-      selector: a.tLink
-      attribute: href
-    download:
-      selector: a.tr-dl
-      attribute: href
-    size:
-      selector: td:nth-child(6) u
-    date:
-      # unix
-      selector: td:nth-child(11) u
-    seeders:
-      selector: td.seedmed > b
-      optional: true
-      default: 0
-    leechers:
-      selector: td.leechmed > b
-    grabs:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.31
-# engine n/a
--- a/definitions/v10/tapochek.yml
+++ b/definitions/v10/tapochek.yml
@@ -1,408 +0,0 @@
---
-id: tapochek
-name: Tapochek
-description: "Tapochek is a RUSSIAN Private Torrent Tracker for 0DAY / GENERAL"
-language: ru-RU
-type: private
-encoding: windows-1251
-links:
-  - https://tapochek.net/
-legacylinks:
-  - http://tapochek.net/
-
-caps:
-  categorymappings:
-    # PC Games      # Игры для PC
-    - {id: 2, cat: PC/Games, desc: "Игры для PC (в разработке, разное, обсуждения)"}
-    - {id: 14, cat: PC/Games, desc: "Игры в разработке и демо-версии"}
-    - {id: 9, cat: PC/Games, desc: "Разное (дополнения, патчи, русификаторы)"}
-    - {id: 18, cat: PC/Games, desc: "Горячие новинки"}
-    - {id: 24, cat: PC/Games, desc: "Приключения и квесты"}
-    - {id: 25, cat: PC/Games, desc: "Стратегии"}
-    - {id: 19, cat: PC/Games, desc: "Аркады"}
-    - {id: 29, cat: PC/Games, desc: "Симуляторы"}
-    - {id: 35, cat: PC/Games, desc: "Экшены"}
-    - {id: 40, cat: PC/Games, desc: "Ролевые игры"}
-    - {id: 41, cat: PC/Games, desc: "Эротические игры"}
-    - {id: 43, cat: PC/Games, desc: "Эротические"}
-    - {id: 42, cat: PC/Games, desc: "Хентайные"}
-    - {id: 968, cat: PC/Games, desc: "Игры для VR"}
-    - {id: 46, cat: PC/Games, desc: "Для самых маленьких"}
-    - {id: 978, cat: PC/Games, desc: "Игры для macOS и Linux"}
-    # Games for Consoles      # Игры для Консолей
-    - {id: 69, cat: Console/XBox, desc: "Xbox"}
-    - {id: 86, cat: Console/XBox 360, desc: "XBox360 | Игры"}
-    - {id: 646, cat: Console/XBox 360, desc: "XBox360 | JTAG"}
-    - {id: 87, cat: Console/XBox 360, desc: "XBox360 | 360E"}
-    - {id: 89, cat: Console/XBox 360, desc: "XBox360 | Demo"}
-    - {id: 612, cat: Console/XBox 360, desc: "XBox360 | Live"}
-    - {id: 614, cat: Console/XBox 360, desc: "XBox360 | Soft"}
-    - {id: 88, cat: Console/XBox, desc: "XBox | Игры"}
-    - {id: 70, cat: Console/PSP, desc: "PlayStation"}
-    - {id: 973, cat: Console/PS4, desc: "PS5 | Игры"}
-    - {id: 910, cat: Console/PS4, desc: "PS4 | Игры"}
-    - {id: 911, cat: Console/PS4, desc: "PS4 | Сцена"}
-    - {id: 689, cat: Console/PS3, desc: "PS3 | Игры"}
-    - {id: 818, cat: Console/PS3, desc: "PS3 | Сцена"}
-    - {id: 696, cat: Console/PSP, desc: "PSN | Игры"}
-    - {id: 853, cat: Console/PS3, desc: "PS3 | Emulation"}
-    - {id: 904, cat: Console/PS Vita, desc: "PS Vita | Игры"}
-    - {id: 102, cat: Console/PSP, desc: "PSP | Игры"}
-    - {id: 103, cat: Console/PS3, desc: "PS2 | Игры"}
-    - {id: 104, cat: Console/PSP, desc: "PSX | Игры"}
-    - {id: 435, cat: Console/PSP, desc: "PSP | Сцена"}
-    - {id: 105, cat: Console/PSP, desc: "PSP | PSX-PSP"}
-    - {id: 690, cat: Console/PS3, desc: "PS3 | Прочее"}
-    - {id: 178, cat: Console/PSP, desc: "PSP | Прочее"}
-    - {id: 78, cat: Console/NDS, desc: "Nintendo"}
-    - {id: 148, cat: Console/NDS, desc: "Архив (Nintendo)"}
-    - {id: 116, cat: Console/NDS, desc: "NDS | Игры"}
-    - {id: 885, cat: Console/3DS, desc: "3DS | Игры"}
-    - {id: 912, cat: Console, desc: "Switch | Игры"}
-    - {id: 115, cat: Console/Wii, desc: "Wii | Игры"}
-    - {id: 899, cat: Console/WiiU, desc: "Wii U | Игры"}
-    - {id: 900, cat: Console/WiiU, desc: "Wii U | Сцена"}
-    - {id: 381, cat: Console/Wiiware, desc: "WiiWare | Игры"}
-    - {id: 382, cat: Console, desc: "GameCube | Игры"}
-    - {id: 349, cat: Console, desc: "Sega"}
-    - {id: 350, cat: Console, desc: "Dreamcast | Игры"}
-    - {id: 351, cat: Console, desc: "Saturn | Игры"}
-    - {id: 352, cat: Console, desc: "Игры для старых консолей"}
-    - {id: 390, cat: Console, desc: "Коллекции (игры для разных платформ)"}
-    # Cinema      # Кинематограф
-    - {id: 964, cat: Movies/UHD, desc: "Новинки | UHD 4K"}
-    - {id: 431, cat: Movies/WEB-DL, desc: "Новинки | HD"}
-    - {id: 430, cat: Movies, desc: "Новинки | Rips"}
-    - {id: 703, cat: Movies, desc: "Новинки | CAMRip, TS, WEBRip(LQ)"}
-    - {id: 963, cat: Movies/UHD, desc: "Зарубежное кино | UHD 4K"}
-    - {id: 122, cat: Movies/HD, desc: "Зарубежное кино | HD"}
-    - {id: 124, cat: Movies/Foreign, desc: "Зарубежное кино | Rips"}
-    - {id: 123, cat: Movies, desc: "Сборники фильмов"}
-    - {id: 974, cat: Movies/UHD, desc: "Отечественное кино | UHD 4K"}
-    - {id: 128, cat: Movies/HD, desc: "Отечественное кино | HD Rips"}
-    - {id: 133, cat: Movies/DVD, desc: "Отечественное кино | DVD"}
-    - {id: 131, cat: Movies, desc: "Российское и советское кино | Rips"}
-    - {id: 869, cat: Movies/3D, desc: "3D"}
-    - {id: 886, cat: Movies, desc: "Новинки зарубежных сериалов (2024-2025)"}
-    - {id: 160, cat: TV, desc: "Отечественные cериалы"}
-    - {id: 135, cat: Movies, desc: "Зарубежные сериалы до 2025г."}
-    - {id: 979, cat: TV, desc: "Русские сериалы до 2025г"}
-    - {id: 938, cat: TV/HD, desc: "Мультфильмы | Blu-Ray и BDRemux"}
-    - {id: 324, cat: TV/HD, desc: "Мультфильмы | HD Rips"}
-    - {id: 328, cat: TV, desc: "Мультфильмы | Rips"}
-    - {id: 330, cat: TV, desc: "Сборники мультфильмов"}
-    - {id: 321, cat: TV, desc: "Мультсериалы"}
-    - {id: 162, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"}
-    # Anime      # Аниме
-    - {id: 693, cat: TV/Anime, desc: "Аниме (Основной)"}
-    - {id: 660, cat: TV/Anime, desc: "Онгоинги и новинки аниме"}
-    - {id: 95, cat: TV/Anime, desc: "Аниме (HD)"}
-    - {id: 684, cat: TV/Anime, desc: "Аниме (Rips | DVD)"}
-    - {id: 106, cat: TV/Anime, desc: "Манга и прочий арт"}
-    - {id: 680, cat: TV/Anime, desc: "Аниме (Хентай)"}
-    - {id: 682, cat: TV/Anime, desc: "Аниме UnCensored"}
-    - {id: 681, cat: TV/Anime, desc: "Аниме Censored"}
-    - {id: 697, cat: TV/Anime, desc: "Аниме Манга, обои, артбуки и др."}
-    # Music and Music Video      # Музыка и Музыкальное видео
-    - {id: 450, cat: Audio, desc: "Общий раздел музыки"}
-    - {id: 470, cat: Audio, desc: "Классическая музыка"}
-    - {id: 495, cat: Audio, desc: "New Age, Relax, Meditative & Flamenco"}
-    - {id: 456, cat: Audio, desc: "Jazz, Blues"}
-    - {id: 462, cat: Audio, desc: "Reggae, Ska, Dub"}
-    - {id: 491, cat: Audio, desc: "Фольклор, Народная и Этническая музыка"}
-    - {id: 468, cat: Audio, desc: "Зарубежный Rock"}
-    - {id: 469, cat: Audio/Lossless, desc: "Rосk, Mеtаl, Аltеrnаtivе, Рunk, Indереndеnt (lоsslеss)"}
-    - {id: 472, cat: Audio/MP3, desc: "Rосk, Mеtаl, Аltеrnаtivе, Рunk, Indереndеnt (mp3)"}
-    - {id: 476, cat: Audio, desc: "Отечественный Rock"}
-    - {id: 477, cat: Audio/Lossless, desc: "Rосk, Metal, Punk, Alternative (losslеss)"}
-    - {id: 479, cat: Audio/MP3, desc: "Rосk, Metal, Punk, Alternative (mр3)"}
-    - {id: 482, cat: Audio, desc: "Поп-музыка, Eurodance, Disco"}
-    - {id: 483, cat: Audio, desc: "Зарубежная Поп-музыка"}
-    - {id: 484, cat: Audio, desc: "Отечественная Поп-музыка"}
-    - {id: 485, cat: Audio, desc: "Eurodance, Technopop, Disco"}
-    - {id: 489, cat: Audio/MP3, desc: "Поп-музыка, Eurodance, Disco (сборники) (mp3)"}
-    - {id: 503, cat: Audio, desc: "Rap, Hip-Hop, R'n'B"}
-    - {id: 504, cat: Audio, desc: "Зарубежный Rap, Hip-Hop, R'n'B"}
-    - {id: 505, cat: Audio, desc: "Отечественный Rap, Hip-Hop, R'n'B"}
-    - {id: 509, cat: Audio, desc: "Электронная музыка"}
-    - {id: 510, cat: Audio, desc: "Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub"}
-    - {id: 511, cat: Audio, desc: "House, Techno, Hardcore, Hardstyle, Jumpstyle"}
-    - {id: 512, cat: Audio, desc: "Drum & Bass, Jungle, Breakbeat, Dubstep, IDM"}
-    - {id: 513, cat: Audio, desc: "Chillout, Lounge, Downtempo, Trip-Hop"}
-    - {id: 514, cat: Audio, desc: "Traditional Electronic, Ambient, Experimental"}
-    - {id: 515, cat: Audio, desc: "Industrial, Noise, EBM, Dark Electro, Aggrotech, Synthpop, N.."}
-    - {id: 534, cat: Audio, desc: "Музыка разное"}
-    - {id: 396, cat: Audio, desc: "Саундтреки"}
-    - {id: 542, cat: Audio, desc: "Неофициальные и внежанровые сборники"}
-    - {id: 547, cat: Audio, desc: "Hi-Res stereo"}
-    - {id: 546, cat: Audio, desc: "Собственные оцифровки"}
-    - {id: 535, cat: Audio, desc: "Музыка других жанров"}
-    - {id: 539, cat: Audio, desc: "Музыкальное видео"}
-    # Software      # Программное обеспечение
-    - {id: 639, cat: TV, desc: "Обучающие видеоматериалы"}
-    - {id: 202, cat: TV, desc: "macOS и ПО под них"}
-    - {id: 274, cat: TV, desc: "Веб-разработка и программирование"}
-    - {id: 303, cat: TV, desc: "Материалы для мультимедиа и дизайна"}
-    - {id: 969, cat: PC, desc: "Windows 11"}
-    - {id: 905, cat: PC, desc: "Windows 10"}
-    - {id: 230, cat: PC, desc: "Windows 7"}
-    - {id: 227, cat: PC, desc: "Настольные OS, выпущенные до 2001 года (Microsoft Windows OS.."}
-    - {id: 970, cat: PC, desc: "Сборки (Microsoft Windows 11)"}
-    - {id: 906, cat: PC, desc: "Сборки (Microsoft Windows 10)"}
-    - {id: 701, cat: PC, desc: "Сборки (Microsoft Windows 7)"}
-    - {id: 231, cat: PC, desc: "Серверные (Microsoft Windows OS)"}
-    - {id: 232, cat: PC, desc: "Разное (Microsoft Windows, WinXP, Vista, 8)"}
-    - {id: 236, cat: PC, desc: "Работа с жёстким диском"}
-    - {id: 237, cat: PC, desc: "Резервное копирование"}
-    - {id: 240, cat: PC, desc: "Архиваторы и файловые менеджеры"}
-    - {id: 239, cat: PC, desc: "Программы для настройки и оптимизации ОС"}
-    - {id: 241, cat: PC, desc: "Сервисное обслуживание компьютера"}
-    - {id: 242, cat: PC, desc: "Работа с носителями информации"}
-    - {id: 243, cat: PC, desc: "Информация и диагностика"}
-    - {id: 244, cat: PC, desc: "Программы для интернет и сетей"}
-    - {id: 245, cat: PC, desc: "Антивирусы и Файерволы"}
-    - {id: 246, cat: PC, desc: "Программы для защиты информации"}
-    - {id: 247, cat: PC, desc: "Драйвера"}
-    - {id: 248, cat: PC, desc: "Серверное ПО для Windows"}
-    - {id: 249, cat: PC, desc: "Изменение интерфейса ОС Windows"}
-    - {id: 250, cat: PC, desc: "Скринсейверы"}
-    - {id: 251, cat: PC, desc: "Разное (Системные программы под Windows)"}
-    - {id: 409, cat: PC, desc: "Системы автоматизации проектных работ (САПР)"}
-    - {id: 607, cat: PC, desc: "Программы для архитекторов и дизайнеров интерьеров"}
-    - {id: 593, cat: PC, desc: "Офисные программы и системы"}
-    - {id: 595, cat: PC, desc: "Системы для научной работы"}
-    - {id: 594, cat: PC, desc: "Системы для бизнеса"}
-    - {id: 257, cat: PC, desc: "Каталогизаторы и просмотрщики графики"}
-    - {id: 258, cat: PC, desc: "Аудио- и видео-, CD- проигрыватели и каталогизаторы"}
-    - {id: 259, cat: PC, desc: "Программы для интернет и сетей"}
-    - {id: 260, cat: PC, desc: "Распознавание текста, звука и синтез речи"}
-    - {id: 261, cat: PC, desc: "Словари и переводчики"}
-    - {id: 262, cat: PC, desc: "Программное обеспечение для автолюбителей"}
-    - {id: 263, cat: PC, desc: "Медицинское программное обеспечение"}
-    - {id: 264, cat: PC, desc: "Справочные системы и карты"}
-    - {id: 265, cat: PC, desc: "Разное (Пользовательские программы)"}
-    - {id: 278, cat: PC, desc: "Программные комплекты"}
-    - {id: 280, cat: PC, desc: "Графические редакторы"}
-    - {id: 281, cat: PC, desc: "Программы для верстки, печати и работы со шрифтами"}
-    - {id: 282, cat: PC, desc: "3D моделирование, рендеринг и плагины для них"}
-    - {id: 283, cat: PC, desc: "Анимация"}
-    - {id: 285, cat: PC, desc: "Редакторы видео"}
-    - {id: 286, cat: PC, desc: "Видео- Аудио- конверторы"}
-    - {id: 287, cat: PC, desc: "Работа со звуком"}
-    - {id: 290, cat: PC, desc: "Разное (Программы для работы с мультимедиа и 3D)"}
-    - {id: 623, cat: PC, desc: "Мобильные телефоны"}
-    - {id: 624, cat: PC, desc: "КПК"}
-    - {id: 625, cat: PC, desc: "Навигаторы"}
-    # Library      # Библиотека
-    - {id: 717, cat: Books, desc: "Аудиокниги"}
-    - {id: 738, cat: Books, desc: "Детектив / боевик"}
-    - {id: 739, cat: Books, desc: "Фантастика / фэнтези / мистика / ужасы"}
-    - {id: 836, cat: Books, desc: "Роман / комедийные произведения / приключения"}
-    - {id: 838, cat: Books, desc: "Классическая литература и современная проза"}
-    - {id: 837, cat: Books, desc: "Образование и Право"}
-    - {id: 843, cat: Books, desc: "Разное"}
-    - {id: 713, cat: Books, desc: "Художественная литература"}
-    - {id: 724, cat: Books, desc: "Детектив / боевик"}
-    - {id: 728, cat: Books, desc: "Фантастика / фэнтези / мистика / ужасы"}
-    - {id: 725, cat: Books, desc: "Роман / приключения / драма"}
-    - {id: 727, cat: Books, desc: "Комедийные произведения"}
-    - {id: 723, cat: Books, desc: "Историческая книга"}
-    - {id: 721, cat: Books, desc: "Классическая литература и современная проза"}
-    - {id: 722, cat: Books, desc: "Поэзия"}
-    - {id: 844, cat: Books, desc: "Разное"}
-    - {id: 718, cat: Books, desc: "Журналы"}
-    - {id: 763, cat: Books, desc: "Эротические журналы"}
-    - {id: 715, cat: Books, desc: "Компьютерная литература"}
-    - {id: 839, cat: Books, desc: "Научная и тех.литература"}
-    - {id: 719, cat: Books, desc: "Образование, Право и Психология"}
-    - {id: 846, cat: Books, desc: "Сексология"}
-    - {id: 840, cat: Books, desc: "Военное дело"}
-    - {id: 842, cat: Books, desc: "Спорт и физическое воспитание"}
-    - {id: 841, cat: Books, desc: "Хобби"}
-    - {id: 716, cat: Books, desc: "Дом и семейный очаг"}
-    - {id: 714, cat: Books, desc: "Книги для малышей и их родителей"}
-    - {id: 845, cat: Books, desc: "Комиксы"}
-    - {id: 741, cat: Books, desc: "Разное"}
-    # Release - groups      # Релиз - группы
-    - {id: 378, cat: Other, desc: "Анонсы"}
-    # Miscellanea      # Разное
-    - {id: 644, cat: Other, desc: "Разное"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: info_ymd
-    type: info
-    label: About the date
-    default: Before using this indexer please check on the Tapochek website that your account profile <b>Y-m-d</b> setting is <b>Y-m-d H:i</b>. If it is anything else then this indexer will generate a parse error and not return results.
-  - name: stripcyrillic
-    type: checkbox
-    label: Strip Cyrillic Letters
-    default: false
-  - name: addrussiantotitle
-    type: checkbox
-    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
-    default: false
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - name: info_flaresolverr
-    type: info_flaresolverr
-
-login:
-  path: login.php
-  method: form
-  form: form[action$="/login.php"]
-  inputs:
-    login_username: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-    autologin: 1
-    redirect: index.php
-  error:
-    - selector: h4:contains("Вы ввели")
-  test:
-    path: index.php
-    selector: a[href="./login.php?logout=1"]
-
-search:
-  paths:
-    # https://tapochek.net/tracker.php?f=-1&gold=1&silver=1&o=1&s=2&tm=-1&sns=-1#results
-    - path: tracker.php
-  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
-    nm: "{{ .Keywords }}"
-    o: "{{ .Config.sort }}"
-    s: "{{ .Config.type }}"
-    tm: -1
-    sns: -1
-    gold: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  keywordsfilters:
-    - name: re_replace # S01 to сезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
-    - name: re_replace # E02 to сери 1
-      args: ["(?i)\\bE0*(\\d+)\\b", "сери $1"]
-    - name: re_replace # S01E02 to сезон 1 сери 2
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 сери $2"]
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
-
-  fields:
-    category:
-      selector: td a.gen
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    title:
-      selector: a.genmed, a.seedmed
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
-        - name: replace
-          args: ["Кураж-Бамбей", "kurazh"]
-        - name: replace
-          args: ["Кубик в Кубе", "Kubik"]
-        - name: re_replace
-          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
-        - name: re_replace
-          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
-        - name: append
-          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
-    details:
-      selector: a.genmed, a.seedmed
-      attribute: href
-    download:
-      selector: a[href^="./download.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-child(6) > u
-    date:
-      # unix
-      selector: td:last-child > u
-    seeders:
-      selector: td.seedmed > b
-    leechers:
-      selector: td.leechmed > b
-    downloadvolumefactor:
-      case:
-        img[src="images/tor_gold.gif"]: 0
-        img[src="images/tor_silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.5
-    description:
-      selector: a.genmed, a.seedmed
-# TorrentPier
--- a/definitions/v10/torrentby.yml
+++ b/definitions/v10/torrentby.yml
@@ -1,128 +0,0 @@
---
-id: torrentby
-name: torrent.by
-description: "torrent.by is a BELARUSIAN Public Torrent Tracker"
-language: ru-RU
-type: public
-encoding: UTF-8
-requestDelay: 5
-links:
-  - https://torrent.by/
-legacylinks:
-  - http://torrent.by/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: stripcyrillic
-    type: checkbox
-    label: Strip Cyrillic Letters
-    default: false
-  - name: addrussiantotitle
-    type: checkbox
-    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
-    default: false
-  - name: info_category_8000
-    type: info
-    label: About torrent.by Categories
-    default: torrent.by does not return categories in its search results. To sync to your apps, include 8000(Other) in your Apps' Sync Categories.
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search/?search={{ .Keywords }}&cat=0&search_in=0{{ else }}today/{{ end }}"
-
-  keywordsfilters:
-    # strip season and/or ep
-    - name: re_replace
-      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
-
-  rows:
-    selector: tr[class^="ttable_col"]
-
-  fields:
-    category:
-      text: other
-    title:
-      selector: td:nth-child(3) a
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)[xх](\\d+(?:-\\d+)?)\\s*из\\s*(\\d+)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)[xх](\\d+(?:-\\d+)?)", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\d+)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)\\bFiles-х\\b", "Files-x"]
-        - name: re_replace
-          args: ["(?i)\\sот\\s([\\w\\p{P}\\p{S}]+)$", "-$1"]
-        - name: re_replace
-          args: ["\\s\\|\\s(\\w{4,})$", "-$1"]
-        - name: re_replace
-          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
-        - name: re_replace
-          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
-        - name: append
-          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
-    details:
-      selector: td:nth-child(3) a
-      attribute: href
-    download:
-      selector: a.dwnld
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    size:
-      selector: td:nth-child(5)
-    seeders:
-      selector: font[color="green"]
-    leechers:
-      selector: font[color="red"]
-    date_day:
-      selector: td:nth-child(1):contains("Вчера"), td:nth-child(1):contains("Сегодня")
-      optional: true
-      filters:
-        - name: replace
-          args: ["Вчера", "Yesterday"]
-        - name: replace
-          args: ["Сегодня", "Today"]
-        - name: fuzzytime
-    date_year:
-      selector: td:nth-child(1):contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "yyyy-MM-dd zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    description:
-      selector: td:nth-child(3) a
-# engine n/a
--- a/definitions/v10/torrentkitty.yml
+++ b/definitions/v10/torrentkitty.yml
@@ -1,74 +0,0 @@
---
-id: torrentkitty
-name: TorrentKitty
-description: "TorrentKitty is a Public torrent indexer"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://www.torrentkitty.cam/
-  - https://www.torrentkitty.ink/
-  - https://www.torrentkitty.io/
-  - https://www.torrentkitty.vip/
-  - https://www.torrentkitty.app/
-  - https://www.torrentkitty.red/
-  - https://www.torrentkitty.lol/
-  - https://www.torrentkitty.best/
-  - https://torkitty.com/
-legacylinks:
-  - https://www.torrentkitty.se/
-  - https://www.torrentkitty.tv/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info_flaresolverr
-    type: info_flaresolverr
-  - name: info_category_8000
-    type: info
-    label: About TorrentKitty Categories
-    default: TorrentKitty does not return categories in its search results. To sync to your apps, include 8000(Other) in your Apps' Sync Categories.
-
-search:
-  paths:
-    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-
-  rows:
-    selector: table#archiveResult tbody tr:has(a[href^="magnet:?xt="])
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: td.name
-    details:
-      selector: td.action a
-      attribute: href
-    download:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: td.date
-      filters:
-        - name: append
-          args: " -07:00" # PDT
-        - name: dateparse
-          args: "yyyy-MM-dd zzz"
-    size:
-      selector: td.size
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/definitions/v10/torrentleech.yml
+++ b/definitions/v10/torrentleech.yml
@@ -1,224 +0,0 @@
---
-id: torrentleech
-name: TorrentLeech
-description: "TorrentLeech (TL) is a Private Torrent Tracker for 0DAY / GENERAL. not here _ not scene"
-language: en-US
-type: private
-encoding: UTF-8
-requestDelay: 4.1 # #13796
-links:
-  - https://www.torrentleech.org/
-  - https://www.torrentleech.cc/
-  - https://www.torrentleech.me/
-  - https://www.tleechreload.org/
-  - https://www.tlgetin.cc/
-legacylinks:
-  - https://v4.torrentleech.org/
-
-caps:
-  categorymappings:
-    - {id: 8, cat: Movies/SD, desc: "Movies Cam"}
-    - {id: 9, cat: Movies/SD, desc: "Movies TS/TC"}
-    - {id: 11, cat: Movies/SD, desc: "Movies DVDRip/DVDScreener"}
-    - {id: 37, cat: Movies/WEB-DL, desc: "Movies WEBRip"}
-    - {id: 43, cat: Movies/HD, desc: "Movies HDRip"}
-    - {id: 14, cat: Movies/HD, desc: "Movies BlurayRip"}
-    - {id: 12, cat: Movies/DVD, desc: "Movies DVD-R"}
-    - {id: 13, cat: Movies/BluRay, desc: "Movies Bluray"}
-    - {id: 47, cat: Movies/UHD, desc: "Movies 4K"}
-    - {id: 15, cat: Movies, desc: "Movies Boxsets"}
-    - {id: 29, cat: TV/Documentary, desc: "Documentaries"}
-
-    - {id: 26, cat: TV/SD, desc: "TV Episodes"}
-    - {id: 32, cat: TV/HD, desc: "TV Episodes HD"}
-    - {id: 27, cat: TV, desc: "TV Boxsets"}
-
-    - {id: 17, cat: PC/Games, desc: "Games PC"}
-    - {id: 42, cat: PC/Mac, desc: "Games Mac"}
-    - {id: 18, cat: Console/XBox, desc: "Games XBOX"}
-    - {id: 19, cat: Console/XBox 360, desc: "Games XBOX360"}
-    - {id: 40, cat: Console/XBox One, desc: "Games XBOXONE"}
-    - {id: 20, cat: Console/PS3, desc: "Games PS2"}
-    - {id: 21, cat: Console/PS3, desc: "Games Mac"}
-    - {id: 39, cat: Console/PS4, desc: "Games PS4"}
-    - {id: 49, cat: Console/PS4, desc: "Games PS5"}
-    - {id: 22, cat: Console/PSP, desc: "Games PSP"}
-    - {id: 28, cat: Console/Wii, desc: "Games Wii"}
-    - {id: 30, cat: Console/NDS, desc: "Games Nintendo DS"}
-    - {id: 48, cat: Console/Other, desc: "Games Nintendo Switch"}
-
-    - {id: 23, cat: PC/ISO, desc: "PC ISO"}
-    - {id: 24, cat: PC/Mac, desc: "PC Mac"}
-    - {id: 25, cat: PC/Mobile-Other, desc: "PC Mobile"}
-    - {id: 33, cat: PC/0day, desc: "PC 0-day"}
-    - {id: 38, cat: Other, desc: "Education"}
-
-    - {id: 34, cat: TV/Anime, desc: "TV Anime"}
-    - {id: 35, cat: TV, desc: "TV Cartoons"}
-
-    - {id: 45, cat: Books/EBook, desc: "Books EBooks"}
-    - {id: 46, cat: Books/Comics, desc: "Books Comics"}
-
-    - {id: 31, cat: Audio, desc: "Audio"}
-    - {id: 16, cat: Audio/Video, desc: "Music videos"}
-
-    - {id: 36, cat: Movies/Foreign, desc: "Movies Foreign"}
-    - {id: 44, cat: TV/Foreign, desc: "TV Foreign"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-  allowrawsearch: true
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: alt2fatoken
-    type: text
-    label: Alt 2FA Token
-  - name: info_alt2fatoken
-    type: info
-    label: "About Alt 2FA Token"
-    default: "(Site Profile => Alt 2FA Token) Only fill in the <b>Alt 2FA Token</b> if you have enabled <b>2FA</b> on the TorrentLeech Web Site. Otherwise just leave it empty."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: exclude_scene
-    type: checkbox
-    label: Exclude SCENE torrents from results
-    default: false
-  - name: exclude_archives
-    type: checkbox
-    label: Exclude torrents with the tag RAR from results (does not support IMDBID search)
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      nameSort: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    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.
-  - name: info_flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Prowlarr requires <a href="https://wiki.servarr.com/prowlarr/faq#can-i-use-flaresolverr-indexers" target="_blank" rel="noreferrer">FlareSolverr</a> to access it.
-
-login:
-  path: user/account/login/
-  method: form
-  form: form[name="login-form"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    alt2FAToken: "{{ .Config.alt2fatoken }}"
-  error:
-    - selector: p.text-danger
-    - selector: .login-container h2:contains("One Time Password")
-      message:
-        text: "Your TorrentLeech account has 2FA enabled. Please recheck your indexer settings."
-    - selector: form[name="login-form"]
-      message:
-        text: "Login page detected at {{ .Config.sitelink }}."
-  test:
-    path: /
-    selector: a[href="/user/account/logout"]
-
-search:
-  paths:
-    # "newfilter/2" include 0day and music
-    # https://www.torrentleech.org/torrents/browse/list/categories/29,2,26,27,32,44,7,34,35/facets/tags:FREELEECH,nonscene/exact/1/query/friends/orderby/added/order/desc
-    - path: "torrents/browse/list{{ if .Categories }}/categories/{{ join .Categories \",\" }}{{ else }}{{ end }}{{ if or .Config.freeleech .Config.exclude_scene }}/facets/tags:{{ else }}{{ end }}{{ if .Config.freeleech }}FREELEECH{{ else }}{{ end }}{{ if and .Config.freeleech .Config.exclude_scene }},{{ else }}{{ end }}{{ if .Config.exclude_scene }}nonscene{{ else }}{{ end }}/{{ if .Query.IMDBID }}imdbID/{{ .Query.IMDBID }}/{{ else }}exact/1/query/{{ .Keywords }}/{{ end }}{{ if .Keywords }}{{ else }}newfilter/2/{{ end }}orderby/{{ .Config.sort }}/order/{{ .Config.type }}"
-      response:
-        type: json
-
-  keywordsfilters:
-    # remove dashes at the beginning of keywords as they exclude search strings (see issue #3096)
-    - name: re_replace
-      args: ["(^|\\s)-", " "]
-    - name: append
-      args: "{{ if .Config.exclude_archives }} -tags:rar{{ else }}{{ end }}"
-  rows:
-    selector: torrentList
-    count:
-      selector: $.numFound
-
-  fields:
-    category:
-      selector: categoryID
-    title_test: # title can be null #13736
-      selector: name
-      optional: true
-      filters:
-        # remove [REQ]/[REQUEST]
-        - name: re_replace
-          args: ["(?i)^\\[REQ(UEST(ED)?)?\\]\\s*", ""]
-    title:
-      text: "{{ if .Result.title_test }}{{ .Result.title_test }}{{ else }}TorrentLeech did not provide a title{{ end }}"
-    _id:
-      selector: fid
-    _filename:
-      selector: filename
-    details:
-      text: "/torrent/{{ .Result._id }}"
-    download:
-      text: "/download/{{ .Result._id }}/{{ .Result._filename }}"
-    genre:
-      selector: tags
-      filters:
-        - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Kids, Music, Musical, Mystery, News, Reality-TV, Romance, Sci-Fi, Science-Fiction, Sport, Soap, Talk-Show, Thriller, War, Western"
-    description:
-      text: "{{ .Result.genre }}"
-    imdbid:
-      selector: imdbID
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: completed
-    date:
-      # 2021-10-25 02:18:31
-      selector: addedTimestamp
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss"
-    size:
-      selector: size
-    downloadvolumefactor:
-      # freeleech #6579 #6624 #7367
-      selector: download_multiplier
-      case:
-        0: 0 # freeleech
-        "*": 1 # not free
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 10 days for registered users, less for upgraded users
-      # 10 day (as seconds = 7 x 24 x 60 x 60)
-      text: 864000
-# json engine n/a
--- a/definitions/v10/torrentoyunindir.yml
+++ b/definitions/v10/torrentoyunindir.yml
@@ -1,72 +0,0 @@
---
-id: torrentoyunindir
-name: Torrent Oyun indir
-description: "Torrent Oyun indir is a TURKISH Public torrent site for GAMES"
-language: tr-TR
-type: public
-encoding: UTF-8
-links:
-  - https://0.torrentoyunindir.com/
-legacylinks:
-  - https://www.torrentoyunindir.com/
-  - http://0.torrentoyunindir.com/
-
-caps:
-  categories:
-    1: PC/Games
-
-  modes:
-    search: [q]
-
-settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Prowlarr requires <a href="https://wiki.servarr.com/prowlarr/faq#can-i-use-flaresolverr-indexers" target="_blank" rel="noreferrer">FlareSolverr</a> to access it.
-
-download:
-  selectors:
-    - selector: div.facepaylas a
-      attribute: href
-
-search:
-  paths:
-    - path: /
-  inputs:
-    s: "{{ .Keywords }}"
-
-  rows:
-    selector: div.moviefilm
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: 1
-    title:
-      selector: div.movief
-    details:
-      selector: a
-      attribute: href
-    download:
-      selector: a
-      attribute: href
-    description:
-      selector: a > span
-      attribute: class
-    poster:
-      selector: img
-      attribute: src
-    date:
-      text: now
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/definitions/v10/torrentproject2.yml
+++ b/definitions/v10/torrentproject2.yml
@@ -1,119 +0,0 @@
---
-id: torrentproject2
-name: TorrentProject2
-description: "TorrentProject2 is a Public torrent meta-search engine"
-language: en-US
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://torrentproject2.net/
-  - https://torrentproject2.org/
-  - https://torrentproject.info/
-  - https://torrentproject.biz/
-  - https://torrentproject.xyz/
-  - https://torrentproject.cc/
-  - https://torrentproject.torrentbay.st/
-legacylinks:
-  - https://torrentproject2.se/
-  - https://torrentproject2.com/
-
-caps:
-  categorymappings:
-    - {id: Other, cat: Other, desc: Other}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: filter-verified
-    type: checkbox
-    label: "Only include verifed content in results"
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: latest
-    options:
-      latest: "created desc"
-      oldest: "created asc"
-      seeders: seeders
-      size: size
-  - name: info_category_8000
-    type: info
-    label: About TorrentProject2 Categories
-    default: TorrentProject2 does not return categories in its search results. To sync to your apps, include 8000(Other) in your Apps' Sync Categories.
-
-download:
-  selectors:
-    - selector: "#download > div:nth-child(2) > div:nth-child(1) > a"
-      attribute: href
-      filters:
-        - name: replace
-          args: ["https://mylink.me.uk/?url=", ""]
-        - name: replace
-          args: ["https://mylink.cx/?url=", ""]
-        - name: replace
-          args: ["https://mylink.cloud/?url=", ""]
-        - name: urldecode
-
-search:
-  paths:
-    # browse for latest, / for keywords, 50 rows per page
-    - path: "{{ if .Keywords }}/{{ else }}browse{{ end }}"
-    - path: "{{ if .Keywords }}/{{ else }}browse{{ end }}"
-      inputs:
-        p: 1
-  inputs:
-    t: "{{ .Keywords }}"
-    orderby: "{{ if .Keywords }}{{ .Config.sort }}{{ else }}{{ end }}"
-    safe: "{{ if and .Keywords .Config.filter-verified }}on{{ else }}{{ end }}"
-
-  headers:
-    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36 Edg/115.0.1901.203"]
-
-  rows:
-    selector: "#similarfiles div:has(a[href^=\"/t\"])"
-
-  fields:
-    category:
-      # while browse has cats the search does not (atm) so we wont support cats for now.
-      text: Other
-    title:
-      selector: :scope > span > a
-    details:
-      selector: :scope > span > a
-      attribute: href
-    download:
-      selector: :scope > span > a
-      attribute: href
-    date_ago:
-      # 7 years ago
-      selector: :scope > span:nth-child(4):contains("ago")
-      optional: true
-    date_time:
-      # 2020-11-05 07:34:44
-      selector: :scope > span:nth-child(4):contains(":")
-      optional: true
-      filters:
-        - name: append
-          args: " -07:00" # PDT
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_ago .Result.date_time }}{{ or .Result.date_ago .Result.date_time }}{{ else }}now{{ end }}"
-    size:
-      selector: :scope > span:nth-child(5)
-    seeders:
-      selector: :scope > span:nth-child(2)
-    leechers:
-      selector: :scope > span:nth-child(3)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/definitions/v10/xwtorrents.yml
+++ b/definitions/v10/xwtorrents.yml
@@ -1,204 +0,0 @@
---
-id: xwtorrents
-name: XWtorrents
-description: "XtremeWrestlingTorrents (XWT) is a Private Torrent Tracker for PROFESSIONAL WRESTLING / MMA"
-language: en-US
-type: private
-encoding: windows-1252
-links:
-  - https://xtremewrestlingtorrents.net/
-legacylinks:
-  - http://xtremewrestlingtorrents.net/
-
-caps:
-  categorymappings:
-    - {id: 82, cat: TV/Sport, desc: "AEW Collision"}
-    - {id: 83, cat: TV/Sport, desc: "AEW Collision HD"}
-    - {id: 74, cat: TV/Sport, desc: "AEW Dynamite"}
-    - {id: 75, cat: TV/Sport, desc: "AEW Dynamite HD"}
-    - {id: 78, cat: TV/Sport, desc: "AEW PPV's"}
-    - {id: 79, cat: TV/Sport, desc: "AEW PPV's HD"}
-    - {id: 76, cat: TV/Sport, desc: "AEW Rampage"}
-    - {id: 77, cat: TV/Sport, desc: "AEW Rampage HD"}
-    - {id: 47, cat: TV/Sport, desc: "Boxing"}
-    - {id: 14, cat: Movies, desc: "Documentary"}
-    - {id: 20, cat: TV/Sport, desc: "DVD"}
-    - {id: 2, cat: TV/Sport, desc: "ECW Original"}
-    - {id: 26, cat: TV/Sport, desc: "ECW Weekly"}
-    - {id: 21, cat: TV/Sport, desc: "Int Indy's"}
-    - {id: 69, cat: TV/Sport, desc: "Lucha Libre"}
-    - {id: 70, cat: TV/Sport, desc: "Lucha Libre HD"}
-    - {id: 23, cat: TV/Sport, desc: "Misc"}
-    - {id: 24, cat: TV/Sport, desc: "MMA"}
-    - {id: 59, cat: TV/Sport, desc: "MMA HD"}
-    - {id: 86, cat: TV/Sport, desc: "Netflix"}
-    - {id: 87, cat: TV/Sport, desc: "Netflix HD"}
-    - {id: 30, cat: TV/Sport, desc: "Packs"}
-    - {id: 68, cat: TV/Sport, desc: "Podcasts"}
-    - {id: 29, cat: TV/Sport, desc: "Puro"}
-    - {id: 18, cat: TV/Sport, desc: "ROH"}
-    - {id: 52, cat: TV/Sport, desc: "ROH HD"}
-    - {id: 45, cat: TV/Sport, desc: "Shoot Interviews"}
-    - {id: 4, cat: TV/Sport, desc: "Single Matches"}
-    - {id: 7, cat: TV/Sport, desc: "TNA Impact"}
-    - {id: 49, cat: TV/Sport, desc: "TNA Impact HD"}
-    - {id: 6, cat: TV/Sport, desc: "TNA PPV's"}
-    - {id: 55, cat: TV/Sport, desc: "TNA PPV's HD"}
-    - {id: 66, cat: TV/Sport, desc: "Total Divas"}
-    - {id: 67, cat: TV/Sport, desc: "Total Divas HD"}
-    - {id: 57, cat: TV/Sport, desc: "Tough Enough"}
-    - {id: 58, cat: TV/Sport, desc: "Tough Enough HD"}
-    - {id: 22, cat: TV/Sport, desc: "USA Indy's"}
-    - {id: 12, cat: TV/Sport, desc: "WCW"}
-    - {id: 71, cat: TV/Sport, desc: "Womens Wrestling"}
-    - {id: 15, cat: TV/Sport, desc: "Wrestling Films"}
-    - {id: 72, cat: TV/Sport, desc: "WWE 205 Live"}
-    - {id: 73, cat: TV/Sport, desc: "WWE 205 Live HD"}
-    - {id: 16, cat: TV/Sport, desc: "WWE Heat"}
-    - {id: 63, cat: TV/Sport, desc: "WWE Main Event"}
-    - {id: 64, cat: TV/Sport, desc: "WWE Network"}
-    - {id: 65, cat: TV/Sport, desc: "WWE Network HD"}
-    - {id: 46, cat: TV/Sport, desc: "WWE NXT"}
-    - {id: 50, cat: TV/Sport, desc: "WWE NXT HD"}
-    - {id: 9, cat: TV/Sport, desc: "WWE PPV's"}
-    - {id: 56, cat: TV/Sport, desc: "WWE PPV's HD"}
-    - {id: 10, cat: TV/Sport, desc: "WWE RAW"}
-    - {id: 51, cat: TV/Sport, desc: "WWE RAW HD"}
-    - {id: 11, cat: TV/Sport, desc: "WWE Smackdown"}
-    - {id: 53, cat: TV/Sport, desc: "WWE Smackdown HD"}
-    - {id: 43, cat: TV/Sport, desc: "WWE Superstars"}
-    - {id: 54, cat: TV/Sport, desc: "WWE Superstars HD"}
-    - {id: 19, cat: TV/Sport, desc: "WWE Velocity"}
-    - {id: 31, cat: TV/Sport, desc: "WWE Vintage"}
-
-  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: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: seedbox
-    type: checkbox
-    label: "Use SeedBox Download Link"
-    default: false
-  - 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
-  - name: info_flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Prowlarr requires <a href="https://wiki.servarr.com/prowlarr/faq#can-i-use-flaresolverr-indexers" target="_blank" rel="noreferrer">FlareSolverr</a> to access it.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: /
-  error:
-    - selector: table.main:contains("Login failed!")
-      message:
-        selector: table tr td.text
-  test:
-    path: browse.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # http://xtremewrestlingtorrents.net/browse.php?search=halftime+heat&c46=1&c51=1&c31=1&c11=1&incldead=1
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    # 0 active, 1 incldead, 2 onlydead, 3 freeleech, 4 descr
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    search: "{{ .Keywords }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table[border="0"][cellspacing="0"][cellpadding="5"] tr:has(a[href^="download.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    download_1:
-      selector: a[href^="download.php"]
-      attribute: href
-    title_default:
-      # title can be missing so we use the &name= from the DL as a standby
-      text: "{{ .Result.download_1 }}"
-      filters:
-        - name: querystring
-          args: name
-        - name: replace
-          args: [".torrent", ""]
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
-    download_2:
-      selector: a[href^="download2.php"]
-      attribute: href
-    download:
-      text: "{{ if .Config.seedbox }}{{ .Result.download_2 }}{{ else }}{{ .Result.download_1 }}{{ end }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    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: "yyyy-MM-ddHH:mm:ss zzz"
-    downloadvolumefactor:
-      case:
-        img[src="pic/freeleech.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.7
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# engine n/a
--- a/definitions/v10/zetorrents.yml
+++ b/definitions/v10/zetorrents.yml
@@ -1,136 +0,0 @@
---
-id: zetorrents
-name: zetorrents
-description: "zetorrents is a FRENCH Public site for MOVIES / TV / GENERAL"
-language: fr-FR
-type: public
-encoding: UTF-8
-# to fetch current domain use https://www.rantop.my/
-links:
-  - https://www.zetorrents1.com/
-legacylinks:
-  # latest domains list
-  - https://www.rantop.my/
-  - https://www.site-torrent.com/
-  # domain lists no longer working
-  - https://www.protege-torrent.com/
-  - https://www.torrent.ws/
-  - https://www.protege-liens.com/
-  - https://www.protege-liens.net/
-  - https://www.torrent.onl/
-  - https://www.rantop.org/
-  # actual legacylinks
-  - https://www.zetorrents.cc/
-  - https://www.zetorrents.tv/
-  - https://www.zetorrents.bz/
-  - https://www.zetorrents.nl/
-  - https://www.zetorrents.biz/
-  - https://www.zetorrents.ch/
-  - https://zetorrents.mrunblock.bond/
-  - https://zetorrents.nocensor.cloud/
-  - https://www.zetorrents.pw/
-  - https://www.zetorrents.tw/
-  - https://www.zetorrents.in/
-  - https://www.zetorrents.vg/
-  - https://www.zetorrents.vc/
-  - https://www.zetorrents.sk/
-  - https://www.zetorrents.my/
-  - https://wvw-zetorrents.com/
-  - https://www-zetorrents.com/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-  allowrawsearch: true
-
-settings:
-  - name: info_category_8000
-    type: info
-    label: About zetorrents Categories
-    default: zetorrents does not return categories in its search results. To sync to your apps, include 8000(Other) in your Apps' Sync Categories.
-  - name: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTi FRENCH: MULTi FRENCH
-      ENGLISH: ENGLISH
-      MULTi ENGLISH: MULTi ENGLISH
-      VOSTFR: VOSTFR
-      MULTi VOSTFR: MULTi VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR and SUBFRENCH with ENGLISH
-    default: false
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?"]
-      attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ else }}home{{ end }}"
-  keywordsfilters:
-    # if searching for season packs swith S01 to saison 1 #9712
-    - name: re_replace
-      args: ["(?i)(S0)(\\d{1,2})$", "saison $2"]
-    - name: re_replace
-      args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
-
-  rows:
-    selector: table.table > tbody > tr:has(a[href^="/detail/"])
-
-  fields:
-    category:
-      text: Other
-    title_phase1:
-      selector: a[href^="/detail/"]
-      filters:
-        - name: replace
-          args: ["WEBRIP", "WEBDL"]
-        - name: re_replace
-          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b((19|20)\\d{2})\\b)$", "$3 $1$2"]
-    title_vostfr:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
-    title_phase2:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[href^="/detail/"]
-      attribute: href
-    download:
-      selector: a[href^="/detail/"]
-      attribute: href
-    date:
-      text: now
-    size:
-      selector: td:nth-child(2)
-    seeders:
-      selector: td:nth-child(3)
-    leechers:
-      selector: td:nth-child(4)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/definitions/v11/0daykiev.yml
+++ b/definitions/v11/0daykiev.yml
--- a/definitions/v11/0magnet.yml
+++ b/definitions/v11/0magnet.yml
--- a/definitions/v11/1337x.yml
+++ b/definitions/v11/1337x.yml
--- a/definitions/v11/13city.yml
+++ b/definitions/v11/13city.yml
--- a/definitions/v11/1ptbar.yml
+++ b/definitions/v11/1ptbar.yml
--- a/definitions/v11/3changtrai.yml
+++ b/definitions/v11/3changtrai.yml
--- a/definitions/v11/3dtorrents.yml
+++ b/definitions/v11/3dtorrents.yml
--- a/definitions/v11/4thd.yml
+++ b/definitions/v11/4thd.yml
--- a/definitions/v11/52bt.yml
+++ b/definitions/v11/52bt.yml
--- a/definitions/v11/52pt.yml
+++ b/definitions/v11/52pt.yml
--- a/definitions/v11/Bittorrentfiles.yml
+++ b/definitions/v11/Bittorrentfiles.yml
--- a/definitions/v11/abnormal.yml
+++ b/definitions/v11/abnormal.yml
--- a/definitions/v11/abtorrents.yml
+++ b/definitions/v11/abtorrents.yml
--- a/definitions/v11/acgrip.yml
+++ b/definitions/v11/acgrip.yml
--- a/definitions/v11/acrossthetasman.yml
+++ b/definitions/v11/acrossthetasman.yml
--- a/definitions/v11/aftershock.yml
+++ b/definitions/v11/aftershock.yml
--- a/definitions/v11/afun.yml
+++ b/definitions/v11/afun.yml
--- a/definitions/v11/agsvpt.yml
+++ b/definitions/v11/agsvpt.yml
--- a/definitions/v11/aidoruonline.yml
+++ b/definitions/v11/aidoruonline.yml
--- a/definitions/v11/aither-api.yml
+++ b/definitions/v11/aither-api.yml
--- a/definitions/v11/amigosshare.yml
+++ b/definitions/v11/amigosshare.yml
--- a/definitions/v11/anime-time.yml
+++ b/definitions/v11/anime-time.yml
--- a/definitions/v11/anime-timel.yml
+++ b/definitions/v11/anime-timel.yml
--- a/definitions/v11/animelayer.yml
+++ b/definitions/v11/animelayer.yml
--- a/definitions/v11/animelovers-api.yml
+++ b/definitions/v11/animelovers-api.yml
--- a/definitions/v11/animetorrentsro.yml
+++ b/definitions/v11/animetorrentsro.yml
--- a/definitions/v11/animeworld-api.yml
+++ b/definitions/v11/animeworld-api.yml
--- a/definitions/v11/anisource.yml
+++ b/definitions/v11/anisource.yml
--- a/definitions/v11/anthelion-api.yml
+++ b/definitions/v11/anthelion-api.yml
--- a/definitions/v11/arabafenice.yml
+++ b/definitions/v11/arabafenice.yml
--- a/definitions/v11/arabp2p.yml
+++ b/definitions/v11/arabp2p.yml
--- a/definitions/v11/arabtorrents.yml
+++ b/definitions/v11/arabtorrents.yml
--- a/definitions/v11/arenabg.yml
+++ b/definitions/v11/arenabg.yml
--- a/definitions/v11/asiancinema.yml
+++ b/definitions/v11/asiancinema.yml
--- a/definitions/v11/asiandvdclub.yml
+++ b/definitions/v11/asiandvdclub.yml
--- a/definitions/v11/audiences.yml
+++ b/definitions/v11/audiences.yml
--- a/definitions/v11/audionews.yml
+++ b/definitions/v11/audionews.yml
--- a/definitions/v11/aussierules.yml
+++ b/definitions/v11/aussierules.yml
--- a/definitions/v11/azusa.yml
+++ b/definitions/v11/azusa.yml
--- a/definitions/v11/backups.yml
+++ b/definitions/v11/backups.yml
--- a/definitions/v11/bangumi-moe.yml
+++ b/definitions/v11/bangumi-moe.yml
--- a/definitions/v11/beload.yml
+++ b/definitions/v11/beload.yml
--- a/definitions/v11/best-torrents.yml
+++ b/definitions/v11/best-torrents.yml
--- a/definitions/v11/bestcore.yml
+++ b/definitions/v11/bestcore.yml
--- a/definitions/v11/bibliotik.yml
+++ b/definitions/v11/bibliotik.yml
--- a/definitions/v11/bigcore.yml
+++ b/definitions/v11/bigcore.yml
--- a/definitions/v11/bigfangroup.yml
+++ b/definitions/v11/bigfangroup.yml
--- a/definitions/v11/bitbazis.yml
+++ b/definitions/v11/bitbazis.yml
--- a/definitions/v11/bitded.yml
+++ b/definitions/v11/bitded.yml
--- a/definitions/v11/bitgamer.yml
+++ b/definitions/v11/bitgamer.yml
--- a/definitions/v11/bithorlo.yml
+++ b/definitions/v11/bithorlo.yml
--- a/definitions/v11/bithumen.yml
+++ b/definitions/v11/bithumen.yml
--- a/definitions/v11/bitmagnet.yml
+++ b/definitions/v11/bitmagnet.yml
--- a/definitions/v11/bitpalace.yml
+++ b/definitions/v11/bitpalace.yml
--- a/definitions/v11/bitporn.yml
+++ b/definitions/v11/bitporn.yml
--- a/definitions/v11/bitru.yml
+++ b/definitions/v11/bitru.yml
--- a/definitions/v11/bitsearch.yml
+++ b/definitions/v11/bitsearch.yml
--- a/definitions/v11/bitsexy-api.yml
+++ b/definitions/v11/bitsexy-api.yml
--- a/definitions/v11/bitturk.yml
+++ b/definitions/v11/bitturk.yml
--- a/definitions/v11/bjshare.yml
+++ b/definitions/v11/bjshare.yml
--- a/definitions/v11/bluebird.yml
+++ b/definitions/v11/bluebird.yml
--- a/definitions/v11/blueroms.yml
+++ b/definitions/v11/blueroms.yml
--- a/definitions/v11/bluraytracker.yml
+++ b/definitions/v11/bluraytracker.yml
--- a/definitions/v11/blutopia-api.yml
+++ b/definitions/v11/blutopia-api.yml
--- a/definitions/v11/booktracker.yml
+++ b/definitions/v11/booktracker.yml
--- a/definitions/v11/bootytape.yml
+++ b/definitions/v11/bootytape.yml
--- a/definitions/v11/borgzelle.yml
+++ b/definitions/v11/borgzelle.yml
--- a/definitions/v11/boxingtorrents.yml
+++ b/definitions/v11/boxingtorrents.yml
--- a/definitions/v11/brasiltracker.yml
+++ b/definitions/v11/brasiltracker.yml
--- a/definitions/v11/btarg.yml
+++ b/definitions/v11/btarg.yml
--- a/definitions/v11/btetree.yml
+++ b/definitions/v11/btetree.yml
--- a/definitions/v11/btnext.yml
+++ b/definitions/v11/btnext.yml
--- a/definitions/v11/btschool.yml
+++ b/definitions/v11/btschool.yml
--- a/definitions/v11/bwtorrents.yml
+++ b/definitions/v11/bwtorrents.yml
--- a/definitions/v11/byrbt.yml
+++ b/definitions/v11/byrbt.yml
--- a/definitions/v11/byrutor.yml
+++ b/definitions/v11/byrutor.yml
--- a/definitions/v11/capybarabr.yml
+++ b/definitions/v11/capybarabr.yml
--- a/definitions/v11/carpathians.yml
+++ b/definitions/v11/carpathians.yml
--- a/definitions/v11/carphunter.yml
+++ b/definitions/v11/carphunter.yml
--- a/definitions/v11/carpt.yml
+++ b/definitions/v11/carpt.yml
--- a/definitions/v11/cathoderaytube.yml
+++ b/definitions/v11/cathoderaytube.yml
--- a/definitions/v11/catorrent.yml
+++ b/definitions/v11/catorrent.yml
--- a/definitions/v11/cdfile.yml
+++ b/definitions/v11/cdfile.yml
--- a/Show More
+++ b/Show More