From 74694ae3c1f71b179d0e61742c0094229e7729b0 Mon Sep 17 00:00:00 2001 From: st-sha Date: Wed, 22 Oct 2025 08:35:24 -0700 Subject: [PATCH] Treat UHD Bluray same as upstream (as 1080p source) --- .gitignore | 3 +- README-CUSTOMIZATIONS.md | 2 +- README.md | 32 +++++++++----------- custom_formats/2160p Bluray.yml | 4 ++- custom_formats/Banned Groups.yml | 4 ++- custom_formats/Remux Tier 0.yml | 4 ++- custom_formats/UHD Bluray.yml | 6 ++-- profiles/1080p Quality.yml | 2 +- profiles/2160p Balanced.yml | 10 +++--- profiles/2160p Remux (Prefer Theatrical).yml | 10 +++--- profiles/2160p Remux Only.yml | 10 +++--- profiles/2160p Remux.yml | 10 +++--- profiles/720p Quality.yml | 2 +- update-from-upstream.ps1 | 30 ------------------ update-from-upstream.sh | 31 ------------------- 15 files changed, 51 insertions(+), 109 deletions(-) delete mode 100644 update-from-upstream.ps1 delete mode 100644 update-from-upstream.sh diff --git a/.gitignore b/.gitignore index af253e0..dcdd055 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/.obsidian \ No newline at end of file +/.obsidian +README-CUSTOMIZATIONS.md \ No newline at end of file diff --git a/README-CUSTOMIZATIONS.md b/README-CUSTOMIZATIONS.md index 1722dcf..efda1ee 100644 --- a/README-CUSTOMIZATIONS.md +++ b/README-CUSTOMIZATIONS.md @@ -320,4 +320,4 @@ To be documented after upstream comparison - Always preserve UHD Bluray prioritization (position + score boost) - Maintain minCustomFormatScore = 0 across profiles - Keep variant-specific customizations (Special Edition penalties, quality restrictions) -- Verify MA scoring boost in quality profiles \ No newline at end of file +- Verify MA scoring boost in quality profiles diff --git a/README.md b/README.md index a0c93f5..7f17ce3 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,21 @@ -# Dictionarry Database +# Dictionarry Database for The HTB -[![Website](https://img.shields.io/badge/Website-dictionarry.dev-blue)](https://dictionarry.dev) -[![Discord](https://img.shields.io/discord/1202375791556431892?color=blue&logo=discord&logoColor=white)](https://discord.com/invite/Y9TYP6jeYZ) -[![Buy Me A Coffee](https://img.shields.io/badge/Buy%20Me%20A%20Coffee-Support-blue?logo=buy-me-a-coffee)](https://www.buymeacoffee.com/santiagosayshey) -[![GitHub Sponsors](https://img.shields.io/badge/GitHub%20Sponsors-Support-blue?logo=github-sponsors)](https://github.com/sponsors/Dictionarry-Hub) +## Key Changes from Upstream -The database serves two main purposes: +### Quality & Source Preferences +- **Physical Media Prioritized**: Favor UHD Bluray sources over WEB in all cases +- **IMAX Prioritized**: Prioritize full-screen IMAX releases over letterboxed theatrical versions, even if it means grabbing WEB instead of REMUX +- **MA Prioritized**: Prefer Movies Anywhere releases more highly compared to other WEB sources -1. Powers our [Documentation](https://dictionarry.dev/) -2. Acts as a - [Profilarr Compliant Database](https://dictionarry.dev/profilarr-setup/linking?section=database-spotlight) +### New Profiles +- **ADDED: 2160p Remux (Prefer Theatrical)**: Avoids special editions +- **ADDED: 2160p Remux Only**: Allows only REMUX with no fallback to encodes, WEB, etc. Allows for 1080p if 2160p is not available. +- **REMOVED: Most lower-quality granular profiles**: When quality is the goal, there is no need to have over a dozen granular profiles -## Branches +### Technical Improvements +- **Custom Format Improvements**: Enhanced format detection and conflict prevention between overlapping formats +- **Documentation**: Clear CUSTOM comments marking all modifications from upstream for transparency -### stable +## 🔄 Sync Status -Contains tested database entries ready for production use. - -### dev - -Contains the latest updates and additions that are pending formal verification. -May include experimental patterns and profiles that require further testing. +This fork stays synchronized with upstream while maintaining HTB-specific customizations marked with `CUSTOM:` comments. Currently this is done manually with AI assistance. diff --git a/custom_formats/2160p Bluray.yml b/custom_formats/2160p Bluray.yml index e21c19b..e953fb3 100644 --- a/custom_formats/2160p Bluray.yml +++ b/custom_formats/2160p Bluray.yml @@ -1,5 +1,7 @@ name: 2160p Bluray -description: Matches 2160p Blurays that are NOT remuxes +description: 'Matches 2160p Blurays that are NOT remuxes + +CUSTOM - Added "Not Remux" condition to prevent format conflicts between remux and non-remux bluray releases.' tags: - Source conditions: diff --git a/custom_formats/Banned Groups.yml b/custom_formats/Banned Groups.yml index b5d5a9c..a08e492 100644 --- a/custom_formats/Banned Groups.yml +++ b/custom_formats/Banned Groups.yml @@ -1,5 +1,7 @@ name: Banned Groups -description: Matches Release Groups that are Banned +description: 'Matches Release Groups that are Banned + +CUSTOM - NoGroup removed from banned list - acceptable as fallback when nothing else is available.' tags: - Banned - Release Group diff --git a/custom_formats/Remux Tier 0.yml b/custom_formats/Remux Tier 0.yml index 421575b..83bf5be 100644 --- a/custom_formats/Remux Tier 0.yml +++ b/custom_formats/Remux Tier 0.yml @@ -1,5 +1,7 @@ name: Remux Tier 0 -description: WiLDCAT +description: 'WiLDCAT + +CUSTOM - Added to ensure WiLDCAT releases are always chosen above other remux sources (unless an upscale).' tags: - Release Group Tier - Remux diff --git a/custom_formats/UHD Bluray.yml b/custom_formats/UHD Bluray.yml index 5bb425c..ebfb46c 100644 --- a/custom_formats/UHD Bluray.yml +++ b/custom_formats/UHD Bluray.yml @@ -7,16 +7,14 @@ description: UHD Blu-ray is a digital optical disc format released in 2016. It s space and 10-bit color depth, while supporting audio formats like Dolby Atmos, DTS:X, DTS-HD MA, and Dolby TrueHD. UHD Blu-ray players require HDMI 2.0a and HDCP 2.2 compliant displays to show 4K HDR content. - - CUSTOMIZATION - This format is prioritized in all quality profiles to ensure physical media preference. tags: - 2160p - Storage conditions: -- name: 2160p +- name: 1080p negate: false required: true - resolution: 2160p + resolution: 1080p type: resolution - name: UHD Bluray negate: false diff --git a/profiles/1080p Quality.yml b/profiles/1080p Quality.yml index 8a38350..9a16461 100644 --- a/profiles/1080p Quality.yml +++ b/profiles/1080p Quality.yml @@ -2,7 +2,7 @@ name: 1080p Quality description: "1080p Quality utilizes the [**Golden Popcorn Performance Index**](https://dictionarry.dev/wiki/gppi)\ \ to target **transparent** x264 1080p encodes. \n\n- 1080p Blurays\n- Fallbacks\ \ in Place for Proper Quality Progression\n- 1080p Bluray > 1080p WEB-DL > 720p\ - \ Bluray > 720p WEB-DL > 480p WEB-DL > DVD\n\nCUSTOM: Physical media priority maintained with quality tier integration" + \ Bluray > 720p WEB-DL > 480p WEB-DL > DVD\n\nCUSTOM - Physical media priority maintained with quality tier integration" tags: - 1080p - Quality Focused diff --git a/profiles/2160p Balanced.yml b/profiles/2160p Balanced.yml index 1dc9ebc..b715fd2 100644 --- a/profiles/2160p Balanced.yml +++ b/profiles/2160p Balanced.yml @@ -1,8 +1,8 @@ custom_formats: -- name: UHD Bluray # Set to 0, use 2160p Remux / Bluray instead - score: 0 -- name: UHD Bluray (Missing) # Set to 0, use 2160p Remux / Bluray instead - score: 0 +- name: UHD Bluray + score: 240000 +- name: UHD Bluray (Missing) + score: 240000 - name: 2160p Bluray score: 250000 - name: 2160p WEB-DL @@ -246,7 +246,7 @@ custom_formats_sonarr: description: "2160p Balanced targets consistent & immutable 2160p **WEB-DLs w/ Lossy\ \ Audio**. \n\n- 2160p WEB-DL\n- Fallbacks in Place for Proper Quality Progression\n\ - 2160p WEB-DL > 1080p Bluray > 1080p WEB-DL > 720p Bluray > 720p WEB-DL > 480p\ - \ WEB-DL > DVD\n\nCUSTOM: Balanced profile with maintained UHD Bluray priority" + \ WEB-DL > DVD\n\nCUSTOM - Balanced profile with maintained UHD Bluray priority" language: must_original minCustomFormatScore: 0 minScoreIncrement: 1 diff --git a/profiles/2160p Remux (Prefer Theatrical).yml b/profiles/2160p Remux (Prefer Theatrical).yml index 5991395..da00540 100644 --- a/profiles/2160p Remux (Prefer Theatrical).yml +++ b/profiles/2160p Remux (Prefer Theatrical).yml @@ -1,5 +1,5 @@ name: 2160p Remux (Prefer Theatrical) -description: "Copied from 2160p Remux\n\nChanges: \n- Special Edition set to -40000\n- IMAX Enhanced set to +40000\n\nCUSTOM: This profile actively penalizes Special Editions to prefer theatrical releases" +description: "Copied from 2160p Remux\n\nChanges: \n- Special Edition set to -40000\n- IMAX Enhanced set to +40000\n\nCUSTOM - This profile actively penalizes Special Editions to prefer theatrical releases" tags: - 2160p - Remux @@ -31,10 +31,10 @@ custom_formats: score: 279000 - name: 1080p Remux score: 260000 -- name: UHD Bluray # Set to 0, use 2160p Remux / Bluray instead - score: 0 -- name: UHD Bluray (Missing) # Set to 0, use 2160p Remux / Bluray instead - score: 0 +- name: UHD Bluray + score: 240000 +- name: UHD Bluray (Missing) + score: 240000 - name: 1080p WEB-DL score: 200000 - name: 2160p Remux diff --git a/profiles/2160p Remux Only.yml b/profiles/2160p Remux Only.yml index 5dc1c12..939ddd4 100644 --- a/profiles/2160p Remux Only.yml +++ b/profiles/2160p Remux Only.yml @@ -1,5 +1,5 @@ name: 2160p Remux Only -description: "Copied from 2160p Remux\n\nChanges: \n- Only allow 2160p and 1080p Remux qualities\n\nCUSTOM: This profile restricts downloads to lossless remux formats only" +description: "Copied from 2160p Remux\n\nChanges: \n- Only allow 2160p and 1080p Remux qualities\n\nCUSTOM - This profile restricts downloads to lossless remux formats only" tags: - 2160p - Remux @@ -31,10 +31,10 @@ custom_formats: score: 279000 - name: 1080p Remux score: 260000 -- name: UHD Bluray # Set to 0, use 2160p Remux / Bluray instead - score: 0 -- name: UHD Bluray (Missing) # Set to 0, use 2160p Remux / Bluray instead - score: 0 +- name: UHD Bluray + score: 240000 +- name: UHD Bluray (Missing) + score: 240000 - name: 1080p WEB-DL score: 200000 - name: 2160p Remux diff --git a/profiles/2160p Remux.yml b/profiles/2160p Remux.yml index 94b21c8..325be65 100644 --- a/profiles/2160p Remux.yml +++ b/profiles/2160p Remux.yml @@ -10,7 +10,7 @@ description: '2160p Remux utilizes **Audio / Video Formats** to prioritise high - 2160p Remux > 2160p Bluray > 2160p WEB-DL > 1080p Remux > 1080p HDR Bluray > 1080p Bluray > 1080p WEB-DL > 720p Bluray > 720p WEB-DL > 480p WEB-DL > DVD - CUSTOM: Base remux profile with balanced Special Edition handling - neutral approach' + CUSTOM - Base remux profile with balanced Special Edition handling - neutral approach' tags: - 1080p - Remux @@ -43,10 +43,10 @@ custom_formats: score: 279000 - name: 1080p Remux score: 260000 -- name: UHD Bluray # Set to 0, use 2160p Remux / Bluray instead - score: 0 -- name: UHD Bluray (Missing) # Set to 0, use 2160p Remux / Bluray instead - score: 0 +- name: UHD Bluray + score: 240000 +- name: UHD Bluray (Missing) + score: 240000 - name: 1080p WEB-DL score: 200000 - name: 2160p Remux diff --git a/profiles/720p Quality.yml b/profiles/720p Quality.yml index 1d6be37..f16d1c7 100644 --- a/profiles/720p Quality.yml +++ b/profiles/720p Quality.yml @@ -2,7 +2,7 @@ name: 720p Quality description: "720p Quality utilizes the [**Golden Popcorn Performance Index**](https://dictionarry.dev/wiki/gppi)\ \ to target **transparent** x264 720p encodes. \n\n- 720p Blurays\n- Fallbacks in\ \ Place for Proper Quality Progression\n- 720p Bluray > 720p WEB-DL > 480p WEB-DL\ - \ > DVD\n\nCUSTOM: Physical media priority maintained with quality tier integration" + \ > DVD\n\nCUSTOM - Physical media priority maintained with quality tier integration" tags: - 720p - Quality Focused diff --git a/update-from-upstream.ps1 b/update-from-upstream.ps1 deleted file mode 100644 index 7fe20a5..0000000 --- a/update-from-upstream.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -# update-from-upstream.ps1 -# PowerShell script to update from upstream while preserving customizations - -Write-Host "🔄 Updating from upstream Dictionarry-Hub database..." -ForegroundColor Cyan - -# Fetch latest changes -git fetch upstream - -# Show what's new -Write-Host "📋 New commits from upstream:" -ForegroundColor Yellow -git log --oneline HEAD..upstream/stable - -# Pull and merge -Write-Host "🔀 Merging upstream changes..." -ForegroundColor Green -git pull upstream stable - -# Check for conflicts -if ($LASTEXITCODE -ne 0) { - Write-Host "⚠️ Conflicts detected!" -ForegroundColor Red - Write-Host "👀 Check files with CUSTOM: comments to preserve your changes" -ForegroundColor Yellow - Write-Host "📝 Resolve conflicts and run: git commit" -ForegroundColor Yellow - exit 1 -} - -# Push to your repo -Write-Host "⬆️ Pushing to your repository..." -ForegroundColor Blue -git push origin stable - -Write-Host "✅ Update complete!" -ForegroundColor Green -Write-Host "🔍 Review changes and test your profiles" -ForegroundColor Cyan \ No newline at end of file diff --git a/update-from-upstream.sh b/update-from-upstream.sh deleted file mode 100644 index be24709..0000000 --- a/update-from-upstream.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# update-from-upstream.sh -# Simple script to update from upstream while preserving customizations - -echo "🔄 Updating from upstream Dictionarry-Hub database..." - -# Fetch latest changes -git fetch upstream - -# Show what's new -echo "📋 New commits from upstream:" -git log --oneline HEAD..upstream/stable - -# Pull and merge -echo "🔀 Merging upstream changes..." -git pull upstream stable - -# Check for conflicts -if [ $? -ne 0 ]; then - echo "⚠️ Conflicts detected!" - echo "👀 Check files with CUSTOM: comments to preserve your changes" - echo "📝 Resolve conflicts and run: git commit" - exit 1 -fi - -# Push to your repo -echo "⬆️ Pushing to your repository..." -git push origin stable - -echo "✅ Update complete!" -echo "🔍 Review changes and test your profiles" \ No newline at end of file