diff --git a/definitions/v11/52bt.yml b/definitions/v11/52bt.yml index 5930b779e..955e035bb 100644 --- a/definitions/v11/52bt.yml +++ b/definitions/v11/52bt.yml @@ -8,12 +8,10 @@ encoding: UTF-8 requestDelay: 2 links: # Send any content to 52btbtbt@gmail.com to get the latest address. or visit https://www.52btbt.icu/ - - https://ucex8fed.529075.xyz/ - - https://pbzu8f1s.529076.xyz/ + - https://y1yb6427.529075.xyz/ + - https://g8ixbu6t.529076.xyz/ legacylinks: - https://www.52btbt.icu/ # latest address page - - https://l3qi32fp.529075.xyz/ - - https://290e01vd.529076.xyz/ - https://ody4n381.529075.xyz/ - https://1xpswim9.529076.xyz/ - https://eufo9g1k.529075.xyz/ @@ -28,6 +26,8 @@ legacylinks: - https://61uhzm1t.529076.xyz/ - https://snndp8mm.529075.xyz/ - https://hbak3ww9.529076.xyz/ + - https://ucex8fed.529075.xyz/ + - https://pbzu8f1s.529076.xyz/ caps: categorymappings: diff --git a/definitions/v11/bitmagnet.yml b/definitions/v11/bitmagnet.yml index 79dfb77cd..f76a7942e 100644 --- a/definitions/v11/bitmagnet.yml +++ b/definitions/v11/bitmagnet.yml @@ -72,9 +72,15 @@ search: size: selector: size seeders: - text: 1 + selector: "[name=seeders]" + attribute: value + optional: true + default: 1 leechers: - text: 1 + selector: "[name=leechers]" + attribute: value + optional: true + default: 1 downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/definitions/v11/ebooks-shares.yml b/definitions/v11/ebooks-shares.yml deleted file mode 100644 index 158084434..000000000 --- a/definitions/v11/ebooks-shares.yml +++ /dev/null @@ -1,244 +0,0 @@ ---- -id: ebooks-shares -name: Ebooks-Shares -description: "Ebooks-Shares is a Private Torrent Tracker for EBOOKS / AUDIOBOOKS" -language: en-US -type: private -encoding: UTF-8 -testlinktorrent: false -links: - - https://ebooks-shares.org/ - -caps: - categorymappings: - # Audio - - {id: 293, cat: Audio/Audiobook, desc: "Audio: Fiction"} - - {id: 294, cat: Audio/Audiobook, desc: "Audio:Sci-Fi/Fantasy"} - - {id: 295, cat: Audio/Audiobook, desc: "Audio:Crime/Thriller"} - - {id: 296, cat: Audio/Audiobook, desc: "Audio:Horror"} - - {id: 297, cat: Audio/Audiobook, desc: "Audio:General"} - - {id: 302, cat: Audio/Audiobook, desc: "Audio: (TTC,TMS,TGC)"} - - {id: 303, cat: Audio/Audiobook, desc: "Audio:Autobiography "} - - {id: 308, cat: Audio/Audiobook, desc: "Audio:Collections"} - - {id: 309, cat: Audio/Audiobook, desc: "Audio:History"} - - {id: 310, cat: Audio/Audiobook, desc: "Audio:Children/YA"} - - {id: 311, cat: Audio/Audiobook, desc: "Audio:Romance"} - - {id: 317, cat: Audio/Audiobook, desc: "Audio:Urbn Fant/para"} - - {id: 319, cat: Audio/Audiobook, desc: "Audio:V.I.P"} - - {id: 320, cat: Audio/Audiobook, desc: "Audio:Science/engine"} - - {id: 321, cat: Audio/Audiobook, desc: "Audio:History/War"} - - {id: 322, cat: Audio/Audiobook, desc: "Audio:non fiction"} - - {id: 323, cat: Audio/Audiobook, desc: "Audio:Educational"} - - {id: 324, cat: Audio/Audiobook, desc: "Audio:Tutorials"} - - {id: 325, cat: Audio/Audiobook, desc: "Audio:True Crime"} - - {id: 326, cat: Audio/Audiobook, desc: "Audio:Tech/Computers"} - # Collections - - {id: 305, cat: Books/EBook, desc: "Same Author"} - - {id: 345, cat: Books/Mags, desc: "Collection: Magazines"} - - {id: 307, cat: Books/EBook, desc: "Collection: Military"} - - {id: 342, cat: Books/EBook, desc: "Collection: Multiple Authors"} - - {id: 343, cat: Books/EBook, desc: "Collection: Fantasy"} - - {id: 359, cat: Books/EBook, desc: "Collection: Same Series"} - - {id: 364, cat: Books/EBook, desc: "Collection: Multiple: Fiction"} - - {id: 365, cat: Books/EBook, desc: "Collection: Multiple:Non Fiction"} - # Fiction - - {id: 281, cat: Books/EBook, desc: "Horror"} - - {id: 282, cat: Books/EBook, desc: "Sci-Fi/Fantasy"} - - {id: 275, cat: Books/EBook, desc: "General Fiction"} - - {id: 280, cat: Books/EBook, desc: "Crime/Thriller/Myste"} - - {id: 312, cat: Books/EBook, desc: "Romance"} - - {id: 313, cat: Books/EBook, desc: "Comedy/Humour"} - - {id: 314, cat: Books/EBook, desc: "Historical Fiction"} - - {id: 315, cat: Books/EBook, desc: "Cozy/Mystery "} - - {id: 318, cat: Books/EBook, desc: "Urbn Fantasy/Para"} - - {id: 340, cat: Books/EBook, desc: "Lit/RPG"} - - {id: 341, cat: Books/EBook, desc: "Collections"} - - {id: 352, cat: Books/EBook, desc: "Westerns"} - - {id: 370, cat: Books/EBook, desc: "Dystopian"} - # Children & Y/A - - {id: 299, cat: Books/EBook, desc: "Young Adult"} - - {id: 298, cat: Books/EBook, desc: "Children's"} - # Education/Textbooks - - {id: 278, cat: Books/EBook, desc: "Tutorials"} - - {id: 300, cat: Books/EBook, desc: "Textbooks"} - - {id: 301, cat: Books/EBook, desc: "Educational"} - - {id: 328, cat: Books/EBook, desc: "Engineering/Mech"} - - {id: 339, cat: Books/EBook, desc: "Science/Physics"} - - {id: 346, cat: Books/EBook, desc: "Chemistry"} - - {id: 347, cat: Books/EBook, desc: "Medical"} - - {id: 348, cat: Books/EBook, desc: "Mathematics"} - - {id: 363, cat: Books/EBook, desc: "Sheet Music"} - - {id: 366, cat: Books/EBook, desc: "Astronomy"} - # Tech/Computers - - {id: 331, cat: Books/EBook, desc: "Electronics"} - - {id: 336, cat: Books/EBook, desc: "Video Games"} - - {id: 337, cat: Books/EBook, desc: "Computers"} - - {id: 350, cat: Books/EBook, desc: "Programming"} - - {id: 354, cat: Books/EBook, desc: "Apps"} - # Hobbies/pastimes - - {id: 271, cat: Books/EBook, desc: "Food And Drink"} - - {id: 272, cat: Books/EBook, desc: "General Hobbies"} - - {id: 327, cat: Books/EBook, desc: "Gardening"} - - {id: 329, cat: Books/EBook, desc: "Motorcars/Repairs"} - - {id: 330, cat: Books/EBook, desc: "D.I.Y"} - - {id: 332, cat: Books/EBook, desc: "Trivia/Quiz"} - - {id: 367, cat: Books/EBook, desc: "Health & Fitness"} - - {id: 369, cat: Books/EBook, desc: "Woodworking"} - # Non Fict/Ref - - {id: 285, cat: Books/EBook, desc: "General Non-fiction"} - - {id: 289, cat: Books/EBook, desc: "Autobiography/Memoir"} - - {id: 274, cat: Books/EBook, desc: "Business"} - - {id: 316, cat: Books/EBook, desc: "True Crime"} - - {id: 335, cat: Books/EBook, desc: "Entertainment"} - - {id: 338, cat: Books/EBook, desc: "Encyclopedia/Ref"} - - {id: 349, cat: Books/EBook, desc: "Self Help"} - - {id: 351, cat: Books/EBook, desc: "Religion"} - - {id: 358, cat: Books/EBook, desc: "History"} - - {id: 362, cat: Books/EBook, desc: "Politics"} - # Military - - {id: 287, cat: Books/EBook, desc: "WW1"} - - {id: 288, cat: Books/EBook, desc: "WW2"} - - {id: 12, cat: Books/EBook, desc: "Army,Navy,Airforce"} - - {id: 286, cat: Books/EBook, desc: "General Military "} - # Zoology - - {id: 334, cat: Books/EBook, desc: "Veterinary/Pets"} - - {id: 361, cat: Books/EBook, desc: "Nature And Wildlife"} - # Art & Crafts - - {id: 344, cat: Books/EBook, desc: "Model Making"} - - {id: 357, cat: Books/EBook, desc: "Art"} - # Comics - - {id: 290, cat: Books/Comics, desc: "General Comics"} - - {id: 291, cat: Books/Comics, desc: "Marvel"} - - {id: 292, cat: Books/Comics, desc: "D/C"} - # Magazines - - {id: 306, cat: Books/Mags, desc: "Music"} - - {id: 10, cat: Books/Mags, desc: "Language Learn"} - - {id: 13, cat: Books/Mags, desc: "Non English Bks"} - - {id: 16, cat: Books/Mags, desc: "VIP"} - - modes: - search: [q] - book-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: vip - type: checkbox - label: Include VIP results - default: true - - name: sort - type: select - label: Sort requested from site - default: 3 - options: - 3: created - 5: seeders - 4: size - 2: title - - name: type - type: select - label: Order requested from site - default: 2 - options: - 2: desc - 1: asc - - name: info - type: info - label: Results Per Page - default: For best results, change the Torrents per page: setting to 100 on your account profile. - - name: info_activity - type: info - label: Account Inactivity - default: "All members are required to log into their account at least every 89 days or you will be deleted without warning." - -login: - path: index.php?page=login - method: post - inputs: - uid: "{{ .Config.username }}" - pwd: "{{ .Config.password }}" - error: - - selector: tr td span[style="color:#FF0000;"] - test: - path: index.php - selector: a[href^="logout.php"] - -download: - selectors: - - selector: a[href^="download.php?id="] - attribute: href - -search: - paths: - # https://ebooks-shares.org/index.php?page=torrents&search=&category=0&active=0 - - path: index.php - inputs: - page: torrents - search: "{{ .Keywords }}" - # does not support multi category selection so defaulting to all - category: 0 - # 0 all, 1 active only, 2 dead only - active: 0 - order: "{{ .Config.sort }}" - by: "{{ .Config.type }}" - - rows: - selector: "table.lista:not(table[cellspacing]) > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]){{ if .Config.vip }}{{ else }}:not(:has(a[href$=\"&category=16\"])):not(:has(a[href$=\"&category=319\"])){{ end }}" - - fields: - category: - selector: a[href^="index.php?page=torrents&category="] - attribute: href - filters: - - name: querystring - args: category - _is_vip: - selector: a[href$="&category=16"], a[href$="&category=319"] - attribute: href - optional: true - title: - selector: a[href^="index.php?page=torrent-details&id="] - filters: - - name: append - args: "{{ if .Result._is_vip }} VIP{{ else }}{{ end }}" - details: - selector: a[href^="index.php?page=torrent-details&id="] - attribute: href - download: - selector: a[href^="index.php?page=downloadcheck"] - attribute: href - poster: - selector: a[href^="index.php?page=torrent-details&id="] - attribute: onmouseover - filters: - - name: regexp - args: "src=(.*?) " - - name: replace - args: ["torrentimg/nocover.jpg", ""] - size: - selector: td:nth-last-child(4) - date: - selector: td:nth-last-child(8) - # auto adjusted by site account profile - filters: - - name: dateparse - args: dd/MM/yyyy - seeders: - selector: td:nth-last-child(7) - leechers: - selector: td:nth-last-child(6) - grabs: - selector: td:nth-last-child(5) - downloadvolumefactor: - text: 1 - uploadvolumefactor: - text: 1 - minimumseedtime: - # 1 day (as seconds = 1 x 24 x 60 x 60) - text: 86400 -# xbtitFM v4.2.12 diff --git a/definitions/v11/magnetcat.yml b/definitions/v11/magnetcat.yml index 89363dea3..ff0698fe6 100644 --- a/definitions/v11/magnetcat.yml +++ b/definitions/v11/magnetcat.yml @@ -10,15 +10,11 @@ requestDelay: 2 links: - https://magnetcatcat.com/ - https://clmclm.com/ - - https://i0p7ajrd.8800591.xyz/ - - https://2enklqcy.8800592.xyz/ - - https://3jgu9ajx.8800593.xyz/ - - https://njsecbfc.8800594.xyz/ + - https://nr0puif7.8800591.xyz/ + - https://18heyard.8800592.xyz/ + - https://x3gx1am6.8800593.xyz/ + - https://ra8vi7br.8800594.xyz/ legacylinks: - - https://b8fqdtud.8800591.xyz/ - - https://qvcqsr7u.8800592.xyz/ - - https://r8n2a4mz.8800593.xyz/ - - https://zg40q60t.8800594.xyz/ - https://c1bgdeey.8800591.xyz/ - https://ck4zxpy8.8800592.xyz/ - https://q39qxf3t.8800593.xyz/ @@ -31,6 +27,10 @@ legacylinks: - https://y5g4bdhc.8800592.xyz/ - https://yaetzfec.8800593.xyz/ - https://jox7oala.8800594.xyz/ + - https://i0p7ajrd.8800591.xyz/ + - https://2enklqcy.8800592.xyz/ + - https://3jgu9ajx.8800593.xyz/ + - https://njsecbfc.8800594.xyz/ caps: categorymappings: diff --git a/definitions/v11/new-team.yml b/definitions/v11/new-team.yml index 37a7c357a..fec3eef6d 100644 --- a/definitions/v11/new-team.yml +++ b/definitions/v11/new-team.yml @@ -11,18 +11,44 @@ links: caps: categorymappings: # Кинематограф, театр, видео + - {id: 124, cat: Movies, desc: "|- Кинофильмы"} + - {id: 1104, cat: Movies, desc: "|-- Фильмы довоенные и созданные во время войны"} + - {id: 900, cat: Movies, desc: "|-- Советское кино"} + - {id: 1143, cat: Movies, desc: "|-- Детское советское кино"} + - {id: 1181, cat: Movies, desc: "|-- Советское кино (HD и DVD Video)"} + - {id: 162, cat: Movies, desc: "|-- Российское кино"} + - {id: 1144, cat: Movies, desc: "|-- Детское российское кино"} + - {id: 164, cat: Movies, desc: "|-- Российское кино (HD и DVD Video)"} + - {id: 1177, cat: Movies, desc: "|-- Телеспектакль"} + - {id: 192, cat: Movies/Foreign, desc: "|-- Зарубежное кино до 2000 года"} + - {id: 125, cat: Movies/Foreign, desc: "|-- Зарубежное кино 2000 - 2020 года"} + - {id: 1142, cat: Movies/Foreign, desc: "|-- Зарубежное кино 2020 - 2026 года"} + - {id: 126, cat: Movies/Foreign, desc: "|-- Зарубежное кино (HD и DVD Video)"} + - {id: 338, cat: Movies/Foreign, desc: "|-- Классика зарубежного кино"} + - {id: 337, cat: Movies/Foreign, desc: "|-- Азиатские фильмы"} + - {id: 917, cat: Movies, desc: "|-- Арт-хаус и авторское кино"} + - {id: 207, cat: Movies, desc: "|-- Сборники"} + - {id: 826, cat: Audio/Other, desc: "|-- Звуковые дорожки и переводы"} + - {id: 891, cat: Movies/3D, desc: "|-- Кинофильмы 3D"} + - {id: 254, cat: TV/Documentary, desc: "|-- Великая Отечественная война"} + - {id: 252, cat: TV/Documentary, desc: "|-- Тайны века / Спецслужбы / Теории Заговоров"} + - {id: 889, cat: TV/Documentary, desc: "|-- Документальные фильмы и телепередачи (3D)"} + - {id: 135, cat: TV/Documentary, desc: "|-- Документальные фильмы и телепередачи (DVD, HD Video)"} + - {id: 255, cat: TV/Documentary, desc: "|-- Развлекательные телепередачи и шоу, приколы и юмор"} + - {id: 253, cat: TV/Documentary, desc: "|-- Планета Земля / Космос / Вселенная"} + - {id: 999, cat: TV/Documentary, desc: "|-- Флора и фауна"} + - {id: 478, cat: TV/Documentary, desc: "|-- Научно-популярные фильмы"} + - {id: 1058, cat: TV/Documentary, desc: "|-- История: Города и Страны / Архитектура / Музеи мира"} + - {id: 136, cat: TV/Documentary, desc: "|-- История: Биографии / Кумиры / Личности / События"} + - {id: 256, cat: TV/Documentary, desc: "|-- Вера и религия / Диагностика кармы"} - {id: 241, cat: Movies, desc: "|- Релизы от Scarabey"} - - {id: 1170, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2019 - 2023"} - - {id: 1137, cat: Movies, desc: "|-- ТРЕБУЕТСЯ СИД."} - - {id: 1116, cat: Movies, desc: "|-- Группа 'Сиды' - хранение раздач"} - - {id: 1040, cat: Movies, desc: "|-- Зарубежные и российские фильмы до 1990 года"} - - {id: 1041, cat: Movies, desc: "|-- Зарубежные и российские фильмы 1991-2000"} - - {id: 1042, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2001-2009"} - - {id: 1039, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2010-2013"} - - {id: 1088, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2014-2015"} - - {id: 1112, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2016-2018"} - - {id: 1110, cat: Movies, desc: "|-- Зарубежные и российские фильмы в MKV (AVC / BDRip 720p /..."} - {id: 1111, cat: Movies/Other, desc: "|-- Аниме"} + - {id: 1112, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2016-2018"} + - {id: 1088, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2014-2015"} + - {id: 1039, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2010-2013"} + - {id: 1042, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2001-2009"} + - {id: 1041, cat: Movies, desc: "|-- Зарубежные и российские фильмы 1991-2000"} + - {id: 1040, cat: Movies, desc: "|-- Зарубежные и российские фильмы до 1990 года"} - {id: 1051, cat: Movies/Foreign, desc: "|-- Азиатские фильмы"} - {id: 1035, cat: TV, desc: "|-- Сериалы"} - {id: 1096, cat: TV, desc: "|--- Сериал '24 часа'"} @@ -33,43 +59,9 @@ caps: - {id: 1090, cat: TV, desc: "|--- Сериал 'Спартак'"} - {id: 1093, cat: TV, desc: "|--- Сериал 'Ходячие мертвецы'"} - {id: 1095, cat: TV, desc: "|--- Сериал 'Шерлок'"} - - {id: 124, cat: Movies, desc: "|- Кинофильмы"} - - {id: 191, cat: Movies/Foreign, desc: "|-- Зарубежное кино до 1990 года"} - - {id: 192, cat: Movies/Foreign, desc: "|-- Зарубежное кино 1990 - 1999"} - - {id: 160, cat: Movies/Foreign, desc: "|-- Зарубежное кино 2000 - 2009"} - - {id: 125, cat: Movies/Foreign, desc: "|-- Зарубежное кино 2010 - 2019"} - - {id: 1142, cat: Movies/Foreign, desc: "|-- Зарубежное кино 2020 - 2024"} - - {id: 1182, cat: Movies/Foreign, desc: "|-- Зарубежное кино 2025 (Новинки)"} - - {id: 126, cat: Movies/Foreign, desc: "|-- Зарубежное кино (HD и DVD Video)"} - - {id: 162, cat: Movies, desc: "|-- Российское кино"} - - {id: 164, cat: Movies, desc: "|--- Российское кино (HD и DVD Video)"} - - {id: 1144, cat: Movies, desc: "|--- Детское российское кино"} - - {id: 900, cat: Movies, desc: "|-- Советское кино"} - - {id: 1181, cat: Movies, desc: "|--- Советское кино (HD и DVD Video)"} - - {id: 1143, cat: Movies, desc: "|--- Детское советское кино"} - - {id: 1104, cat: Movies, desc: "|--- Фильмы довоенные и созданные во время войны"} - - {id: 1177, cat: Movies, desc: "|--- Телеспектакль"} - - {id: 891, cat: Movies/3D, desc: "|-- Кинофильмы 3D"} - - {id: 338, cat: Movies/Foreign, desc: "|-- Классика зарубежного кино"} - - {id: 337, cat: Movies/Foreign, desc: "|-- Азиатские фильмы"} - - {id: 917, cat: Movies, desc: "|-- Арт-хаус и авторское кино"} - - {id: 207, cat: Movies, desc: "|-- Сборники"} + - {id: 1110, cat: Movies, desc: "|-- Зарубежные и российские фильмы в MKV (AVC / BDRip 720p /..."} + - {id: 1170, cat: Movies, desc: "|-- Зарубежные и российские фильмы 2019 - 2023"} - {id: 203, cat: Movies/Other, desc: "|-- Трейлеры и дополнительные материалы"} - - {id: 826, cat: Audio/Other, desc: "|-- Звуковые дорожки и переводы"} - - {id: 827, cat: Audio/Other, desc: "|--- Авторский перевод"} - - {id: 828, cat: Audio/Other, desc: "|--- Закадровый перевод"} - - {id: 134, cat: TV/Documentary, desc: "|- Документальные фильмы и телепередачи"} - - {id: 999, cat: TV/Documentary, desc: "|-- Флора и фауна"} - - {id: 254, cat: TV/Documentary, desc: "|-- Великая Отечественная война"} - - {id: 478, cat: TV/Documentary, desc: "|-- Научно-популярные фильмы"} - - {id: 1058, cat: TV/Documentary, desc: "|-- История: Города и Страны / Архитектура / Музеи мира"} - - {id: 136, cat: TV/Documentary, desc: "|-- История: Биографии / Кумиры / Личности / События"} - - {id: 253, cat: TV/Documentary, desc: "|-- Планета Земля / Космос / Вселенная"} - - {id: 256, cat: TV/Documentary, desc: "|-- Вера и религия / Диагностика кармы"} - - {id: 252, cat: TV/Documentary, desc: "|-- Тайны века / Спецслужбы / Теории Заговоров"} - - {id: 255, cat: TV/Documentary, desc: "|-- Развлекательные телепередачи и шоу, приколы и юмор"} - - {id: 135, cat: TV/Documentary, desc: "|-- Документальные фильмы и телепередачи (DVD, HD Video)"} - - {id: 889, cat: TV/Documentary, desc: "|-- Документальные фильмы и телепередачи (3D)"} # Сериалы - {id: 845, cat: TV, desc: "|- Отечественные cериалы"} - {id: 850, cat: TV, desc: "|-- Обсуждение сериалов"} @@ -184,8 +176,9 @@ caps: - {id: 795, cat: Audio, desc: "|- Сборники песен для детей (lossy и lossless)"} - {id: 798, cat: Audio, desc: "|- Мюзикл (lossy и lossless)"} - {id: 800, cat: Audio/MP3, desc: "|- Неофициальные и внежанровые сборники (lossy)"} - - {id: 186, cat: Audio/Video, desc: "|- Музыкальное видео (DVD и HD Video)"} - - {id: 185, cat: Audio/Video, desc: "|- Музыкальное видео"} + - {id: 1191, cat: Audio/Video, desc: "|- Некондиционное музыкальное видео (Видео, DVD видео,..."} + - {id: 186, cat: Audio/Video, desc: "|- Музыкальное DVD видео"} + - {id: 185, cat: Audio/Video, desc: "|- Музыкальное SD видео"} - {id: 1160, cat: Audio/Foreign, desc: "|- Зарубежная поп-музыка"} - {id: 1159, cat: Audio, desc: "|- Советская эстрада, ретро, романсы"} - {id: 1158, cat: Audio, desc: "|- Отечественная поп-музыка"} @@ -240,6 +233,7 @@ caps: - {id: 811, cat: Audio/MP3, desc: "|- Modern Classical, Electroacoustic (lossy)"} - {id: 812, cat: Audio/Lossless, desc: "|- Traditional Electronic, Ambient (lossless)"} - {id: 813, cat: Audio/MP3, desc: "|- Traditional Electronic, Ambient (lossy)"} + - {id: 1192, cat: Audio/MP3, desc: "|- Synthwave, Spacesynth, Dreamwave, Retrowave, Outrun..."} - {id: 815, cat: Audio/Lossless, desc: "|- EBM, Dark Electro, Aggrotech (lossless)"} - {id: 816, cat: Audio/MP3, desc: "|- EBM, Dark Electro, Aggrotech (lossy)"} - {id: 817, cat: Audio/Lossless, desc: "|- Industrial, Noise (lossless)"} @@ -334,14 +328,12 @@ caps: - {id: 688, cat: Audio/Lossless, desc: "|- Отечественный блюз (lossless)"} - {id: 689, cat: Audio/MP3, desc: "|- Отечественный блюз (lossy)"} # Программное обеспечение - - {id: 68, cat: PC, desc: "|- Программы под Windows"} - {id: 91, cat: PC, desc: "|-- Системы для бизнеса"} - {id: 95, cat: PC, desc: "|-- Программы для работы со звуком"} - {id: 94, cat: PC, desc: "|-- Редакторы видео"} - {id: 87, cat: PC, desc: "|-- 3D моделирование, рендеринг и плагины для них"} - {id: 98, cat: PC, desc: "|-- Системы навигации и карты"} # Книги и журналы - - {id: 340, cat: Books, desc: "|- Предложения по улучшению раздела 'Книги и журналы..."} - {id: 341, cat: Books, desc: "|- Художественная литература"} - {id: 351, cat: Books, desc: "|-- Русская литература (Классика)"} - {id: 405, cat: Books, desc: "|-- Русская литература (Современная проза)"} @@ -355,7 +347,6 @@ caps: - {id: 358, cat: Books/Foreign, desc: "|-- Художественная литература на иностранных языках"} - {id: 365, cat: Books, desc: "|- Учебная литература для детского сада и начальной шко..."} - {id: 359, cat: Books, desc: "|- Художественная литературара для средних и старших классов"} - - {id: 343, cat: Books, desc: "|- Гуманитарные науки, история, философия"} - {id: 378, cat: Books, desc: "|-- Исторические науки. Издания 1992-по н.в."} - {id: 377, cat: Books, desc: "|-- История России"} - {id: 376, cat: Books, desc: "|-- Эпоха СССР"} @@ -364,7 +355,6 @@ caps: - {id: 368, cat: Books, desc: "|-- Психотерапия, психодиагностика, консультирование и психокоррекция"} - {id: 367, cat: Books, desc: "|-- Эзотерика, саморазвитие и самосовершенствование"} - {id: 382, cat: Books, desc: "|- Электроника / радио"} - - {id: 345, cat: Books, desc: "|- Компьютерная литература"} - {id: 394, cat: Books, desc: "|-- Веб-дизайн и программирование"} - {id: 393, cat: Books, desc: "|-- Программирование"} - {id: 898, cat: Books, desc: "|-- СУБД"} @@ -372,8 +362,6 @@ caps: - {id: 391, cat: Books, desc: "|-- Сети / VoIP"} - {id: 389, cat: Books, desc: "|-- Компьютерные журналы и приложения к ним"} - {id: 396, cat: Books/Other, desc: "|- Прочее"} - - {id: 349, cat: Books/Mags, desc: "|- Журналы и газеты (общий раздел)"} - - {id: 350, cat: Books/Other, desc: "|- Разное"} - {id: 342, cat: Books, desc: "|-- Учебная литература - для детей, родителей и учителей"} - {id: 370, cat: Books, desc: "|-- Экономика, бизнес, менеджмент, маркетинг"} - {id: 398, cat: Books, desc: "|-- Прочие хобби"} @@ -384,6 +372,7 @@ caps: - {id: 242, cat: Other, desc: "|- Другое"} # Скрытые разделы - {id: 1184, cat: Other, desc: "|- Для оформления релизов AVP Studio"} + - {id: 1116, cat: Other, desc: "|- Группа 'Сиды' - хранение раздач"} # undocumented - {id: 556, cat: Audio, desc: "Архив раздач (общий музыкальный)"} diff --git a/definitions/v11/thebrothers.yml b/definitions/v11/thebrothers.yml index 95acf8175..b236909f1 100644 --- a/definitions/v11/thebrothers.yml +++ b/definitions/v11/thebrothers.yml @@ -22,14 +22,6 @@ caps: - {id: 28, cat: Movies/SD, desc: "Movie SD"} - {id: 204, cat: Movies/UHD, desc: "Movie UHD Pack"} - {id: 26, cat: Movies/3D, desc: "Movie 3D"} - # Anime - - {id: 214, cat: TV/Anime, desc: "Anime UHD"} - - {id: 212, cat: TV/Anime, desc: "Anime Serie HD"} - - {id: 213, cat: TV/Anime, desc: "Anime Pack HD"} - - {id: 183, cat: TV/Anime, desc: "Anime HD"} - - {id: 189, cat: TV/Anime, desc: "Anime Serie"} - - {id: 184, cat: TV/Anime, desc: "Anime SD"} - - {id: 186, cat: TV/Anime, desc: "Anime 4K"} # Serien - {id: 57, cat: TV/HD, desc: "Serien HD"} - {id: 215, cat: TV/UHD, desc: "Serien UHD"} @@ -38,16 +30,21 @@ caps: - {id: 56, cat: TV/SD, desc: "Serien DVD"} - {id: 60, cat: TV/SD, desc: "Serien SD"} # TV - - {id: 228, cat: Books/Comics, desc: "TV Comic"} - - {id: 226, cat: Movies, desc: "TV Film"} - {id: 223, cat: TV, desc: "TV Serie"} + - {id: 226, cat: Movies, desc: "TV Film"} + - {id: 228, cat: Books/Comics, desc: "TV Comic"} + # Anime + - {id: 212, cat: TV/Anime, desc: "Anime Serie HD"} + - {id: 214, cat: TV/Anime, desc: "Anime UHD"} + - {id: 213, cat: TV/Anime, desc: "Anime Pack HD"} + - {id: 183, cat: TV/Anime, desc: "Anime HD"} + - {id: 189, cat: TV/Anime, desc: "Anime Serie"} + - {id: 184, cat: TV/Anime, desc: "Anime SD"} + - {id: 186, cat: TV/Anime, desc: "Anime 4K"} # Kids - {id: 222, cat: Movies/HD, desc: "Kids HD"} # Klassiker - {id: 157, cat: Movies/HD, desc: "Klassiker HD"} - # Doku - - {id: 221, cat: TV/Documentary, desc: "Doku HD"} - - {id: 235, cat: TV/Documentary, desc: "Doku Serie"} # Music - {id: 126, cat: Audio, desc: "Music Mp3/Flac"} - {id: 48, cat: Audio, desc: "Music Album"} @@ -57,44 +54,34 @@ caps: - {id: 54, cat: Audio, desc: "Music Single"} - {id: 55, cat: Audio/Video, desc: "Music Video"} - {id: 125, cat: Audio, desc: "Music Mixe"} - # XXX - - {id: 73, cat: XXX/x264, desc: "XXX HD"} - - {id: 75, cat: XXX/Pack, desc: "XXX Pack"} - - {id: 76, cat: XXX/SD, desc: "XXX SD"} - - {id: 113, cat: XXX/DVD, desc: "XXX DVD"} + # Doku + - {id: 235, cat: TV/Documentary, desc: "Doku Serie"} + - {id: 221, cat: TV/Documentary, desc: "Doku HD"} + # Game + - {id: 218, cat: Console/Other, desc: "Game Nintendo Switch"} + - {id: 120, cat: Console/PS3, desc: "Game PlayStation"} + - {id: 17, cat: PC/Games, desc: "Game PC"} + - {id: 20, cat: Console/PSP, desc: "Game PSP"} + - {id: 22, cat: Console/Wii, desc: "Game Wii"} + - {id: 24, cat: Console/XBox, desc: "Game XBOX"} + # Wimmel + - {id: 239, cat: Console, desc: "Wimmel Game"} # App - {id: 9, cat: PC, desc: "App Linux"} - - {id: 11, cat: PC/Mobile-Other, desc: "App Other"} - {id: 12, cat: PC/0day, desc: "App Win"} + - {id: 11, cat: PC/Mobile-Other, desc: "App Other"} # Sonstiges - - {id: 232, cat: TV/Sport, desc: "Sonstiges Sport"} + - {id: 51, cat: TV/Sport, desc: "Sonstiges Sport"} - {id: 229, cat: Books/Mags, desc: "Sonstiges Zeitungen"} - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges A-Book"} - {id: 96, cat: Books/EBook, desc: "Sonstiges E-Book"} - {id: 69, cat: Books, desc: "Sonstiges Tutorial"} - {id: 71, cat: Books/Other, desc: "Sonstiges Other"} - # Wimmelbilder - - {id: 231, cat: Console, desc: "Wimmelbild Other"} - - {id: 230, cat: Console, desc: "Wimmelbild WWW"} - # Game - - {id: 120, cat: Console/PS3, desc: "Game PlayStation"} - - {id: 218, cat: Console/Other, desc: "Game Nintendo Switch"} - - {id: 17, cat: PC/Games, desc: "Game PC"} - - {id: 20, cat: Console/PSP, desc: "Game PSP"} - - {id: 22, cat: Console/Wii, desc: "Game Wii"} - - {id: 24, cat: Console/XBox, desc: "Game XBOX"} - # Internt'l - - {id: 98, cat: Movies/HD, desc: "Internt'l Movie HD"} - - {id: 99, cat: TV/HD, desc: "Internt'l Serie HD"} - - {id: 102, cat: TV/SD, desc: "Internt'l Serie SD"} - - {id: 103, cat: Movies/SD, desc: "Internt'l Movie SD"} - - {id: 104, cat: Other, desc: "Internt'l Misc"} - - {id: 105, cat: TV/Documentary, desc: "Internt'l Doku"} - - {id: 106, cat: Books/EBook, desc: "Internt'l E-Book"} - - {id: 107, cat: Audio/Audiobook, desc: "Internt'l A-Book"} - - {id: 115, cat: Movies/DVD, desc: "Internt'l DVD"} - # undocumented - - {id: 159, cat: Other, desc: "Other"} + # XXX + - {id: 75, cat: XXX/Pack, desc: "XXX Pack"} + - {id: 73, cat: XXX/x264, desc: "XXX HD"} + - {id: 113, cat: XXX/DVD, desc: "XXX DVD"} + - {id: 76, cat: XXX/SD, desc: "XXX SD"} modes: search: [q]