diff --git a/definitions/v10/freefarm.yml b/definitions/v10/freefarm.yml index 452e7e57f..169a091cf 100644 --- a/definitions/v10/freefarm.yml +++ b/definitions/v10/freefarm.yml @@ -218,4 +218,4 @@ search: filters: - name: prepend args: "{{ .Result.description_verified }} " -# NexusPHP v1.8.12 2024-04-13 +# NexusPHP v1.8.13 2024-07-23 diff --git a/definitions/v10/rudub.yml b/definitions/v10/rudub.yml index 0e431aef0..18c69f58a 100644 --- a/definitions/v10/rudub.yml +++ b/definitions/v10/rudub.yml @@ -9,10 +9,9 @@ type: semi-private encoding: windows-1251 followredirect: true links: - - https://01august.rudub.online/ + - https://02august.rudub.online/ legacylinks: - https://rudub.online/ - - https://01july.rudub.online/ - https://02july.rudub.online/ - https://03july.rudub.online/ - https://04july.rudub.online/ @@ -43,6 +42,7 @@ legacylinks: - https://29july.rudub.online/ - https://30july.rudub.online/ - https://31july.rudub.online/ + - https://01august.rudub.online/ caps: categorymappings: diff --git a/definitions/v10/teamos.yml b/definitions/v10/teamos.yml index 83227cafb..9f2730508 100644 --- a/definitions/v10/teamos.yml +++ b/definitions/v10/teamos.yml @@ -16,7 +16,6 @@ legacylinks: caps: categorymappings: - {id: 18, cat: PC, desc: "Team-OS VIP Releases"} - - {id: 23, cat: PC, desc: "Team OS Program"} - {id: 19, cat: PC, desc: "Windows 7 Releases"} - {id: 20, cat: PC, desc: "Windows 7 Releases 32 Bit"} - {id: 21, cat: PC, desc: "Windows 7 Releases 64 Bit"} @@ -29,6 +28,7 @@ caps: - {id: 109, cat: PC, desc: "Windows 10 Releases 64 Bit"} - {id: 110, cat: PC, desc: "Windows 10 Releases x86-x64 AIO"} - {id: 28, cat: PC, desc: "Operating Systems"} + - {id: 175, cat: PC, desc: "Windows AIO Operating Systems"} - {id: 29, cat: PC, desc: "Windows XP"} - {id: 30, cat: PC, desc: "Windows XP 32 Bit"} - {id: 31, cat: PC, desc: "Windows XP 64 Bit"} @@ -46,14 +46,9 @@ caps: - {id: 44, cat: PC, desc: "Windows 10 (x64)"} - {id: 45, cat: PC, desc: "Windows 10 (x86 & x64)"} - {id: 157, cat: PC, desc: "Windows 11"} - - {id: 158, cat: PC, desc: "Windows 11 (x86)"} - {id: 159, cat: PC, desc: "Windows 11 (x64)"} - - {id: 160, cat: PC, desc: "Windows 11 (x86 & x64)"} - {id: 140, cat: PC/Mac, desc: "MacOS"} - {id: 41, cat: PC, desc: "Windows Servers/Old Windows OS/Others"} - - {id: 112, cat: PC, desc: "Windows Servers Ghost Images"} - - {id: 113, cat: PC, desc: "Windows Servers 32 Bit Ghost Images"} - - {id: 114, cat: PC, desc: "Windows Servers 64 Bit Ghost Images"} - {id: 46, cat: PC/ISO, desc: "Windows Untouched ISO(MSDN)"} - {id: 47, cat: PC, desc: "Windows 7 Untouched (MSDN)"} - {id: 48, cat: PC, desc: "Windows 7 32 Bit Untouched (MSDN)"} diff --git a/definitions/v10/torrentqq.yml b/definitions/v10/torrentqq.yml index 87f9e76a4..41590cf54 100644 --- a/definitions/v10/torrentqq.yml +++ b/definitions/v10/torrentqq.yml @@ -7,9 +7,8 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentqq326.com/ + - https://torrentqq327.com/ legacylinks: - - https://torrentqq311.com/ - https://torrentqq312.com/ - https://torrentqq313.com/ - https://torrentqq314.com/ @@ -24,6 +23,7 @@ legacylinks: - https://torrentqq323.com/ - https://torrentqq324.com/ - https://torrentqq325.com/ + - https://torrentqq326.com/ caps: categorymappings: diff --git a/definitions/v9/carpt.yml b/definitions/v9/carpt.yml index 31ef37f80..576970768 100644 --- a/definitions/v9/carpt.yml +++ b/definitions/v9/carpt.yml @@ -193,4 +193,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.12 2024-05-10 +# NexusPHP v1.8.13 2024-07-23 diff --git a/definitions/v9/nicept.yml b/definitions/v9/nicept.yml index 0b4c3237f..1093f576b 100644 --- a/definitions/v9/nicept.yml +++ b/definitions/v9/nicept.yml @@ -187,4 +187,4 @@ search: filters: - name: prepend args: "{{ .Result.description_verified }} " -# NexusPHP v1.8.11 2024-03-27 +# NexusPHP v1.8.12 2024-07-13 diff --git a/definitions/v9/rousi.yml b/definitions/v9/rousi.yml index ea518321f..7e28445de 100644 --- a/definitions/v9/rousi.yml +++ b/definitions/v9/rousi.yml @@ -227,4 +227,4 @@ search: filters: - name: prepend args: "{{ .Result.description_verified }} " -# NexusPHP v1.8.11 2024-03-27 +# NexusPHP v1.8.12 2024-07-13 diff --git a/definitions/v9/rudub.yml b/definitions/v9/rudub.yml index ee1dff6b0..39ebfa181 100644 --- a/definitions/v9/rudub.yml +++ b/definitions/v9/rudub.yml @@ -7,10 +7,9 @@ type: semi-private encoding: windows-1251 followredirect: true links: - - https://01august.rudub.online/ + - https://02august.rudub.online/ legacylinks: - https://rudub.online/ - - https://01july.rudub.online/ - https://02july.rudub.online/ - https://03july.rudub.online/ - https://04july.rudub.online/ @@ -41,6 +40,7 @@ legacylinks: - https://29july.rudub.online/ - https://30july.rudub.online/ - https://31july.rudub.online/ + - https://01august.rudub.online/ caps: categorymappings: diff --git a/definitions/v9/teamos.yml b/definitions/v9/teamos.yml index e07cb44a8..0dcadfe83 100644 --- a/definitions/v9/teamos.yml +++ b/definitions/v9/teamos.yml @@ -16,7 +16,6 @@ legacylinks: caps: categorymappings: - {id: 18, cat: PC, desc: "Team-OS VIP Releases"} - - {id: 23, cat: PC, desc: "Team OS Program"} - {id: 19, cat: PC, desc: "Windows 7 Releases"} - {id: 20, cat: PC, desc: "Windows 7 Releases 32 Bit"} - {id: 21, cat: PC, desc: "Windows 7 Releases 64 Bit"} @@ -29,6 +28,7 @@ caps: - {id: 109, cat: PC, desc: "Windows 10 Releases 64 Bit"} - {id: 110, cat: PC, desc: "Windows 10 Releases x86-x64 AIO"} - {id: 28, cat: PC, desc: "Operating Systems"} + - {id: 175, cat: PC, desc: "Windows AIO Operating Systems"} - {id: 29, cat: PC, desc: "Windows XP"} - {id: 30, cat: PC, desc: "Windows XP 32 Bit"} - {id: 31, cat: PC, desc: "Windows XP 64 Bit"} @@ -46,14 +46,9 @@ caps: - {id: 44, cat: PC, desc: "Windows 10 (x64)"} - {id: 45, cat: PC, desc: "Windows 10 (x86 & x64)"} - {id: 157, cat: PC, desc: "Windows 11"} - - {id: 158, cat: PC, desc: "Windows 11 (x86)"} - {id: 159, cat: PC, desc: "Windows 11 (x64)"} - - {id: 160, cat: PC, desc: "Windows 11 (x86 & x64)"} - {id: 140, cat: PC/Mac, desc: "MacOS"} - {id: 41, cat: PC, desc: "Windows Servers/Old Windows OS/Others"} - - {id: 112, cat: PC, desc: "Windows Servers Ghost Images"} - - {id: 113, cat: PC, desc: "Windows Servers 32 Bit Ghost Images"} - - {id: 114, cat: PC, desc: "Windows Servers 64 Bit Ghost Images"} - {id: 46, cat: PC/ISO, desc: "Windows Untouched ISO(MSDN)"} - {id: 47, cat: PC, desc: "Windows 7 Untouched (MSDN)"} - {id: 48, cat: PC, desc: "Windows 7 32 Bit Untouched (MSDN)"} diff --git a/definitions/v9/torrentqq.yml b/definitions/v9/torrentqq.yml index 550506c7d..fe4a0a833 100644 --- a/definitions/v9/torrentqq.yml +++ b/definitions/v9/torrentqq.yml @@ -7,9 +7,8 @@ type: public encoding: UTF-8 followredirect: true links: - - https://torrentqq326.com/ + - https://torrentqq327.com/ legacylinks: - - https://torrentqq311.com/ - https://torrentqq312.com/ - https://torrentqq313.com/ - https://torrentqq314.com/ @@ -24,6 +23,7 @@ legacylinks: - https://torrentqq323.com/ - https://torrentqq324.com/ - https://torrentqq325.com/ + - https://torrentqq326.com/ caps: categorymappings: diff --git a/definitions/v9/utopia.yml b/definitions/v9/utopia.yml index b10ac4528..554498186 100644 --- a/definitions/v9/utopia.yml +++ b/definitions/v9/utopia.yml @@ -30,6 +30,10 @@ settings: type: checkbox label: Search freeleech only default: false + - name: single_file_release_use_filename + type: checkbox + label: Use filename as title for single file releases + default: true - name: addukrainiantotitle type: checkbox label: Add UKR to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified. @@ -100,8 +104,15 @@ search: fields: category: selector: category_id - title: + title_optional: selector: name + title_filename: + selector: "files[0].name" + optional: true + files: + selector: num_file + title: + text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}" filters: - name: append args: "{{ if .Config.addukrainiantotitle }} UKR{{ else }}{{ end }}" @@ -125,8 +136,6 @@ search: genre: selector: meta.genres filters: - - name: re_replace - args: ["(?i)^None$", ""] - name: re_replace args: ["(?i)(Екшн і Пригоди)", "Екшн_і_Пригоди"] - name: re_replace @@ -137,8 +146,6 @@ search: args: ["(?i)(Політика та війна)", "Політика_та_війна"] description: text: "{{ .Result.genre }}" - files: - selector: num_file seeders: selector: seeders leechers: @@ -177,4 +184,4 @@ search: minimumseedtime: # 3 days (as seconds = 3 x 24 x 60 x 60) text: 259200 -# json UNIT3D 7.0.3 +# json UNIT3D 8.1.3