Treat UHD Bluray same as upstream (as 1080p source)
This commit is contained in:
st-sha
parent
c39ae30b8d
commit
74694ae3c1
|
|
@ -1 +1,2 @@
|
|||
/.obsidian
|
||||
/.obsidian
|
||||
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
|
||||
- Verify MA scoring boost in quality profiles
|
||||
|
|
|
|||
32
README.md
32
README.md
|
|
@ -1,23 +1,21 @@
|
|||
# Dictionarry Database
|
||||
# Dictionarry Database for The HTB
|
||||
|
||||
[](https://dictionarry.dev)
|
||||
[](https://discord.com/invite/Y9TYP6jeYZ)
|
||||
[](https://www.buymeacoffee.com/santiagosayshey)
|
||||
[](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.
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
Loading…
Reference in New Issue