diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 161b8b9ea..1a7c8b01d 100644 --- 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 diff --git a/README.md b/README.md index 4f2a4b25c..711583851 100644 --- 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 diff --git a/VERSIONS b/VERSIONS index 59126762c..f0030914b 100644 --- a/VERSIONS +++ b/VERSIONS @@ -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 \ No newline at end of file diff --git a/definitions/v10/chdbits.yml b/definitions/v10/chdbits.yml deleted file mode 100644 index 69fb9e2bc..000000000 --- a/definitions/v10/chdbits.yml +++ /dev/null @@ -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 FlareSolverr to access it.

- - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Torrents per page: setting to 100 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) diff --git a/definitions/v10/cpasbienclone.yml b/definitions/v10/cpasbienclone.yml deleted file mode 100644 index 997ada410..000000000 --- a/definitions/v10/cpasbienclone.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/megapeer.yml b/definitions/v10/megapeer.yml deleted file mode 100644 index c38564216..000000000 --- a/definitions/v10/megapeer.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/mvgroupforum.yml b/definitions/v10/mvgroupforum.yml deleted file mode 100644 index 6a1a92ce0..000000000 --- a/definitions/v10/mvgroupforum.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/mvgroupmain.yml b/definitions/v10/mvgroupmain.yml deleted file mode 100644 index d0b6a3c75..000000000 --- a/definitions/v10/mvgroupmain.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/pornolab.yml b/definitions/v10/pornolab.yml deleted file mode 100644 index 668f4e178..000000000 --- a/definitions/v10/pornolab.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/tapochek.yml b/definitions/v10/tapochek.yml deleted file mode 100644 index 059fe1bdd..000000000 --- a/definitions/v10/tapochek.yml +++ /dev/null @@ -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 Y-m-d setting is Y-m-d H:i. 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 diff --git a/definitions/v10/torrentby.yml b/definitions/v10/torrentby.yml deleted file mode 100644 index e14ef0687..000000000 --- a/definitions/v10/torrentby.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/torrentkitty.yml b/definitions/v10/torrentkitty.yml deleted file mode 100644 index c5718f2a3..000000000 --- a/definitions/v10/torrentkitty.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/torrentleech.yml b/definitions/v10/torrentleech.yml deleted file mode 100644 index 4962100fb..000000000 --- a/definitions/v10/torrentleech.yml +++ /dev/null @@ -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 Alt 2FA Token if you have enabled 2FA 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 Torrents per page: setting to 100 on your account profile. - - name: info_flaresolverr - type: info - label: FlareSolverr - default: This site may use Cloudflare DDoS Protection, therefore Prowlarr requires FlareSolverr 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 diff --git a/definitions/v10/torrentoyunindir.yml b/definitions/v10/torrentoyunindir.yml deleted file mode 100644 index 1c59e43b4..000000000 --- a/definitions/v10/torrentoyunindir.yml +++ /dev/null @@ -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 FlareSolverr 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 diff --git a/definitions/v10/torrentproject2.yml b/definitions/v10/torrentproject2.yml deleted file mode 100644 index 91b98a0ce..000000000 --- a/definitions/v10/torrentproject2.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/xwtorrents.yml b/definitions/v10/xwtorrents.yml deleted file mode 100644 index 4f43adbc5..000000000 --- a/definitions/v10/xwtorrents.yml +++ /dev/null @@ -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 FlareSolverr 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 diff --git a/definitions/v10/zetorrents.yml b/definitions/v10/zetorrents.yml deleted file mode 100644 index fd730efa8..000000000 --- a/definitions/v10/zetorrents.yml +++ /dev/null @@ -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 diff --git a/definitions/v10/0daykiev.yml b/definitions/v11/0daykiev.yml similarity index 100% rename from definitions/v10/0daykiev.yml rename to definitions/v11/0daykiev.yml diff --git a/definitions/v10/0magnet.yml b/definitions/v11/0magnet.yml similarity index 100% rename from definitions/v10/0magnet.yml rename to definitions/v11/0magnet.yml diff --git a/definitions/v10/1337x.yml b/definitions/v11/1337x.yml similarity index 100% rename from definitions/v10/1337x.yml rename to definitions/v11/1337x.yml diff --git a/definitions/v10/13city.yml b/definitions/v11/13city.yml similarity index 100% rename from definitions/v10/13city.yml rename to definitions/v11/13city.yml diff --git a/definitions/v10/1ptbar.yml b/definitions/v11/1ptbar.yml similarity index 100% rename from definitions/v10/1ptbar.yml rename to definitions/v11/1ptbar.yml diff --git a/definitions/v10/3changtrai.yml b/definitions/v11/3changtrai.yml similarity index 100% rename from definitions/v10/3changtrai.yml rename to definitions/v11/3changtrai.yml diff --git a/definitions/v10/3dtorrents.yml b/definitions/v11/3dtorrents.yml similarity index 100% rename from definitions/v10/3dtorrents.yml rename to definitions/v11/3dtorrents.yml diff --git a/definitions/v10/4thd.yml b/definitions/v11/4thd.yml similarity index 100% rename from definitions/v10/4thd.yml rename to definitions/v11/4thd.yml diff --git a/definitions/v10/52bt.yml b/definitions/v11/52bt.yml similarity index 100% rename from definitions/v10/52bt.yml rename to definitions/v11/52bt.yml diff --git a/definitions/v10/52pt.yml b/definitions/v11/52pt.yml similarity index 100% rename from definitions/v10/52pt.yml rename to definitions/v11/52pt.yml diff --git a/definitions/v10/Bittorrentfiles.yml b/definitions/v11/Bittorrentfiles.yml similarity index 100% rename from definitions/v10/Bittorrentfiles.yml rename to definitions/v11/Bittorrentfiles.yml diff --git a/definitions/v10/abnormal.yml b/definitions/v11/abnormal.yml similarity index 100% rename from definitions/v10/abnormal.yml rename to definitions/v11/abnormal.yml diff --git a/definitions/v10/abtorrents.yml b/definitions/v11/abtorrents.yml similarity index 100% rename from definitions/v10/abtorrents.yml rename to definitions/v11/abtorrents.yml diff --git a/definitions/v10/acgrip.yml b/definitions/v11/acgrip.yml similarity index 100% rename from definitions/v10/acgrip.yml rename to definitions/v11/acgrip.yml diff --git a/definitions/v10/acrossthetasman.yml b/definitions/v11/acrossthetasman.yml similarity index 100% rename from definitions/v10/acrossthetasman.yml rename to definitions/v11/acrossthetasman.yml diff --git a/definitions/v10/aftershock.yml b/definitions/v11/aftershock.yml similarity index 100% rename from definitions/v10/aftershock.yml rename to definitions/v11/aftershock.yml diff --git a/definitions/v10/afun.yml b/definitions/v11/afun.yml similarity index 100% rename from definitions/v10/afun.yml rename to definitions/v11/afun.yml diff --git a/definitions/v10/agsvpt.yml b/definitions/v11/agsvpt.yml similarity index 100% rename from definitions/v10/agsvpt.yml rename to definitions/v11/agsvpt.yml diff --git a/definitions/v10/aidoruonline.yml b/definitions/v11/aidoruonline.yml similarity index 100% rename from definitions/v10/aidoruonline.yml rename to definitions/v11/aidoruonline.yml diff --git a/definitions/v10/aither-api.yml b/definitions/v11/aither-api.yml similarity index 100% rename from definitions/v10/aither-api.yml rename to definitions/v11/aither-api.yml diff --git a/definitions/v10/amigosshare.yml b/definitions/v11/amigosshare.yml similarity index 100% rename from definitions/v10/amigosshare.yml rename to definitions/v11/amigosshare.yml diff --git a/definitions/v10/anime-time.yml b/definitions/v11/anime-time.yml similarity index 100% rename from definitions/v10/anime-time.yml rename to definitions/v11/anime-time.yml diff --git a/definitions/v10/anime-timel.yml b/definitions/v11/anime-timel.yml similarity index 100% rename from definitions/v10/anime-timel.yml rename to definitions/v11/anime-timel.yml diff --git a/definitions/v10/animelayer.yml b/definitions/v11/animelayer.yml similarity index 100% rename from definitions/v10/animelayer.yml rename to definitions/v11/animelayer.yml diff --git a/definitions/v10/animelovers-api.yml b/definitions/v11/animelovers-api.yml similarity index 100% rename from definitions/v10/animelovers-api.yml rename to definitions/v11/animelovers-api.yml diff --git a/definitions/v10/animetorrentsro.yml b/definitions/v11/animetorrentsro.yml similarity index 100% rename from definitions/v10/animetorrentsro.yml rename to definitions/v11/animetorrentsro.yml diff --git a/definitions/v10/animeworld-api.yml b/definitions/v11/animeworld-api.yml similarity index 100% rename from definitions/v10/animeworld-api.yml rename to definitions/v11/animeworld-api.yml diff --git a/definitions/v10/anisource.yml b/definitions/v11/anisource.yml similarity index 100% rename from definitions/v10/anisource.yml rename to definitions/v11/anisource.yml diff --git a/definitions/v10/anthelion-api.yml b/definitions/v11/anthelion-api.yml similarity index 100% rename from definitions/v10/anthelion-api.yml rename to definitions/v11/anthelion-api.yml diff --git a/definitions/v10/arabafenice.yml b/definitions/v11/arabafenice.yml similarity index 100% rename from definitions/v10/arabafenice.yml rename to definitions/v11/arabafenice.yml diff --git a/definitions/v10/arabp2p.yml b/definitions/v11/arabp2p.yml similarity index 100% rename from definitions/v10/arabp2p.yml rename to definitions/v11/arabp2p.yml diff --git a/definitions/v10/arabtorrents.yml b/definitions/v11/arabtorrents.yml similarity index 100% rename from definitions/v10/arabtorrents.yml rename to definitions/v11/arabtorrents.yml diff --git a/definitions/v10/arenabg.yml b/definitions/v11/arenabg.yml similarity index 100% rename from definitions/v10/arenabg.yml rename to definitions/v11/arenabg.yml diff --git a/definitions/v10/asiancinema.yml b/definitions/v11/asiancinema.yml similarity index 100% rename from definitions/v10/asiancinema.yml rename to definitions/v11/asiancinema.yml diff --git a/definitions/v10/asiandvdclub.yml b/definitions/v11/asiandvdclub.yml similarity index 100% rename from definitions/v10/asiandvdclub.yml rename to definitions/v11/asiandvdclub.yml diff --git a/definitions/v10/audiences.yml b/definitions/v11/audiences.yml similarity index 100% rename from definitions/v10/audiences.yml rename to definitions/v11/audiences.yml diff --git a/definitions/v10/audionews.yml b/definitions/v11/audionews.yml similarity index 100% rename from definitions/v10/audionews.yml rename to definitions/v11/audionews.yml diff --git a/definitions/v10/aussierules.yml b/definitions/v11/aussierules.yml similarity index 100% rename from definitions/v10/aussierules.yml rename to definitions/v11/aussierules.yml diff --git a/definitions/v10/azusa.yml b/definitions/v11/azusa.yml similarity index 100% rename from definitions/v10/azusa.yml rename to definitions/v11/azusa.yml diff --git a/definitions/v10/backups.yml b/definitions/v11/backups.yml similarity index 100% rename from definitions/v10/backups.yml rename to definitions/v11/backups.yml diff --git a/definitions/v10/bangumi-moe.yml b/definitions/v11/bangumi-moe.yml similarity index 100% rename from definitions/v10/bangumi-moe.yml rename to definitions/v11/bangumi-moe.yml diff --git a/definitions/v10/beload.yml b/definitions/v11/beload.yml similarity index 100% rename from definitions/v10/beload.yml rename to definitions/v11/beload.yml diff --git a/definitions/v10/best-torrents.yml b/definitions/v11/best-torrents.yml similarity index 100% rename from definitions/v10/best-torrents.yml rename to definitions/v11/best-torrents.yml diff --git a/definitions/v10/bestcore.yml b/definitions/v11/bestcore.yml similarity index 100% rename from definitions/v10/bestcore.yml rename to definitions/v11/bestcore.yml diff --git a/definitions/v10/bibliotik.yml b/definitions/v11/bibliotik.yml similarity index 100% rename from definitions/v10/bibliotik.yml rename to definitions/v11/bibliotik.yml diff --git a/definitions/v10/bigcore.yml b/definitions/v11/bigcore.yml similarity index 100% rename from definitions/v10/bigcore.yml rename to definitions/v11/bigcore.yml diff --git a/definitions/v10/bigfangroup.yml b/definitions/v11/bigfangroup.yml similarity index 100% rename from definitions/v10/bigfangroup.yml rename to definitions/v11/bigfangroup.yml diff --git a/definitions/v10/bitbazis.yml b/definitions/v11/bitbazis.yml similarity index 100% rename from definitions/v10/bitbazis.yml rename to definitions/v11/bitbazis.yml diff --git a/definitions/v10/bitded.yml b/definitions/v11/bitded.yml similarity index 100% rename from definitions/v10/bitded.yml rename to definitions/v11/bitded.yml diff --git a/definitions/v10/bitgamer.yml b/definitions/v11/bitgamer.yml similarity index 100% rename from definitions/v10/bitgamer.yml rename to definitions/v11/bitgamer.yml diff --git a/definitions/v10/bithorlo.yml b/definitions/v11/bithorlo.yml similarity index 100% rename from definitions/v10/bithorlo.yml rename to definitions/v11/bithorlo.yml diff --git a/definitions/v10/bithumen.yml b/definitions/v11/bithumen.yml similarity index 100% rename from definitions/v10/bithumen.yml rename to definitions/v11/bithumen.yml diff --git a/definitions/v10/bitmagnet.yml b/definitions/v11/bitmagnet.yml similarity index 100% rename from definitions/v10/bitmagnet.yml rename to definitions/v11/bitmagnet.yml diff --git a/definitions/v10/bitpalace.yml b/definitions/v11/bitpalace.yml similarity index 100% rename from definitions/v10/bitpalace.yml rename to definitions/v11/bitpalace.yml diff --git a/definitions/v10/bitporn.yml b/definitions/v11/bitporn.yml similarity index 100% rename from definitions/v10/bitporn.yml rename to definitions/v11/bitporn.yml diff --git a/definitions/v10/bitru.yml b/definitions/v11/bitru.yml similarity index 100% rename from definitions/v10/bitru.yml rename to definitions/v11/bitru.yml diff --git a/definitions/v10/bitsearch.yml b/definitions/v11/bitsearch.yml similarity index 100% rename from definitions/v10/bitsearch.yml rename to definitions/v11/bitsearch.yml diff --git a/definitions/v10/bitsexy-api.yml b/definitions/v11/bitsexy-api.yml similarity index 100% rename from definitions/v10/bitsexy-api.yml rename to definitions/v11/bitsexy-api.yml diff --git a/definitions/v10/bitturk.yml b/definitions/v11/bitturk.yml similarity index 100% rename from definitions/v10/bitturk.yml rename to definitions/v11/bitturk.yml diff --git a/definitions/v10/bjshare.yml b/definitions/v11/bjshare.yml similarity index 100% rename from definitions/v10/bjshare.yml rename to definitions/v11/bjshare.yml diff --git a/definitions/v10/bluebird.yml b/definitions/v11/bluebird.yml similarity index 100% rename from definitions/v10/bluebird.yml rename to definitions/v11/bluebird.yml diff --git a/definitions/v10/blueroms.yml b/definitions/v11/blueroms.yml similarity index 100% rename from definitions/v10/blueroms.yml rename to definitions/v11/blueroms.yml diff --git a/definitions/v10/bluraytracker.yml b/definitions/v11/bluraytracker.yml similarity index 100% rename from definitions/v10/bluraytracker.yml rename to definitions/v11/bluraytracker.yml diff --git a/definitions/v10/blutopia-api.yml b/definitions/v11/blutopia-api.yml similarity index 100% rename from definitions/v10/blutopia-api.yml rename to definitions/v11/blutopia-api.yml diff --git a/definitions/v10/booktracker.yml b/definitions/v11/booktracker.yml similarity index 100% rename from definitions/v10/booktracker.yml rename to definitions/v11/booktracker.yml diff --git a/definitions/v10/bootytape.yml b/definitions/v11/bootytape.yml similarity index 100% rename from definitions/v10/bootytape.yml rename to definitions/v11/bootytape.yml diff --git a/definitions/v10/borgzelle.yml b/definitions/v11/borgzelle.yml similarity index 100% rename from definitions/v10/borgzelle.yml rename to definitions/v11/borgzelle.yml diff --git a/definitions/v10/boxingtorrents.yml b/definitions/v11/boxingtorrents.yml similarity index 100% rename from definitions/v10/boxingtorrents.yml rename to definitions/v11/boxingtorrents.yml diff --git a/definitions/v10/brasiltracker.yml b/definitions/v11/brasiltracker.yml similarity index 100% rename from definitions/v10/brasiltracker.yml rename to definitions/v11/brasiltracker.yml diff --git a/definitions/v10/btarg.yml b/definitions/v11/btarg.yml similarity index 100% rename from definitions/v10/btarg.yml rename to definitions/v11/btarg.yml diff --git a/definitions/v10/btetree.yml b/definitions/v11/btetree.yml similarity index 100% rename from definitions/v10/btetree.yml rename to definitions/v11/btetree.yml diff --git a/definitions/v10/btnext.yml b/definitions/v11/btnext.yml similarity index 100% rename from definitions/v10/btnext.yml rename to definitions/v11/btnext.yml diff --git a/definitions/v10/btschool.yml b/definitions/v11/btschool.yml similarity index 100% rename from definitions/v10/btschool.yml rename to definitions/v11/btschool.yml diff --git a/definitions/v10/bwtorrents.yml b/definitions/v11/bwtorrents.yml similarity index 100% rename from definitions/v10/bwtorrents.yml rename to definitions/v11/bwtorrents.yml diff --git a/definitions/v10/byrbt.yml b/definitions/v11/byrbt.yml similarity index 100% rename from definitions/v10/byrbt.yml rename to definitions/v11/byrbt.yml diff --git a/definitions/v10/byrutor.yml b/definitions/v11/byrutor.yml similarity index 100% rename from definitions/v10/byrutor.yml rename to definitions/v11/byrutor.yml diff --git a/definitions/v10/capybarabr.yml b/definitions/v11/capybarabr.yml similarity index 100% rename from definitions/v10/capybarabr.yml rename to definitions/v11/capybarabr.yml diff --git a/definitions/v10/carpathians.yml b/definitions/v11/carpathians.yml similarity index 100% rename from definitions/v10/carpathians.yml rename to definitions/v11/carpathians.yml diff --git a/definitions/v10/carphunter.yml b/definitions/v11/carphunter.yml similarity index 100% rename from definitions/v10/carphunter.yml rename to definitions/v11/carphunter.yml diff --git a/definitions/v10/carpt.yml b/definitions/v11/carpt.yml similarity index 100% rename from definitions/v10/carpt.yml rename to definitions/v11/carpt.yml diff --git a/definitions/v10/cathoderaytube.yml b/definitions/v11/cathoderaytube.yml similarity index 100% rename from definitions/v10/cathoderaytube.yml rename to definitions/v11/cathoderaytube.yml diff --git a/definitions/v10/catorrent.yml b/definitions/v11/catorrent.yml similarity index 100% rename from definitions/v10/catorrent.yml rename to definitions/v11/catorrent.yml diff --git a/definitions/v10/cdfile.yml b/definitions/v11/cdfile.yml similarity index 100% rename from definitions/v10/cdfile.yml rename to definitions/v11/cdfile.yml diff --git a/definitions/v10/ceskeforum.yml b/definitions/v11/ceskeforum.yml similarity index 100% rename from definitions/v10/ceskeforum.yml rename to definitions/v11/ceskeforum.yml diff --git a/definitions/v10/cinemageddon.yml b/definitions/v11/cinemageddon.yml similarity index 100% rename from definitions/v10/cinemageddon.yml rename to definitions/v11/cinemageddon.yml diff --git a/definitions/v10/cinemamovies.yml b/definitions/v11/cinemamovies.yml similarity index 100% rename from definitions/v10/cinemamovies.yml rename to definitions/v11/cinemamovies.yml diff --git a/definitions/v10/cinematik.yml b/definitions/v11/cinematik.yml similarity index 100% rename from definitions/v10/cinematik.yml rename to definitions/v11/cinematik.yml diff --git a/definitions/v10/clearjav-api.yml b/definitions/v11/clearjav-api.yml similarity index 100% rename from definitions/v10/clearjav-api.yml rename to definitions/v11/clearjav-api.yml diff --git a/definitions/v10/coastalcrew.yml b/definitions/v11/coastalcrew.yml similarity index 100% rename from definitions/v10/coastalcrew.yml rename to definitions/v11/coastalcrew.yml diff --git a/definitions/v10/comicat.yml b/definitions/v11/comicat.yml similarity index 100% rename from definitions/v10/comicat.yml rename to definitions/v11/comicat.yml diff --git a/definitions/v10/concen.yml b/definitions/v11/concen.yml similarity index 100% rename from definitions/v10/concen.yml rename to definitions/v11/concen.yml diff --git a/definitions/v10/concertos.yml b/definitions/v11/concertos.yml similarity index 100% rename from definitions/v10/concertos.yml rename to definitions/v11/concertos.yml diff --git a/definitions/v10/crabpt.yml b/definitions/v11/crabpt.yml similarity index 100% rename from definitions/v10/crabpt.yml rename to definitions/v11/crabpt.yml diff --git a/definitions/v10/crackingpatching.yml b/definitions/v11/crackingpatching.yml similarity index 100% rename from definitions/v10/crackingpatching.yml rename to definitions/v11/crackingpatching.yml diff --git a/definitions/v10/crazyspirits.yml b/definitions/v11/crazyspirits.yml similarity index 100% rename from definitions/v10/crazyspirits.yml rename to definitions/v11/crazyspirits.yml diff --git a/definitions/v10/crnaberza.yml b/definitions/v11/crnaberza.yml similarity index 100% rename from definitions/v10/crnaberza.yml rename to definitions/v11/crnaberza.yml diff --git a/definitions/v10/crt2fa.yml b/definitions/v11/crt2fa.yml similarity index 100% rename from definitions/v10/crt2fa.yml rename to definitions/v11/crt2fa.yml diff --git a/definitions/v10/cspt.yml b/definitions/v11/cspt.yml similarity index 100% rename from definitions/v10/cspt.yml rename to definitions/v11/cspt.yml diff --git a/definitions/v10/cyanbug.yml b/definitions/v11/cyanbug.yml similarity index 100% rename from definitions/v10/cyanbug.yml rename to definitions/v11/cyanbug.yml diff --git a/definitions/v10/danishbytes-api.yml b/definitions/v11/danishbytes-api.yml similarity index 100% rename from definitions/v10/danishbytes-api.yml rename to definitions/v11/danishbytes-api.yml diff --git a/definitions/v10/darkpeers.yml b/definitions/v11/darkpeers.yml similarity index 100% rename from definitions/v10/darkpeers.yml rename to definitions/v11/darkpeers.yml diff --git a/definitions/v10/dasunerwartete.yml b/definitions/v11/dasunerwartete.yml similarity index 100% rename from definitions/v10/dasunerwartete.yml rename to definitions/v11/dasunerwartete.yml diff --git a/definitions/v10/datascene-api.yml b/definitions/v11/datascene-api.yml similarity index 100% rename from definitions/v10/datascene-api.yml rename to definitions/v11/datascene-api.yml diff --git a/definitions/v10/deildu.yml b/definitions/v11/deildu.yml similarity index 100% rename from definitions/v10/deildu.yml rename to definitions/v11/deildu.yml diff --git a/definitions/v10/desitorrents-api.yml b/definitions/v11/desitorrents-api.yml similarity index 100% rename from definitions/v10/desitorrents-api.yml rename to definitions/v11/desitorrents-api.yml diff --git a/definitions/v10/devil-torrents.yml b/definitions/v11/devil-torrents.yml similarity index 100% rename from definitions/v10/devil-torrents.yml rename to definitions/v11/devil-torrents.yml diff --git a/definitions/v10/diablotorrent.yml b/definitions/v11/diablotorrent.yml similarity index 100% rename from definitions/v10/diablotorrent.yml rename to definitions/v11/diablotorrent.yml diff --git a/definitions/v10/digitalcore-api.yml b/definitions/v11/digitalcore-api.yml similarity index 100% rename from definitions/v10/digitalcore-api.yml rename to definitions/v11/digitalcore-api.yml diff --git a/definitions/v10/dimeadozen.yml b/definitions/v11/dimeadozen.yml similarity index 100% rename from definitions/v10/dimeadozen.yml rename to definitions/v11/dimeadozen.yml diff --git a/definitions/v10/discfan.yml b/definitions/v11/discfan.yml similarity index 100% rename from definitions/v10/discfan.yml rename to definitions/v11/discfan.yml diff --git a/definitions/v10/dmhy.yml b/definitions/v11/dmhy.yml similarity index 100% rename from definitions/v10/dmhy.yml rename to definitions/v11/dmhy.yml diff --git a/definitions/v10/docspedia.yml b/definitions/v11/docspedia.yml similarity index 100% rename from definitions/v10/docspedia.yml rename to definitions/v11/docspedia.yml diff --git a/definitions/v10/dreamingtree.yml b/definitions/v11/dreamingtree.yml similarity index 100% rename from definitions/v10/dreamingtree.yml rename to definitions/v11/dreamingtree.yml diff --git a/definitions/v10/drugari.yml b/definitions/v11/drugari.yml similarity index 100% rename from definitions/v10/drugari.yml rename to definitions/v11/drugari.yml diff --git a/definitions/v10/dxp.yml b/definitions/v11/dxp.yml similarity index 100% rename from definitions/v10/dxp.yml rename to definitions/v11/dxp.yml diff --git a/definitions/v10/ebookbay.yml b/definitions/v11/ebookbay.yml similarity index 100% rename from definitions/v10/ebookbay.yml rename to definitions/v11/ebookbay.yml diff --git a/definitions/v10/ebooks-shares.yml b/definitions/v11/ebooks-shares.yml similarity index 100% rename from definitions/v10/ebooks-shares.yml rename to definitions/v11/ebooks-shares.yml diff --git a/definitions/v10/ehentai.yml b/definitions/v11/ehentai.yml similarity index 100% rename from definitions/v10/ehentai.yml rename to definitions/v11/ehentai.yml diff --git a/definitions/v10/electro-torrent.yml b/definitions/v11/electro-torrent.yml similarity index 100% rename from definitions/v10/electro-torrent.yml rename to definitions/v11/electro-torrent.yml diff --git a/definitions/v10/elitetorrent-wf.yml b/definitions/v11/elitetorrent-wf.yml similarity index 100% rename from definitions/v10/elitetorrent-wf.yml rename to definitions/v11/elitetorrent-wf.yml diff --git a/definitions/v10/empornium.yml b/definitions/v11/empornium.yml similarity index 100% rename from definitions/v10/empornium.yml rename to definitions/v11/empornium.yml diff --git a/definitions/v10/empornium2fa.yml b/definitions/v11/empornium2fa.yml similarity index 100% rename from definitions/v10/empornium2fa.yml rename to definitions/v11/empornium2fa.yml diff --git a/definitions/v10/emuwarez.yml b/definitions/v11/emuwarez.yml similarity index 100% rename from definitions/v10/emuwarez.yml rename to definitions/v11/emuwarez.yml diff --git a/definitions/v10/esharenet.yml b/definitions/v11/esharenet.yml similarity index 100% rename from definitions/v10/esharenet.yml rename to definitions/v11/esharenet.yml diff --git a/definitions/v10/estone.yml b/definitions/v11/estone.yml similarity index 100% rename from definitions/v10/estone.yml rename to definitions/v11/estone.yml diff --git a/definitions/v10/ex-torrenty.yml b/definitions/v11/ex-torrenty.yml similarity index 100% rename from definitions/v10/ex-torrenty.yml rename to definitions/v11/ex-torrenty.yml diff --git a/definitions/v10/exitorrent-org.yml b/definitions/v11/exitorrent-org.yml similarity index 100% rename from definitions/v10/exitorrent-org.yml rename to definitions/v11/exitorrent-org.yml diff --git a/definitions/v10/exkinoray.yml b/definitions/v11/exkinoray.yml similarity index 100% rename from definitions/v10/exkinoray.yml rename to definitions/v11/exkinoray.yml diff --git a/definitions/v10/explosiv-world.yml b/definitions/v11/explosiv-world.yml similarity index 100% rename from definitions/v10/explosiv-world.yml rename to definitions/v11/explosiv-world.yml diff --git a/definitions/v10/extratorrent-st.yml b/definitions/v11/extratorrent-st.yml similarity index 100% rename from definitions/v10/extratorrent-st.yml rename to definitions/v11/extratorrent-st.yml diff --git a/definitions/v10/extremebits.yml b/definitions/v11/extremebits.yml similarity index 100% rename from definitions/v10/extremebits.yml rename to definitions/v11/extremebits.yml diff --git a/definitions/v10/exttorrents.yml b/definitions/v11/exttorrents.yml similarity index 100% rename from definitions/v10/exttorrents.yml rename to definitions/v11/exttorrents.yml diff --git a/definitions/v10/eztv.yml b/definitions/v11/eztv.yml similarity index 100% rename from definitions/v10/eztv.yml rename to definitions/v11/eztv.yml diff --git a/definitions/v10/eztvl.yml b/definitions/v11/eztvl.yml similarity index 100% rename from definitions/v10/eztvl.yml rename to definitions/v11/eztvl.yml diff --git a/definitions/v10/f1carreras-api.yml b/definitions/v11/f1carreras-api.yml similarity index 100% rename from definitions/v10/f1carreras-api.yml rename to definitions/v11/f1carreras-api.yml diff --git a/definitions/v10/f1gp.yml b/definitions/v11/f1gp.yml similarity index 100% rename from definitions/v10/f1gp.yml rename to definitions/v11/f1gp.yml diff --git a/definitions/v10/fanoin.yml b/definitions/v11/fanoin.yml similarity index 100% rename from definitions/v10/fanoin.yml rename to definitions/v11/fanoin.yml diff --git a/definitions/v10/fearnopeer.yml b/definitions/v11/fearnopeer.yml similarity index 100% rename from definitions/v10/fearnopeer.yml rename to definitions/v11/fearnopeer.yml diff --git a/definitions/v10/femdomcult.yml b/definitions/v11/femdomcult.yml similarity index 100% rename from definitions/v10/femdomcult.yml rename to definitions/v11/femdomcult.yml diff --git a/definitions/v10/fenyarnyek-tracker.yml b/definitions/v11/fenyarnyek-tracker.yml similarity index 100% rename from definitions/v10/fenyarnyek-tracker.yml rename to definitions/v11/fenyarnyek-tracker.yml diff --git a/definitions/v10/file-tracker.yml b/definitions/v11/file-tracker.yml similarity index 100% rename from definitions/v10/file-tracker.yml rename to definitions/v11/file-tracker.yml diff --git a/definitions/v10/finelite.yml b/definitions/v11/finelite.yml similarity index 100% rename from definitions/v10/finelite.yml rename to definitions/v11/finelite.yml diff --git a/definitions/v10/fluxzone.yml b/definitions/v11/fluxzone.yml similarity index 100% rename from definitions/v10/fluxzone.yml rename to definitions/v11/fluxzone.yml diff --git a/definitions/v10/freefarm.yml b/definitions/v11/freefarm.yml similarity index 100% rename from definitions/v10/freefarm.yml rename to definitions/v11/freefarm.yml diff --git a/definitions/v10/frozenlayer.yml b/definitions/v11/frozenlayer.yml similarity index 100% rename from definitions/v10/frozenlayer.yml rename to definitions/v11/frozenlayer.yml diff --git a/definitions/v10/funkytorrents.yml b/definitions/v11/funkytorrents.yml similarity index 100% rename from definitions/v10/funkytorrents.yml rename to definitions/v11/funkytorrents.yml diff --git a/definitions/v10/futuretorrent.yml b/definitions/v11/futuretorrent.yml similarity index 100% rename from definitions/v10/futuretorrent.yml rename to definitions/v11/futuretorrent.yml diff --git a/definitions/v10/fuzer.yml b/definitions/v11/fuzer.yml similarity index 100% rename from definitions/v10/fuzer.yml rename to definitions/v11/fuzer.yml diff --git a/definitions/v10/gamestorrents.yml b/definitions/v11/gamestorrents.yml similarity index 100% rename from definitions/v10/gamestorrents.yml rename to definitions/v11/gamestorrents.yml diff --git a/definitions/v10/gay-torrents.yml b/definitions/v11/gay-torrents.yml similarity index 100% rename from definitions/v10/gay-torrents.yml rename to definitions/v11/gay-torrents.yml diff --git a/definitions/v10/gay-torrentsorg.yml b/definitions/v11/gay-torrentsorg.yml similarity index 100% rename from definitions/v10/gay-torrentsorg.yml rename to definitions/v11/gay-torrentsorg.yml diff --git a/definitions/v10/gaytorrentru.yml b/definitions/v11/gaytorrentru.yml similarity index 100% rename from definitions/v10/gaytorrentru.yml rename to definitions/v11/gaytorrentru.yml diff --git a/definitions/v10/generationfree-api.yml b/definitions/v11/generationfree-api.yml similarity index 100% rename from definitions/v10/generationfree-api.yml rename to definitions/v11/generationfree-api.yml diff --git a/definitions/v10/genesismovement.yml b/definitions/v11/genesismovement.yml similarity index 100% rename from definitions/v10/genesismovement.yml rename to definitions/v11/genesismovement.yml diff --git a/definitions/v10/ggpt.yml b/definitions/v11/ggpt.yml similarity index 100% rename from definitions/v10/ggpt.yml rename to definitions/v11/ggpt.yml diff --git a/definitions/v10/gigatorrents.yml b/definitions/v11/gigatorrents.yml similarity index 100% rename from definitions/v10/gigatorrents.yml rename to definitions/v11/gigatorrents.yml diff --git a/definitions/v10/gimmepeers.yml b/definitions/v11/gimmepeers.yml similarity index 100% rename from definitions/v10/gimmepeers.yml rename to definitions/v11/gimmepeers.yml diff --git a/definitions/v10/girotorrent.yml b/definitions/v11/girotorrent.yml similarity index 100% rename from definitions/v10/girotorrent.yml rename to definitions/v11/girotorrent.yml diff --git a/definitions/v10/gtorrentpro.yml b/definitions/v11/gtorrentpro.yml similarity index 100% rename from definitions/v10/gtorrentpro.yml rename to definitions/v11/gtorrentpro.yml diff --git a/definitions/v10/haidan.yml b/definitions/v11/haidan.yml similarity index 100% rename from definitions/v10/haidan.yml rename to definitions/v11/haidan.yml diff --git a/definitions/v10/haitang.yml b/definitions/v11/haitang.yml similarity index 100% rename from definitions/v10/haitang.yml rename to definitions/v11/haitang.yml diff --git a/definitions/v10/happyfappy.yml b/definitions/v11/happyfappy.yml similarity index 100% rename from definitions/v10/happyfappy.yml rename to definitions/v11/happyfappy.yml diff --git a/definitions/v10/happyfappy2fa.yml b/definitions/v11/happyfappy2fa.yml similarity index 100% rename from definitions/v10/happyfappy2fa.yml rename to definitions/v11/happyfappy2fa.yml diff --git a/definitions/v10/hawke-uno.yml b/definitions/v11/hawke-uno.yml similarity index 100% rename from definitions/v10/hawke-uno.yml rename to definitions/v11/hawke-uno.yml diff --git a/definitions/v10/hd-club.yml b/definitions/v11/hd-club.yml similarity index 100% rename from definitions/v10/hd-club.yml rename to definitions/v11/hd-club.yml diff --git a/definitions/v10/hd-unit3d-api.yml b/definitions/v11/hd-unit3d-api.yml similarity index 100% rename from definitions/v10/hd-unit3d-api.yml rename to definitions/v11/hd-unit3d-api.yml diff --git a/definitions/v10/hdarea.yml b/definitions/v11/hdarea.yml similarity index 100% rename from definitions/v10/hdarea.yml rename to definitions/v11/hdarea.yml diff --git a/definitions/v10/hdbao.yml b/definitions/v11/hdbao.yml similarity index 100% rename from definitions/v10/hdbao.yml rename to definitions/v11/hdbao.yml diff --git a/definitions/v10/hdc.yml b/definitions/v11/hdc.yml similarity index 100% rename from definitions/v10/hdc.yml rename to definitions/v11/hdc.yml diff --git a/definitions/v10/hdclone.yml b/definitions/v11/hdclone.yml similarity index 100% rename from definitions/v10/hdclone.yml rename to definitions/v11/hdclone.yml diff --git a/definitions/v10/hdcztorrent.yml b/definitions/v11/hdcztorrent.yml similarity index 100% rename from definitions/v10/hdcztorrent.yml rename to definitions/v11/hdcztorrent.yml diff --git a/definitions/v10/hddolby.yml b/definitions/v11/hddolby.yml similarity index 100% rename from definitions/v10/hddolby.yml rename to definitions/v11/hddolby.yml diff --git a/definitions/v10/hdfans.yml b/definitions/v11/hdfans.yml similarity index 100% rename from definitions/v10/hdfans.yml rename to definitions/v11/hdfans.yml diff --git a/definitions/v10/hdforever.yml b/definitions/v11/hdforever.yml similarity index 100% rename from definitions/v10/hdforever.yml rename to definitions/v11/hdforever.yml diff --git a/definitions/v10/hdgalaktik.yml b/definitions/v11/hdgalaktik.yml similarity index 100% rename from definitions/v10/hdgalaktik.yml rename to definitions/v11/hdgalaktik.yml diff --git a/definitions/v10/hdhome.yml b/definitions/v11/hdhome.yml similarity index 100% rename from definitions/v10/hdhome.yml rename to definitions/v11/hdhome.yml diff --git a/definitions/v10/hdkylin.yml b/definitions/v11/hdkylin.yml similarity index 100% rename from definitions/v10/hdkylin.yml rename to definitions/v11/hdkylin.yml diff --git a/definitions/v10/hdolimpo-api.yml b/definitions/v11/hdolimpo-api.yml similarity index 100% rename from definitions/v10/hdolimpo-api.yml rename to definitions/v11/hdolimpo-api.yml diff --git a/definitions/v10/hdonly-api.yml b/definitions/v11/hdonly-api.yml similarity index 100% rename from definitions/v10/hdonly-api.yml rename to definitions/v11/hdonly-api.yml diff --git a/definitions/v10/hdroute.yml b/definitions/v11/hdroute.yml similarity index 100% rename from definitions/v10/hdroute.yml rename to definitions/v11/hdroute.yml diff --git a/definitions/v10/hdsky.yml b/definitions/v11/hdsky.yml similarity index 100% rename from definitions/v10/hdsky.yml rename to definitions/v11/hdsky.yml diff --git a/definitions/v10/hdspace.yml b/definitions/v11/hdspace.yml similarity index 100% rename from definitions/v10/hdspace.yml rename to definitions/v11/hdspace.yml diff --git a/definitions/v10/hdtime.yml b/definitions/v11/hdtime.yml similarity index 100% rename from definitions/v10/hdtime.yml rename to definitions/v11/hdtime.yml diff --git a/definitions/v10/hdtorrents.yml b/definitions/v11/hdtorrents.yml similarity index 100% rename from definitions/v10/hdtorrents.yml rename to definitions/v11/hdtorrents.yml diff --git a/definitions/v10/hdtorrentsit.yml b/definitions/v11/hdtorrentsit.yml similarity index 100% rename from definitions/v10/hdtorrentsit.yml rename to definitions/v11/hdtorrentsit.yml diff --git a/definitions/v10/hdturk.yml b/definitions/v11/hdturk.yml similarity index 100% rename from definitions/v10/hdturk.yml rename to definitions/v11/hdturk.yml diff --git a/definitions/v10/hdu.yml b/definitions/v11/hdu.yml similarity index 100% rename from definitions/v10/hdu.yml rename to definitions/v11/hdu.yml diff --git a/definitions/v10/hdzero.yml b/definitions/v11/hdzero.yml similarity index 100% rename from definitions/v10/hdzero.yml rename to definitions/v11/hdzero.yml diff --git a/definitions/v10/hebits.yml b/definitions/v11/hebits.yml similarity index 100% rename from definitions/v10/hebits.yml rename to definitions/v11/hebits.yml diff --git a/definitions/v10/hellashut-api.yml b/definitions/v11/hellashut-api.yml similarity index 100% rename from definitions/v10/hellashut-api.yml rename to definitions/v11/hellashut-api.yml diff --git a/definitions/v10/hellashut.yml b/definitions/v11/hellashut.yml similarity index 100% rename from definitions/v10/hellashut.yml rename to definitions/v11/hellashut.yml diff --git a/definitions/v10/helltorrents.yml b/definitions/v11/helltorrents.yml similarity index 100% rename from definitions/v10/helltorrents.yml rename to definitions/v11/helltorrents.yml diff --git a/definitions/v10/hhanclub.yml b/definitions/v11/hhanclub.yml similarity index 100% rename from definitions/v10/hhanclub.yml rename to definitions/v11/hhanclub.yml diff --git a/definitions/v10/hhd-api.yml b/definitions/v11/hhd-api.yml similarity index 100% rename from definitions/v10/hhd-api.yml rename to definitions/v11/hhd-api.yml diff --git a/definitions/v10/homeporntorrents.yml b/definitions/v11/homeporntorrents.yml similarity index 100% rename from definitions/v10/homeporntorrents.yml rename to definitions/v11/homeporntorrents.yml diff --git a/definitions/v10/houseofdevil.yml b/definitions/v11/houseofdevil.yml similarity index 100% rename from definitions/v10/houseofdevil.yml rename to definitions/v11/houseofdevil.yml diff --git a/definitions/v10/hqmusic.yml b/definitions/v11/hqmusic.yml similarity index 100% rename from definitions/v10/hqmusic.yml rename to definitions/v11/hqmusic.yml diff --git a/definitions/v10/hudbt.yml b/definitions/v11/hudbt.yml similarity index 100% rename from definitions/v10/hudbt.yml rename to definitions/v11/hudbt.yml diff --git a/definitions/v10/huntorrent.yml b/definitions/v11/huntorrent.yml similarity index 100% rename from definitions/v10/huntorrent.yml rename to definitions/v11/huntorrent.yml diff --git a/definitions/v10/idope.yml b/definitions/v11/idope.yml similarity index 100% rename from definitions/v10/idope.yml rename to definitions/v11/idope.yml diff --git a/definitions/v10/ilcorsaroblu.yml b/definitions/v11/ilcorsaroblu.yml similarity index 100% rename from definitions/v10/ilcorsaroblu.yml rename to definitions/v11/ilcorsaroblu.yml diff --git a/definitions/v10/ilcorsaronero.yml b/definitions/v11/ilcorsaronero.yml similarity index 100% rename from definitions/v10/ilcorsaronero.yml rename to definitions/v11/ilcorsaronero.yml diff --git a/definitions/v10/ildragonero.yml b/definitions/v11/ildragonero.yml similarity index 100% rename from definitions/v10/ildragonero.yml rename to definitions/v11/ildragonero.yml diff --git a/definitions/v10/ilolicon.yml b/definitions/v11/ilolicon.yml similarity index 100% rename from definitions/v10/ilolicon.yml rename to definitions/v11/ilolicon.yml diff --git a/definitions/v10/immortuos.yml b/definitions/v11/immortuos.yml similarity index 100% rename from definitions/v10/immortuos.yml rename to definitions/v11/immortuos.yml diff --git a/definitions/v10/indietorrents.yml b/definitions/v11/indietorrents.yml similarity index 100% rename from definitions/v10/indietorrents.yml rename to definitions/v11/indietorrents.yml diff --git a/definitions/v10/infinity-api.yml b/definitions/v11/infinity-api.yml similarity index 100% rename from definitions/v10/infinity-api.yml rename to definitions/v11/infinity-api.yml diff --git a/definitions/v10/infire.yml b/definitions/v11/infire.yml similarity index 100% rename from definitions/v10/infire.yml rename to definitions/v11/infire.yml diff --git a/definitions/v10/insanetracker.yml b/definitions/v11/insanetracker.yml similarity index 100% rename from definitions/v10/insanetracker.yml rename to definitions/v11/insanetracker.yml diff --git a/definitions/v10/internetarchive.yml b/definitions/v11/internetarchive.yml similarity index 100% rename from definitions/v10/internetarchive.yml rename to definitions/v11/internetarchive.yml diff --git a/definitions/v10/isohunt2.yml b/definitions/v11/isohunt2.yml similarity index 100% rename from definitions/v10/isohunt2.yml rename to definitions/v11/isohunt2.yml diff --git a/definitions/v10/itatorrents.yml b/definitions/v11/itatorrents.yml similarity index 100% rename from definitions/v10/itatorrents.yml rename to definitions/v11/itatorrents.yml diff --git a/definitions/v10/itorrent.yml b/definitions/v11/itorrent.yml similarity index 100% rename from definitions/v10/itorrent.yml rename to definitions/v11/itorrent.yml diff --git a/definitions/v10/jme-reunit3d-api.yml b/definitions/v11/jme-reunit3d-api.yml similarity index 100% rename from definitions/v10/jme-reunit3d-api.yml rename to definitions/v11/jme-reunit3d-api.yml diff --git a/definitions/v10/joyhd.yml b/definitions/v11/joyhd.yml similarity index 100% rename from definitions/v10/joyhd.yml rename to definitions/v11/joyhd.yml diff --git a/definitions/v10/jpopsuki.yml b/definitions/v11/jpopsuki.yml similarity index 100% rename from definitions/v10/jpopsuki.yml rename to definitions/v11/jpopsuki.yml diff --git a/definitions/v10/kamept.yml b/definitions/v11/kamept.yml similarity index 100% rename from definitions/v10/kamept.yml rename to definitions/v11/kamept.yml diff --git a/definitions/v10/karagarga.yml b/definitions/v11/karagarga.yml similarity index 100% rename from definitions/v10/karagarga.yml rename to definitions/v11/karagarga.yml diff --git a/definitions/v10/keepfriends.yml b/definitions/v11/keepfriends.yml similarity index 100% rename from definitions/v10/keepfriends.yml rename to definitions/v11/keepfriends.yml diff --git a/definitions/v10/kelu.yml b/definitions/v11/kelu.yml similarity index 100% rename from definitions/v10/kelu.yml rename to definitions/v11/kelu.yml diff --git a/definitions/v10/kickasstorrents-to.yml b/definitions/v11/kickasstorrents-to.yml similarity index 100% rename from definitions/v10/kickasstorrents-to.yml rename to definitions/v11/kickasstorrents-to.yml diff --git a/definitions/v10/kickasstorrents-ws.yml b/definitions/v11/kickasstorrents-ws.yml similarity index 100% rename from definitions/v10/kickasstorrents-ws.yml rename to definitions/v11/kickasstorrents-ws.yml diff --git a/definitions/v10/kinorun.yml b/definitions/v11/kinorun.yml similarity index 100% rename from definitions/v10/kinorun.yml rename to definitions/v11/kinorun.yml diff --git a/definitions/v10/kinozal-magnet.yml b/definitions/v11/kinozal-magnet.yml similarity index 100% rename from definitions/v10/kinozal-magnet.yml rename to definitions/v11/kinozal-magnet.yml diff --git a/definitions/v10/kinozal.yml b/definitions/v11/kinozal.yml similarity index 100% rename from definitions/v10/kinozal.yml rename to definitions/v11/kinozal.yml diff --git a/definitions/v10/korsar.yml b/definitions/v11/korsar.yml similarity index 100% rename from definitions/v10/korsar.yml rename to definitions/v11/korsar.yml diff --git a/definitions/v10/krazyzone.yml b/definitions/v11/krazyzone.yml similarity index 100% rename from definitions/v10/krazyzone.yml rename to definitions/v11/krazyzone.yml diff --git a/definitions/v10/kufei.yml b/definitions/v11/kufei.yml similarity index 100% rename from definitions/v10/kufei.yml rename to definitions/v11/kufei.yml diff --git a/definitions/v10/kufirc.yml b/definitions/v11/kufirc.yml similarity index 100% rename from definitions/v10/kufirc.yml rename to definitions/v11/kufirc.yml diff --git a/definitions/v10/kufirc2fa.yml b/definitions/v11/kufirc2fa.yml similarity index 100% rename from definitions/v10/kufirc2fa.yml rename to definitions/v11/kufirc2fa.yml diff --git a/definitions/v10/lastdigitalunderground.yml b/definitions/v11/lastdigitalunderground.yml similarity index 100% rename from definitions/v10/lastdigitalunderground.yml rename to definitions/v11/lastdigitalunderground.yml diff --git a/definitions/v10/lastfiles.yml b/definitions/v11/lastfiles.yml similarity index 100% rename from definitions/v10/lastfiles.yml rename to definitions/v11/lastfiles.yml diff --git a/definitions/v10/lat-team-api.yml b/definitions/v11/lat-team-api.yml similarity index 100% rename from definitions/v10/lat-team-api.yml rename to definitions/v11/lat-team-api.yml diff --git a/definitions/v10/learnflakes.yml b/definitions/v11/learnflakes.yml similarity index 100% rename from definitions/v10/learnflakes.yml rename to definitions/v11/learnflakes.yml diff --git a/definitions/v10/leech24.yml b/definitions/v11/leech24.yml similarity index 100% rename from definitions/v10/leech24.yml rename to definitions/v11/leech24.yml diff --git a/definitions/v10/lemonhd.yml b/definitions/v11/lemonhd.yml similarity index 100% rename from definitions/v10/lemonhd.yml rename to definitions/v11/lemonhd.yml diff --git a/definitions/v10/lesaloon.yml b/definitions/v11/lesaloon.yml similarity index 100% rename from definitions/v10/lesaloon.yml rename to definitions/v11/lesaloon.yml diff --git a/definitions/v10/lesbians4u.yml b/definitions/v11/lesbians4u.yml similarity index 100% rename from definitions/v10/lesbians4u.yml rename to definitions/v11/lesbians4u.yml diff --git a/definitions/v10/letseed.yml b/definitions/v11/letseed.yml similarity index 100% rename from definitions/v10/letseed.yml rename to definitions/v11/letseed.yml diff --git a/definitions/v10/libranet.yml b/definitions/v11/libranet.yml similarity index 100% rename from definitions/v10/libranet.yml rename to definitions/v11/libranet.yml diff --git a/definitions/v10/limetorrents.yml b/definitions/v11/limetorrents.yml similarity index 100% rename from definitions/v10/limetorrents.yml rename to definitions/v11/limetorrents.yml diff --git a/definitions/v10/linkomanija.yml b/definitions/v11/linkomanija.yml similarity index 100% rename from definitions/v10/linkomanija.yml rename to definitions/v11/linkomanija.yml diff --git a/definitions/v10/linuxtracker.yml b/definitions/v11/linuxtracker.yml similarity index 100% rename from definitions/v10/linuxtracker.yml rename to definitions/v11/linuxtracker.yml diff --git a/definitions/v10/locadora.yml b/definitions/v11/locadora.yml similarity index 100% rename from definitions/v10/locadora.yml rename to definitions/v11/locadora.yml diff --git a/definitions/v10/losslessclub.yml b/definitions/v11/losslessclub.yml similarity index 100% rename from definitions/v10/losslessclub.yml rename to definitions/v11/losslessclub.yml diff --git a/definitions/v10/lst.yml b/definitions/v11/lst.yml similarity index 100% rename from definitions/v10/lst.yml rename to definitions/v11/lst.yml diff --git a/definitions/v10/mactorrentsdownload.yml b/definitions/v11/mactorrentsdownload.yml similarity index 100% rename from definitions/v10/mactorrentsdownload.yml rename to definitions/v11/mactorrentsdownload.yml diff --git a/definitions/v10/madsrevolution.yml b/definitions/v11/madsrevolution.yml similarity index 100% rename from definitions/v10/madsrevolution.yml rename to definitions/v11/madsrevolution.yml diff --git a/definitions/v10/magnetcat.yml b/definitions/v11/magnetcat.yml similarity index 100% rename from definitions/v10/magnetcat.yml rename to definitions/v11/magnetcat.yml diff --git a/definitions/v10/majomparade.yml b/definitions/v11/majomparade.yml similarity index 100% rename from definitions/v10/majomparade.yml rename to definitions/v11/majomparade.yml diff --git a/definitions/v10/makingoff.yml b/definitions/v11/makingoff.yml similarity index 100% rename from definitions/v10/makingoff.yml rename to definitions/v11/makingoff.yml diff --git a/definitions/v10/malayabits-api.yml b/definitions/v11/malayabits-api.yml similarity index 100% rename from definitions/v10/malayabits-api.yml rename to definitions/v11/malayabits-api.yml diff --git a/definitions/v10/marinetracker.yml b/definitions/v11/marinetracker.yml similarity index 100% rename from definitions/v10/marinetracker.yml rename to definitions/v11/marinetracker.yml diff --git a/definitions/v10/masters-tb.yml b/definitions/v11/masters-tb.yml similarity index 100% rename from definitions/v10/masters-tb.yml rename to definitions/v11/masters-tb.yml diff --git a/definitions/v10/matrix.yml b/definitions/v11/matrix.yml similarity index 100% rename from definitions/v10/matrix.yml rename to definitions/v11/matrix.yml diff --git a/definitions/v10/mazepa.yml b/definitions/v11/mazepa.yml similarity index 100% rename from definitions/v10/mazepa.yml rename to definitions/v11/mazepa.yml diff --git a/definitions/v10/mdan.yml b/definitions/v11/mdan.yml similarity index 100% rename from definitions/v10/mdan.yml rename to definitions/v11/mdan.yml diff --git a/definitions/v10/megamixtracker.yml b/definitions/v11/megamixtracker.yml similarity index 100% rename from definitions/v10/megamixtracker.yml rename to definitions/v11/megamixtracker.yml diff --git a/definitions/v10/mesevilag.yml b/definitions/v11/mesevilag.yml similarity index 100% rename from definitions/v10/mesevilag.yml rename to definitions/v11/mesevilag.yml diff --git a/definitions/v10/metalguru.yml b/definitions/v11/metalguru.yml similarity index 100% rename from definitions/v10/metalguru.yml rename to definitions/v11/metalguru.yml diff --git a/definitions/v10/metaltracker.yml b/definitions/v11/metaltracker.yml similarity index 100% rename from definitions/v10/metaltracker.yml rename to definitions/v11/metaltracker.yml diff --git a/definitions/v10/mikan.yml b/definitions/v11/mikan.yml similarity index 100% rename from definitions/v10/mikan.yml rename to definitions/v11/mikan.yml diff --git a/definitions/v10/milkie.yml b/definitions/v11/milkie.yml similarity index 100% rename from definitions/v10/milkie.yml rename to definitions/v11/milkie.yml diff --git a/definitions/v10/miobt.yml b/definitions/v11/miobt.yml similarity index 100% rename from definitions/v10/miobt.yml rename to definitions/v11/miobt.yml diff --git a/definitions/v10/mircrew.yml b/definitions/v11/mircrew.yml similarity index 100% rename from definitions/v10/mircrew.yml rename to definitions/v11/mircrew.yml diff --git a/definitions/v10/mixtapetorrent.yml b/definitions/v11/mixtapetorrent.yml similarity index 100% rename from definitions/v10/mixtapetorrent.yml rename to definitions/v11/mixtapetorrent.yml diff --git a/definitions/v10/mma-torrents.yml b/definitions/v11/mma-torrents.yml similarity index 100% rename from definitions/v10/mma-torrents.yml rename to definitions/v11/mma-torrents.yml diff --git a/definitions/v10/mnv.yml b/definitions/v11/mnv.yml similarity index 100% rename from definitions/v10/mnv.yml rename to definitions/v11/mnv.yml diff --git a/definitions/v10/mojblink.yml b/definitions/v11/mojblink.yml similarity index 100% rename from definitions/v10/mojblink.yml rename to definitions/v11/mojblink.yml diff --git a/definitions/v10/monikadesign-api.yml b/definitions/v11/monikadesign-api.yml similarity index 100% rename from definitions/v10/monikadesign-api.yml rename to definitions/v11/monikadesign-api.yml diff --git a/definitions/v10/mousebits.yml b/definitions/v11/mousebits.yml similarity index 100% rename from definitions/v10/mousebits.yml rename to definitions/v11/mousebits.yml diff --git a/definitions/v10/moviesdvdr.yml b/definitions/v11/moviesdvdr.yml similarity index 100% rename from definitions/v10/moviesdvdr.yml rename to definitions/v11/moviesdvdr.yml diff --git a/definitions/v10/musebootlegs.yml b/definitions/v11/musebootlegs.yml similarity index 100% rename from definitions/v10/musebootlegs.yml rename to definitions/v11/musebootlegs.yml diff --git a/definitions/v10/mypornclub.yml b/definitions/v11/mypornclub.yml similarity index 100% rename from definitions/v10/mypornclub.yml rename to definitions/v11/mypornclub.yml diff --git a/definitions/v10/myspleen.yml b/definitions/v11/myspleen.yml similarity index 100% rename from definitions/v10/myspleen.yml rename to definitions/v11/myspleen.yml diff --git a/definitions/v10/ncore.yml b/definitions/v11/ncore.yml similarity index 100% rename from definitions/v10/ncore.yml rename to definitions/v11/ncore.yml diff --git a/definitions/v10/nethd.yml b/definitions/v11/nethd.yml similarity index 100% rename from definitions/v10/nethd.yml rename to definitions/v11/nethd.yml diff --git a/definitions/v10/newretro.yml b/definitions/v11/newretro.yml similarity index 100% rename from definitions/v10/newretro.yml rename to definitions/v11/newretro.yml diff --git a/definitions/v10/newstudio.yml b/definitions/v11/newstudio.yml similarity index 100% rename from definitions/v10/newstudio.yml rename to definitions/v11/newstudio.yml diff --git a/definitions/v10/newstudiol.yml b/definitions/v11/newstudiol.yml similarity index 100% rename from definitions/v10/newstudiol.yml rename to definitions/v11/newstudiol.yml diff --git a/definitions/v10/nicept.yml b/definitions/v11/nicept.yml similarity index 100% rename from definitions/v10/nicept.yml rename to definitions/v11/nicept.yml diff --git a/definitions/v10/nipponsei.yml b/definitions/v11/nipponsei.yml similarity index 100% rename from definitions/v10/nipponsei.yml rename to definitions/v11/nipponsei.yml diff --git a/definitions/v10/noname-club.yml b/definitions/v11/noname-club.yml similarity index 100% rename from definitions/v10/noname-club.yml rename to definitions/v11/noname-club.yml diff --git a/definitions/v10/noname-clubl.yml b/definitions/v11/noname-clubl.yml similarity index 100% rename from definitions/v10/noname-clubl.yml rename to definitions/v11/noname-clubl.yml diff --git a/definitions/v10/nordicquality.yml b/definitions/v11/nordicquality.yml similarity index 100% rename from definitions/v10/nordicquality.yml rename to definitions/v11/nordicquality.yml diff --git a/definitions/v10/nortorrent.yml b/definitions/v11/nortorrent.yml similarity index 100% rename from definitions/v10/nortorrent.yml rename to definitions/v11/nortorrent.yml diff --git a/definitions/v10/nusantarare.yml b/definitions/v11/nusantarare.yml similarity index 100% rename from definitions/v10/nusantarare.yml rename to definitions/v11/nusantarare.yml diff --git a/definitions/v10/nyaasi.yml b/definitions/v11/nyaasi.yml similarity index 100% rename from definitions/v10/nyaasi.yml rename to definitions/v11/nyaasi.yml diff --git a/definitions/v10/okpt.yml b/definitions/v11/okpt.yml similarity index 100% rename from definitions/v10/okpt.yml rename to definitions/v11/okpt.yml diff --git a/definitions/v10/oldgreektracker.yml b/definitions/v11/oldgreektracker.yml similarity index 100% rename from definitions/v10/oldgreektracker.yml rename to definitions/v11/oldgreektracker.yml diff --git a/definitions/v10/oldtoonsworld.yml b/definitions/v11/oldtoonsworld.yml similarity index 100% rename from definitions/v10/oldtoonsworld.yml rename to definitions/v11/oldtoonsworld.yml diff --git a/definitions/v10/onejav.yml b/definitions/v11/onejav.yml similarity index 100% rename from definitions/v10/onejav.yml rename to definitions/v11/onejav.yml diff --git a/definitions/v10/onlyencodes-api.yml b/definitions/v11/onlyencodes-api.yml similarity index 100% rename from definitions/v10/onlyencodes-api.yml rename to definitions/v11/onlyencodes-api.yml diff --git a/definitions/v10/opencd.yml b/definitions/v11/opencd.yml similarity index 100% rename from definitions/v10/opencd.yml rename to definitions/v11/opencd.yml diff --git a/definitions/v10/opensharing.yml b/definitions/v11/opensharing.yml similarity index 100% rename from definitions/v10/opensharing.yml rename to definitions/v11/opensharing.yml diff --git a/definitions/v10/oshenpt.yml b/definitions/v11/oshenpt.yml similarity index 100% rename from definitions/v10/oshenpt.yml rename to definitions/v11/oshenpt.yml diff --git a/definitions/v10/ostwiki.yml b/definitions/v11/ostwiki.yml similarity index 100% rename from definitions/v10/ostwiki.yml rename to definitions/v11/ostwiki.yml diff --git a/definitions/v10/ourbits.yml b/definitions/v11/ourbits.yml similarity index 100% rename from definitions/v10/ourbits.yml rename to definitions/v11/ourbits.yml diff --git a/definitions/v10/oxtorrent-co.yml b/definitions/v11/oxtorrent-co.yml similarity index 100% rename from definitions/v10/oxtorrent-co.yml rename to definitions/v11/oxtorrent-co.yml diff --git a/definitions/v10/oxtorrent-vip.yml b/definitions/v11/oxtorrent-vip.yml similarity index 100% rename from definitions/v10/oxtorrent-vip.yml rename to definitions/v11/oxtorrent-vip.yml diff --git a/definitions/v10/p2pbg.yml b/definitions/v11/p2pbg.yml similarity index 100% rename from definitions/v10/p2pbg.yml rename to definitions/v11/p2pbg.yml diff --git a/definitions/v10/panda.yml b/definitions/v11/panda.yml similarity index 100% rename from definitions/v10/panda.yml rename to definitions/v11/panda.yml diff --git a/definitions/v10/party-tracker.yml b/definitions/v11/party-tracker.yml similarity index 100% rename from definitions/v10/party-tracker.yml rename to definitions/v11/party-tracker.yml diff --git a/definitions/v10/pctorrent.yml b/definitions/v11/pctorrent.yml similarity index 100% rename from definitions/v10/pctorrent.yml rename to definitions/v11/pctorrent.yml diff --git a/definitions/v10/peeratiko.yml b/definitions/v11/peeratiko.yml similarity index 100% rename from definitions/v10/peeratiko.yml rename to definitions/v11/peeratiko.yml diff --git a/definitions/v10/peersfm.yml b/definitions/v11/peersfm.yml similarity index 100% rename from definitions/v10/peersfm.yml rename to definitions/v11/peersfm.yml diff --git a/definitions/v10/pier720.yml b/definitions/v11/pier720.yml similarity index 100% rename from definitions/v10/pier720.yml rename to definitions/v11/pier720.yml diff --git a/definitions/v10/pignetwork.yml b/definitions/v11/pignetwork.yml similarity index 100% rename from definitions/v10/pignetwork.yml rename to definitions/v11/pignetwork.yml diff --git a/definitions/v10/pixelcove.yml b/definitions/v11/pixelcove.yml similarity index 100% rename from definitions/v10/pixelcove.yml rename to definitions/v11/pixelcove.yml diff --git a/definitions/v10/pixelcove2fa.yml b/definitions/v11/pixelcove2fa.yml similarity index 100% rename from definitions/v10/pixelcove2fa.yml rename to definitions/v11/pixelcove2fa.yml diff --git a/definitions/v10/plugintorrent.yml b/definitions/v11/plugintorrent.yml similarity index 100% rename from definitions/v10/plugintorrent.yml rename to definitions/v11/plugintorrent.yml diff --git a/definitions/v10/polishtorrent.yml b/definitions/v11/polishtorrent.yml similarity index 100% rename from definitions/v10/polishtorrent.yml rename to definitions/v11/polishtorrent.yml diff --git a/definitions/v10/polishtracker-api.yml b/definitions/v11/polishtracker-api.yml similarity index 100% rename from definitions/v10/polishtracker-api.yml rename to definitions/v11/polishtracker-api.yml diff --git a/definitions/v10/polskie-torrenty.yml b/definitions/v11/polskie-torrenty.yml similarity index 100% rename from definitions/v10/polskie-torrenty.yml rename to definitions/v11/polskie-torrenty.yml diff --git a/definitions/v10/pornbay.yml b/definitions/v11/pornbay.yml similarity index 100% rename from definitions/v10/pornbay.yml rename to definitions/v11/pornbay.yml diff --git a/definitions/v10/pornotorrent.yml b/definitions/v11/pornotorrent.yml similarity index 100% rename from definitions/v10/pornotorrent.yml rename to definitions/v11/pornotorrent.yml diff --git a/definitions/v10/pornrips.yml b/definitions/v11/pornrips.yml similarity index 100% rename from definitions/v10/pornrips.yml rename to definitions/v11/pornrips.yml diff --git a/definitions/v10/pornxlab.yml b/definitions/v11/pornxlab.yml similarity index 100% rename from definitions/v10/pornxlab.yml rename to definitions/v11/pornxlab.yml diff --git a/definitions/v10/portugas-api.yml b/definitions/v11/portugas-api.yml similarity index 100% rename from definitions/v10/portugas-api.yml rename to definitions/v11/portugas-api.yml diff --git a/definitions/v10/postman.yml b/definitions/v11/postman.yml similarity index 100% rename from definitions/v10/postman.yml rename to definitions/v11/postman.yml diff --git a/definitions/v10/proaudiotorrents.yml b/definitions/v11/proaudiotorrents.yml similarity index 100% rename from definitions/v10/proaudiotorrents.yml rename to definitions/v11/proaudiotorrents.yml diff --git a/definitions/v10/proporno.yml b/definitions/v11/proporno.yml similarity index 100% rename from definitions/v10/proporno.yml rename to definitions/v11/proporno.yml diff --git a/definitions/v10/ptcafe.yml b/definitions/v11/ptcafe.yml similarity index 100% rename from definitions/v10/ptcafe.yml rename to definitions/v11/ptcafe.yml diff --git a/definitions/v10/ptchina.yml b/definitions/v11/ptchina.yml similarity index 100% rename from definitions/v10/ptchina.yml rename to definitions/v11/ptchina.yml diff --git a/definitions/v10/pterclub.yml b/definitions/v11/pterclub.yml similarity index 100% rename from definitions/v10/pterclub.yml rename to definitions/v11/pterclub.yml diff --git a/definitions/v10/ptfans.yml b/definitions/v11/ptfans.yml similarity index 100% rename from definitions/v10/ptfans.yml rename to definitions/v11/ptfans.yml diff --git a/definitions/v10/ptfiles.yml b/definitions/v11/ptfiles.yml similarity index 100% rename from definitions/v10/ptfiles.yml rename to definitions/v11/ptfiles.yml diff --git a/definitions/v10/ptgtk.yml b/definitions/v11/ptgtk.yml similarity index 100% rename from definitions/v10/ptgtk.yml rename to definitions/v11/ptgtk.yml diff --git a/definitions/v10/pthome.yml b/definitions/v11/pthome.yml similarity index 100% rename from definitions/v10/pthome.yml rename to definitions/v11/pthome.yml diff --git a/definitions/v10/ptitzmx.yml b/definitions/v11/ptitzmx.yml similarity index 100% rename from definitions/v10/ptitzmx.yml rename to definitions/v11/ptitzmx.yml diff --git a/definitions/v10/ptsbao.yml b/definitions/v11/ptsbao.yml similarity index 100% rename from definitions/v10/ptsbao.yml rename to definitions/v11/ptsbao.yml diff --git a/definitions/v10/ptskit.yml b/definitions/v11/ptskit.yml similarity index 100% rename from definitions/v10/ptskit.yml rename to definitions/v11/ptskit.yml diff --git a/definitions/v10/pttime.yml b/definitions/v11/pttime.yml similarity index 100% rename from definitions/v10/pttime.yml rename to definitions/v11/pttime.yml diff --git a/definitions/v10/ptvicomo.yml b/definitions/v11/ptvicomo.yml similarity index 100% rename from definitions/v10/ptvicomo.yml rename to definitions/v11/ptvicomo.yml diff --git a/definitions/v10/punkshorror.yml b/definitions/v11/punkshorror.yml similarity index 100% rename from definitions/v10/punkshorror.yml rename to definitions/v11/punkshorror.yml diff --git a/definitions/v10/puntotorrent.yml b/definitions/v11/puntotorrent.yml similarity index 100% rename from definitions/v10/puntotorrent.yml rename to definitions/v11/puntotorrent.yml diff --git a/definitions/v10/pussytorrents.yml b/definitions/v11/pussytorrents.yml similarity index 100% rename from definitions/v10/pussytorrents.yml rename to definitions/v11/pussytorrents.yml diff --git a/definitions/v10/putao.yml b/definitions/v11/putao.yml similarity index 100% rename from definitions/v10/putao.yml rename to definitions/v11/putao.yml diff --git a/definitions/v10/pwtorrents.yml b/definitions/v11/pwtorrents.yml similarity index 100% rename from definitions/v10/pwtorrents.yml rename to definitions/v11/pwtorrents.yml diff --git a/definitions/v10/qbite.yml b/definitions/v11/qbite.yml similarity index 100% rename from definitions/v10/qbite.yml rename to definitions/v11/qbite.yml diff --git a/definitions/v10/qingwa.yml b/definitions/v11/qingwa.yml similarity index 100% rename from definitions/v10/qingwa.yml rename to definitions/v11/qingwa.yml diff --git a/definitions/v10/r3vwtf.yml b/definitions/v11/r3vwtf.yml similarity index 100% rename from definitions/v10/r3vwtf.yml rename to definitions/v11/r3vwtf.yml diff --git a/definitions/v10/racing4everyone-api.yml b/definitions/v11/racing4everyone-api.yml similarity index 100% rename from definitions/v10/racing4everyone-api.yml rename to definitions/v11/racing4everyone-api.yml diff --git a/definitions/v10/racingforme.yml b/definitions/v11/racingforme.yml similarity index 100% rename from definitions/v10/racingforme.yml rename to definitions/v11/racingforme.yml diff --git a/definitions/v10/railgunpt.yml b/definitions/v11/railgunpt.yml similarity index 100% rename from definitions/v10/railgunpt.yml rename to definitions/v11/railgunpt.yml diff --git a/definitions/v10/rain.yml b/definitions/v11/rain.yml similarity index 100% rename from definitions/v10/rain.yml rename to definitions/v11/rain.yml diff --git a/definitions/v10/rainbowtracker.yml b/definitions/v11/rainbowtracker.yml similarity index 100% rename from definitions/v10/rainbowtracker.yml rename to definitions/v11/rainbowtracker.yml diff --git a/definitions/v10/rapidzona.yml b/definitions/v11/rapidzona.yml similarity index 100% rename from definitions/v10/rapidzona.yml rename to definitions/v11/rapidzona.yml diff --git a/definitions/v10/rastastugan-api.yml b/definitions/v11/rastastugan-api.yml similarity index 100% rename from definitions/v10/rastastugan-api.yml rename to definitions/v11/rastastugan-api.yml diff --git a/definitions/v10/redstartorrent.yml b/definitions/v11/redstartorrent.yml similarity index 100% rename from definitions/v10/redstartorrent.yml rename to definitions/v11/redstartorrent.yml diff --git a/definitions/v10/reelflix-api.yml b/definitions/v11/reelflix-api.yml similarity index 100% rename from definitions/v10/reelflix-api.yml rename to definitions/v11/reelflix-api.yml diff --git a/definitions/v10/rgfootball.yml b/definitions/v11/rgfootball.yml similarity index 100% rename from definitions/v10/rgfootball.yml rename to definitions/v11/rgfootball.yml diff --git a/definitions/v10/rintor.yml b/definitions/v11/rintor.yml similarity index 100% rename from definitions/v10/rintor.yml rename to definitions/v11/rintor.yml diff --git a/definitions/v10/rintornet.yml b/definitions/v11/rintornet.yml similarity index 100% rename from definitions/v10/rintornet.yml rename to definitions/v11/rintornet.yml diff --git a/definitions/v10/riperam.yml b/definitions/v11/riperam.yml similarity index 100% rename from definitions/v10/riperam.yml rename to definitions/v11/riperam.yml diff --git a/definitions/v10/rockbox.yml b/definitions/v11/rockbox.yml similarity index 100% rename from definitions/v10/rockbox.yml rename to definitions/v11/rockbox.yml diff --git a/definitions/v10/rockethd.yml b/definitions/v11/rockethd.yml similarity index 100% rename from definitions/v10/rockethd.yml rename to definitions/v11/rockethd.yml diff --git a/definitions/v10/romanianmetaltorrents.yml b/definitions/v11/romanianmetaltorrents.yml similarity index 100% rename from definitions/v10/romanianmetaltorrents.yml rename to definitions/v11/romanianmetaltorrents.yml diff --git a/definitions/v10/rousi.yml b/definitions/v11/rousi.yml similarity index 100% rename from definitions/v10/rousi.yml rename to definitions/v11/rousi.yml diff --git a/definitions/v10/rudub.yml b/definitions/v11/rudub.yml similarity index 100% rename from definitions/v10/rudub.yml rename to definitions/v11/rudub.yml diff --git a/definitions/v10/rustorka.yml b/definitions/v11/rustorka.yml similarity index 100% rename from definitions/v10/rustorka.yml rename to definitions/v11/rustorka.yml diff --git a/definitions/v10/rutor.yml b/definitions/v11/rutor.yml similarity index 100% rename from definitions/v10/rutor.yml rename to definitions/v11/rutor.yml diff --git a/definitions/v10/rutracker-ru.yml b/definitions/v11/rutracker-ru.yml similarity index 100% rename from definitions/v10/rutracker-ru.yml rename to definitions/v11/rutracker-ru.yml diff --git a/definitions/v10/samaritano.yml b/definitions/v11/samaritano.yml similarity index 100% rename from definitions/v10/samaritano.yml rename to definitions/v11/samaritano.yml diff --git a/definitions/v10/scenerush.yml b/definitions/v11/scenerush.yml similarity index 100% rename from definitions/v10/scenerush.yml rename to definitions/v11/scenerush.yml diff --git a/definitions/v10/seedfile.yml b/definitions/v11/seedfile.yml similarity index 100% rename from definitions/v10/seedfile.yml rename to definitions/v11/seedfile.yml diff --git a/definitions/v10/selezen.yml b/definitions/v11/selezen.yml similarity index 100% rename from definitions/v10/selezen.yml rename to definitions/v11/selezen.yml diff --git a/definitions/v10/sewerpt.yml b/definitions/v11/sewerpt.yml similarity index 100% rename from definitions/v10/sewerpt.yml rename to definitions/v11/sewerpt.yml diff --git a/definitions/v10/sexypics.yml b/definitions/v11/sexypics.yml similarity index 100% rename from definitions/v10/sexypics.yml rename to definitions/v11/sexypics.yml diff --git a/definitions/v10/sfp.yml b/definitions/v11/sfp.yml similarity index 100% rename from definitions/v10/sfp.yml rename to definitions/v11/sfp.yml diff --git a/definitions/v10/shanaproject.yml b/definitions/v11/shanaproject.yml similarity index 100% rename from definitions/v10/shanaproject.yml rename to definitions/v11/shanaproject.yml diff --git a/definitions/v10/shareisland-api.yml b/definitions/v11/shareisland-api.yml similarity index 100% rename from definitions/v10/shareisland-api.yml rename to definitions/v11/shareisland-api.yml diff --git a/definitions/v10/sharewood-api.yml b/definitions/v11/sharewood-api.yml similarity index 100% rename from definitions/v10/sharewood-api.yml rename to definitions/v11/sharewood-api.yml diff --git a/definitions/v10/showrss.yml b/definitions/v11/showrss.yml similarity index 100% rename from definitions/v10/showrss.yml rename to definitions/v11/showrss.yml diff --git a/definitions/v10/siambit.yml b/definitions/v11/siambit.yml similarity index 100% rename from definitions/v10/siambit.yml rename to definitions/v11/siambit.yml diff --git a/definitions/v10/skidrowrepack.yml b/definitions/v11/skidrowrepack.yml similarity index 100% rename from definitions/v10/skidrowrepack.yml rename to definitions/v11/skidrowrepack.yml diff --git a/definitions/v10/skipthecommercials-api.yml b/definitions/v11/skipthecommercials-api.yml similarity index 100% rename from definitions/v10/skipthecommercials-api.yml rename to definitions/v11/skipthecommercials-api.yml diff --git a/definitions/v10/sktorrent-org.yml b/definitions/v11/sktorrent-org.yml similarity index 100% rename from definitions/v10/sktorrent-org.yml rename to definitions/v11/sktorrent-org.yml diff --git a/definitions/v10/sktorrent.yml b/definitions/v11/sktorrent.yml similarity index 100% rename from definitions/v10/sktorrent.yml rename to definitions/v11/sktorrent.yml diff --git a/definitions/v10/snowpt.yml b/definitions/v11/snowpt.yml similarity index 100% rename from definitions/v10/snowpt.yml rename to definitions/v11/snowpt.yml diff --git a/definitions/v10/sosulki.yml b/definitions/v11/sosulki.yml similarity index 100% rename from definitions/v10/sosulki.yml rename to definitions/v11/sosulki.yml diff --git a/definitions/v10/soulvoice.yml b/definitions/v11/soulvoice.yml similarity index 100% rename from definitions/v10/soulvoice.yml rename to definitions/v11/soulvoice.yml diff --git a/definitions/v10/speedmasterhd.yml b/definitions/v11/speedmasterhd.yml similarity index 100% rename from definitions/v10/speedmasterhd.yml rename to definitions/v11/speedmasterhd.yml diff --git a/definitions/v10/spiritofrevolution.yml b/definitions/v11/spiritofrevolution.yml similarity index 100% rename from definitions/v10/spiritofrevolution.yml rename to definitions/v11/spiritofrevolution.yml diff --git a/definitions/v10/sportscult.yml b/definitions/v11/sportscult.yml similarity index 100% rename from definitions/v10/sportscult.yml rename to definitions/v11/sportscult.yml diff --git a/definitions/v10/springsunday.yml b/definitions/v11/springsunday.yml similarity index 100% rename from definitions/v10/springsunday.yml rename to definitions/v11/springsunday.yml diff --git a/definitions/v10/sugoimusic.yml b/definitions/v11/sugoimusic.yml similarity index 100% rename from definitions/v10/sugoimusic.yml rename to definitions/v11/sugoimusic.yml diff --git a/definitions/v10/sukebeinyaasi.yml b/definitions/v11/sukebeinyaasi.yml similarity index 100% rename from definitions/v10/sukebeinyaasi.yml rename to definitions/v11/sukebeinyaasi.yml diff --git a/definitions/v10/superbits.yml b/definitions/v11/superbits.yml similarity index 100% rename from definitions/v10/superbits.yml rename to definitions/v11/superbits.yml diff --git a/definitions/v10/swarmazon-api.yml b/definitions/v11/swarmazon-api.yml similarity index 100% rename from definitions/v10/swarmazon-api.yml rename to definitions/v11/swarmazon-api.yml diff --git a/definitions/v10/tasmanit.yml b/definitions/v11/tasmanit.yml similarity index 100% rename from definitions/v10/tasmanit.yml rename to definitions/v11/tasmanit.yml diff --git a/definitions/v10/teamctgame.yml b/definitions/v11/teamctgame.yml similarity index 100% rename from definitions/v10/teamctgame.yml rename to definitions/v11/teamctgame.yml diff --git a/definitions/v10/teamhd.yml b/definitions/v11/teamhd.yml similarity index 100% rename from definitions/v10/teamhd.yml rename to definitions/v11/teamhd.yml diff --git a/definitions/v10/teamos.yml b/definitions/v11/teamos.yml similarity index 100% rename from definitions/v10/teamos.yml rename to definitions/v11/teamos.yml diff --git a/definitions/v10/tekno3d.yml b/definitions/v11/tekno3d.yml similarity index 100% rename from definitions/v10/tekno3d.yml rename to definitions/v11/tekno3d.yml diff --git a/definitions/v10/thecrazyones.yml b/definitions/v11/thecrazyones.yml similarity index 100% rename from definitions/v10/thecrazyones.yml rename to definitions/v11/thecrazyones.yml diff --git a/definitions/v10/theempire.yml b/definitions/v11/theempire.yml similarity index 100% rename from definitions/v10/theempire.yml rename to definitions/v11/theempire.yml diff --git a/definitions/v10/thefallingangels.yml b/definitions/v11/thefallingangels.yml similarity index 100% rename from definitions/v10/thefallingangels.yml rename to definitions/v11/thefallingangels.yml diff --git a/definitions/v10/thegeeks.yml b/definitions/v11/thegeeks.yml similarity index 100% rename from definitions/v10/thegeeks.yml rename to definitions/v11/thegeeks.yml diff --git a/definitions/v10/thekitchen.yml b/definitions/v11/thekitchen.yml similarity index 100% rename from definitions/v10/thekitchen.yml rename to definitions/v11/thekitchen.yml diff --git a/definitions/v10/theleachzone-api.yml b/definitions/v11/theleachzone-api.yml similarity index 100% rename from definitions/v10/theleachzone-api.yml rename to definitions/v11/theleachzone-api.yml diff --git a/definitions/v10/themixingbowl.yml b/definitions/v11/themixingbowl.yml similarity index 100% rename from definitions/v10/themixingbowl.yml rename to definitions/v11/themixingbowl.yml diff --git a/definitions/v10/thenewfun.yml b/definitions/v11/thenewfun.yml similarity index 100% rename from definitions/v10/thenewfun.yml rename to definitions/v11/thenewfun.yml diff --git a/definitions/v10/theoccult.yml b/definitions/v11/theoccult.yml similarity index 100% rename from definitions/v10/theoccult.yml rename to definitions/v11/theoccult.yml diff --git a/definitions/v10/theoldschool-api.yml b/definitions/v11/theoldschool-api.yml similarity index 100% rename from definitions/v10/theoldschool-api.yml rename to definitions/v11/theoldschool-api.yml diff --git a/definitions/v10/theparadiese.yml b/definitions/v11/theparadiese.yml similarity index 100% rename from definitions/v10/theparadiese.yml rename to definitions/v11/theparadiese.yml diff --git a/definitions/v10/thepiratebay.yml b/definitions/v11/thepiratebay.yml similarity index 100% rename from definitions/v10/thepiratebay.yml rename to definitions/v11/thepiratebay.yml diff --git a/definitions/v10/thepiratedship.yml b/definitions/v11/thepiratedship.yml similarity index 100% rename from definitions/v10/thepiratedship.yml rename to definitions/v11/thepiratedship.yml diff --git a/definitions/v10/theplace.yml b/definitions/v11/theplace.yml similarity index 100% rename from definitions/v10/theplace.yml rename to definitions/v11/theplace.yml diff --git a/definitions/v10/therarbg.yml b/definitions/v11/therarbg.yml similarity index 100% rename from definitions/v10/therarbg.yml rename to definitions/v11/therarbg.yml diff --git a/definitions/v10/theshow.yml b/definitions/v11/theshow.yml similarity index 100% rename from definitions/v10/theshow.yml rename to definitions/v11/theshow.yml diff --git a/definitions/v10/thevault.yml b/definitions/v11/thevault.yml similarity index 100% rename from definitions/v10/thevault.yml rename to definitions/v11/thevault.yml diff --git a/definitions/v10/tjupt.yml b/definitions/v11/tjupt.yml similarity index 100% rename from definitions/v10/tjupt.yml rename to definitions/v11/tjupt.yml diff --git a/definitions/v10/tlfbits.yml b/definitions/v11/tlfbits.yml similarity index 100% rename from definitions/v10/tlfbits.yml rename to definitions/v11/tlfbits.yml diff --git a/definitions/v10/tmghub.yml b/definitions/v11/tmghub.yml similarity index 100% rename from definitions/v10/tmghub.yml rename to definitions/v11/tmghub.yml diff --git a/definitions/v10/tocashare.yml b/definitions/v11/tocashare.yml similarity index 100% rename from definitions/v10/tocashare.yml rename to definitions/v11/tocashare.yml diff --git a/definitions/v10/tokyotosho.yml b/definitions/v11/tokyotosho.yml similarity index 100% rename from definitions/v10/tokyotosho.yml rename to definitions/v11/tokyotosho.yml diff --git a/definitions/v10/torlock.yml b/definitions/v11/torlock.yml similarity index 100% rename from definitions/v10/torlock.yml rename to definitions/v11/torlock.yml diff --git a/definitions/v10/tormac.yml b/definitions/v11/tormac.yml similarity index 100% rename from definitions/v10/tormac.yml rename to definitions/v11/tormac.yml diff --git a/definitions/v10/tornado.yml b/definitions/v11/tornado.yml similarity index 100% rename from definitions/v10/tornado.yml rename to definitions/v11/tornado.yml diff --git a/definitions/v10/torrent-pirat.yml b/definitions/v11/torrent-pirat.yml similarity index 100% rename from definitions/v10/torrent-pirat.yml rename to definitions/v11/torrent-pirat.yml diff --git a/definitions/v10/torrent-turk.yml b/definitions/v11/torrent-turk.yml similarity index 100% rename from definitions/v10/torrent-turk.yml rename to definitions/v11/torrent-turk.yml diff --git a/definitions/v10/torrent9.yml b/definitions/v11/torrent9.yml similarity index 100% rename from definitions/v10/torrent9.yml rename to definitions/v11/torrent9.yml diff --git a/definitions/v10/torrentbd.yml b/definitions/v11/torrentbd.yml similarity index 100% rename from definitions/v10/torrentbd.yml rename to definitions/v11/torrentbd.yml diff --git a/definitions/v10/torrentccf.yml b/definitions/v11/torrentccf.yml similarity index 100% rename from definitions/v10/torrentccf.yml rename to definitions/v11/torrentccf.yml diff --git a/definitions/v10/torrentcore.yml b/definitions/v11/torrentcore.yml similarity index 100% rename from definitions/v10/torrentcore.yml rename to definitions/v11/torrentcore.yml diff --git a/definitions/v10/torrentdd.yml b/definitions/v11/torrentdd.yml similarity index 100% rename from definitions/v10/torrentdd.yml rename to definitions/v11/torrentdd.yml diff --git a/definitions/v10/torrentdownload.yml b/definitions/v11/torrentdownload.yml similarity index 100% rename from definitions/v10/torrentdownload.yml rename to definitions/v11/torrentdownload.yml diff --git a/definitions/v10/torrentdownloads.yml b/definitions/v11/torrentdownloads.yml similarity index 100% rename from definitions/v10/torrentdownloads.yml rename to definitions/v11/torrentdownloads.yml diff --git a/definitions/v10/torrenteros-api.yml b/definitions/v11/torrenteros-api.yml similarity index 100% rename from definitions/v10/torrenteros-api.yml rename to definitions/v11/torrenteros-api.yml diff --git a/definitions/v10/torrentgalaxyclone.yml b/definitions/v11/torrentgalaxyclone.yml similarity index 100% rename from definitions/v10/torrentgalaxyclone.yml rename to definitions/v11/torrentgalaxyclone.yml diff --git a/definitions/v10/torrenthr.yml b/definitions/v11/torrenthr.yml similarity index 100% rename from definitions/v10/torrenthr.yml rename to definitions/v11/torrenthr.yml diff --git a/definitions/v10/torrenting.yml b/definitions/v11/torrenting.yml similarity index 100% rename from definitions/v10/torrenting.yml rename to definitions/v11/torrenting.yml diff --git a/definitions/v10/torrentleech-pl.yml b/definitions/v11/torrentleech-pl.yml similarity index 100% rename from definitions/v10/torrentleech-pl.yml rename to definitions/v11/torrentleech-pl.yml diff --git a/definitions/v10/torrentlt.yml b/definitions/v11/torrentlt.yml similarity index 100% rename from definitions/v10/torrentlt.yml rename to definitions/v11/torrentlt.yml diff --git a/definitions/v10/torrentmasters.yml b/definitions/v11/torrentmasters.yml similarity index 100% rename from definitions/v10/torrentmasters.yml rename to definitions/v11/torrentmasters.yml diff --git a/definitions/v10/torrentqq.yml b/definitions/v11/torrentqq.yml similarity index 100% rename from definitions/v10/torrentqq.yml rename to definitions/v11/torrentqq.yml diff --git a/definitions/v10/torrentsir.yml b/definitions/v11/torrentsir.yml similarity index 100% rename from definitions/v10/torrentsir.yml rename to definitions/v11/torrentsir.yml diff --git a/definitions/v10/torrentsome.yml b/definitions/v11/torrentsome.yml similarity index 100% rename from definitions/v10/torrentsome.yml rename to definitions/v11/torrentsome.yml diff --git a/definitions/v10/torrentssg.yml b/definitions/v11/torrentssg.yml similarity index 100% rename from definitions/v10/torrentssg.yml rename to definitions/v11/torrentssg.yml diff --git a/definitions/v10/torrenttip.yml b/definitions/v11/torrenttip.yml similarity index 100% rename from definitions/v10/torrenttip.yml rename to definitions/v11/torrenttip.yml diff --git a/definitions/v10/torrenttrader.yml b/definitions/v11/torrenttrader.yml similarity index 100% rename from definitions/v10/torrenttrader.yml rename to definitions/v11/torrenttrader.yml diff --git a/definitions/v10/totheglory.yml b/definitions/v11/totheglory.yml similarity index 100% rename from definitions/v10/totheglory.yml rename to definitions/v11/totheglory.yml diff --git a/definitions/v10/totheglory2fa.yml b/definitions/v11/totheglory2fa.yml similarity index 100% rename from definitions/v10/totheglory2fa.yml rename to definitions/v11/totheglory2fa.yml diff --git a/definitions/v10/trackermk.yml b/definitions/v11/trackermk.yml similarity index 100% rename from definitions/v10/trackermk.yml rename to definitions/v11/trackermk.yml diff --git a/definitions/v10/traht.yml b/definitions/v11/traht.yml similarity index 100% rename from definitions/v10/traht.yml rename to definitions/v11/traht.yml diff --git a/definitions/v10/trancetraffic.yml b/definitions/v11/trancetraffic.yml similarity index 100% rename from definitions/v10/trancetraffic.yml rename to definitions/v11/trancetraffic.yml diff --git a/definitions/v10/trellas.yml b/definitions/v11/trellas.yml similarity index 100% rename from definitions/v10/trellas.yml rename to definitions/v11/trellas.yml diff --git a/definitions/v10/trezzor.yml b/definitions/v11/trezzor.yml similarity index 100% rename from definitions/v10/trezzor.yml rename to definitions/v11/trezzor.yml diff --git a/definitions/v10/trezzorcookie.yml b/definitions/v11/trezzorcookie.yml similarity index 100% rename from definitions/v10/trezzorcookie.yml rename to definitions/v11/trezzorcookie.yml diff --git a/definitions/v10/tribalmixes.yml b/definitions/v11/tribalmixes.yml similarity index 100% rename from definitions/v10/tribalmixes.yml rename to definitions/v11/tribalmixes.yml diff --git a/definitions/v10/turkseed-api.yml b/definitions/v11/turkseed-api.yml similarity index 100% rename from definitions/v10/turkseed-api.yml rename to definitions/v11/turkseed-api.yml diff --git a/definitions/v10/turktorrent.yml b/definitions/v11/turktorrent.yml similarity index 100% rename from definitions/v10/turktorrent.yml rename to definitions/v11/turktorrent.yml diff --git a/definitions/v10/tvchaosuk.yml b/definitions/v11/tvchaosuk.yml similarity index 100% rename from definitions/v10/tvchaosuk.yml rename to definitions/v11/tvchaosuk.yml diff --git a/definitions/v10/u2.yml b/definitions/v11/u2.yml similarity index 100% rename from definitions/v10/u2.yml rename to definitions/v11/u2.yml diff --git a/definitions/v10/u3c3.yml b/definitions/v11/u3c3.yml similarity index 100% rename from definitions/v10/u3c3.yml rename to definitions/v11/u3c3.yml diff --git a/definitions/v10/ubits.yml b/definitions/v11/ubits.yml similarity index 100% rename from definitions/v10/ubits.yml rename to definitions/v11/ubits.yml diff --git a/definitions/v10/uhdbits.yml b/definitions/v11/uhdbits.yml similarity index 100% rename from definitions/v10/uhdbits.yml rename to definitions/v11/uhdbits.yml diff --git a/definitions/v10/uindex.yml b/definitions/v11/uindex.yml similarity index 100% rename from definitions/v10/uindex.yml rename to definitions/v11/uindex.yml diff --git a/definitions/v10/ultrahd.yml b/definitions/v11/ultrahd.yml similarity index 100% rename from definitions/v10/ultrahd.yml rename to definitions/v11/ultrahd.yml diff --git a/definitions/v10/unionfansub.yml b/definitions/v11/unionfansub.yml similarity index 100% rename from definitions/v10/unionfansub.yml rename to definitions/v11/unionfansub.yml diff --git a/definitions/v10/unlimitz.yml b/definitions/v11/unlimitz.yml similarity index 100% rename from definitions/v10/unlimitz.yml rename to definitions/v11/unlimitz.yml diff --git a/definitions/v10/uploadcx.yml b/definitions/v11/uploadcx.yml similarity index 100% rename from definitions/v10/uploadcx.yml rename to definitions/v11/uploadcx.yml diff --git a/definitions/v10/utopia.yml b/definitions/v11/utopia.yml similarity index 100% rename from definitions/v10/utopia.yml rename to definitions/v11/utopia.yml diff --git a/definitions/v10/uztracker.yml b/definitions/v11/uztracker.yml similarity index 100% rename from definitions/v10/uztracker.yml rename to definitions/v11/uztracker.yml diff --git a/definitions/v10/vault-network.yml b/definitions/v11/vault-network.yml similarity index 100% rename from definitions/v10/vault-network.yml rename to definitions/v11/vault-network.yml diff --git a/definitions/v10/videoteka.yml b/definitions/v11/videoteka.yml similarity index 100% rename from definitions/v10/videoteka.yml rename to definitions/v11/videoteka.yml diff --git a/definitions/v10/vsthouse.yml b/definitions/v11/vsthouse.yml similarity index 100% rename from definitions/v10/vsthouse.yml rename to definitions/v11/vsthouse.yml diff --git a/definitions/v10/vstorrent.yml b/definitions/v11/vstorrent.yml similarity index 100% rename from definitions/v10/vstorrent.yml rename to definitions/v11/vstorrent.yml diff --git a/definitions/v10/vsttorrents.yml b/definitions/v11/vsttorrents.yml similarity index 100% rename from definitions/v10/vsttorrents.yml rename to definitions/v11/vsttorrents.yml diff --git a/definitions/v10/wdt.yml b/definitions/v11/wdt.yml similarity index 100% rename from definitions/v10/wdt.yml rename to definitions/v11/wdt.yml diff --git a/definitions/v10/whiteangel.yml b/definitions/v11/whiteangel.yml similarity index 100% rename from definitions/v10/whiteangel.yml rename to definitions/v11/whiteangel.yml diff --git a/definitions/v10/wihd.yml b/definitions/v11/wihd.yml similarity index 100% rename from definitions/v10/wihd.yml rename to definitions/v11/wihd.yml diff --git a/definitions/v10/wintersakura.yml b/definitions/v11/wintersakura.yml similarity index 100% rename from definitions/v10/wintersakura.yml rename to definitions/v11/wintersakura.yml diff --git a/definitions/v10/world-of-tomorrow.yml b/definitions/v11/world-of-tomorrow.yml similarity index 100% rename from definitions/v10/world-of-tomorrow.yml rename to definitions/v11/world-of-tomorrow.yml diff --git a/definitions/v10/x-ite.me.yml b/definitions/v11/x-ite.me.yml similarity index 100% rename from definitions/v10/x-ite.me.yml rename to definitions/v11/x-ite.me.yml diff --git a/definitions/v10/xthor-api.yml b/definitions/v11/xthor-api.yml similarity index 100% rename from definitions/v10/xthor-api.yml rename to definitions/v11/xthor-api.yml diff --git a/definitions/v10/xthor-scraping.yml b/definitions/v11/xthor-scraping.yml similarity index 100% rename from definitions/v10/xthor-scraping.yml rename to definitions/v11/xthor-scraping.yml diff --git a/definitions/v10/xtorrenty.yml b/definitions/v11/xtorrenty.yml similarity index 100% rename from definitions/v10/xtorrenty.yml rename to definitions/v11/xtorrenty.yml diff --git a/definitions/v10/xtremebytes.yml b/definitions/v11/xtremebytes.yml similarity index 100% rename from definitions/v10/xtremebytes.yml rename to definitions/v11/xtremebytes.yml diff --git a/definitions/v10/xwtclassics.yml b/definitions/v11/xwtclassics.yml similarity index 100% rename from definitions/v10/xwtclassics.yml rename to definitions/v11/xwtclassics.yml diff --git a/definitions/v10/xxxclub.yml b/definitions/v11/xxxclub.yml similarity index 100% rename from definitions/v10/xxxclub.yml rename to definitions/v11/xxxclub.yml diff --git a/definitions/v10/xxxtor.yml b/definitions/v11/xxxtor.yml similarity index 100% rename from definitions/v10/xxxtor.yml rename to definitions/v11/xxxtor.yml diff --git a/definitions/v10/yggcookie.yml b/definitions/v11/yggcookie.yml similarity index 100% rename from definitions/v10/yggcookie.yml rename to definitions/v11/yggcookie.yml diff --git a/definitions/v10/yggtorrent.yml b/definitions/v11/yggtorrent.yml similarity index 100% rename from definitions/v10/yggtorrent.yml rename to definitions/v11/yggtorrent.yml diff --git a/definitions/v10/yoinked.yml b/definitions/v11/yoinked.yml similarity index 100% rename from definitions/v10/yoinked.yml rename to definitions/v11/yoinked.yml diff --git a/definitions/v10/yourbittorrent.yml b/definitions/v11/yourbittorrent.yml similarity index 100% rename from definitions/v10/yourbittorrent.yml rename to definitions/v11/yourbittorrent.yml diff --git a/definitions/v10/yts.yml b/definitions/v11/yts.yml similarity index 100% rename from definitions/v10/yts.yml rename to definitions/v11/yts.yml diff --git a/definitions/v10/yuscene-api.yml b/definitions/v11/yuscene-api.yml similarity index 100% rename from definitions/v10/yuscene-api.yml rename to definitions/v11/yuscene-api.yml diff --git a/definitions/v10/zamundanet.yml b/definitions/v11/zamundanet.yml similarity index 100% rename from definitions/v10/zamundanet.yml rename to definitions/v11/zamundanet.yml diff --git a/definitions/v10/zappateers.yml b/definitions/v11/zappateers.yml similarity index 100% rename from definitions/v10/zappateers.yml rename to definitions/v11/zappateers.yml diff --git a/definitions/v10/zelkaorg.yml b/definitions/v11/zelkaorg.yml similarity index 100% rename from definitions/v10/zelkaorg.yml rename to definitions/v11/zelkaorg.yml diff --git a/definitions/v10/zktorrent.yml b/definitions/v11/zktorrent.yml similarity index 100% rename from definitions/v10/zktorrent.yml rename to definitions/v11/zktorrent.yml diff --git a/definitions/v10/zmpt.yml b/definitions/v11/zmpt.yml similarity index 100% rename from definitions/v10/zmpt.yml rename to definitions/v11/zmpt.yml diff --git a/definitions/v10/zomb.yml b/definitions/v11/zomb.yml similarity index 100% rename from definitions/v10/zomb.yml rename to definitions/v11/zomb.yml diff --git a/definitions/v10/ztracker.yml b/definitions/v11/ztracker.yml similarity index 100% rename from definitions/v10/ztracker.yml rename to definitions/v11/ztracker.yml diff --git a/merge-indexer-sync.sh b/merge-indexer-sync.sh new file mode 100755 index 000000000..07c3737bb --- /dev/null +++ b/merge-indexer-sync.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -e + +echo "🔄 Fetching latest changes..." +git fetch origin automated-indexer-sync +git fetch origin master + +echo "🔄 Checking out master..." +git checkout master + +echo "🔄 Checking if rebase needed..." +if git merge-base --is-ancestor origin/automated-indexer-sync HEAD; then + echo "No new changes to merge" + exit 0 +fi + +echo "🔄 Rebasing automated-indexer-sync into master..." +if ! git rebase origin/automated-indexer-sync; then + echo "❌ Rebase failed - conflicts need manual resolution" + git rebase --abort + exit 1 +fi + +echo "🔄 Pushing to master..." +git push origin master + +echo "✅ Done" \ No newline at end of file