fix ensure upgrade_until shows is processed correctly

profiles/(Anime) Remux-1080p.yml

@@ -55,6 +55,10 @@ qualities:
     name: Bluray-1080p
   - id: 8
     name: Remux-1080p
+upgrade_until:
+  name: Remux 1080p
+  id: -4
+  description: ''
 custom_formats:
 - name: Anime BD Tier 01 (Top SeaDex Muxers)
   score: 1400

profiles/(French MULTi.VO) HD Bluray + WEB.yml

@@ -20,6 +20,10 @@ qualities:
     name: WEBRip-1080p
   - id: 10
     name: Bluray-1080p
+upgrade_until:
+  name: Bluray|WEB 1080p
+  id: -1
+  description: ''
 custom_formats:
 - name: 'Language: Not Original'
   score: -10000

profiles/(French MULTi.VO) HD Remux (1080p).yml

@@ -21,6 +21,9 @@ qualities:
     name: Bluray-1080p
 - name: Remux-1080p
   id: 8
+upgrade_until:
+  name: Remux-1080p
+  id: 8
 custom_formats:
 - name: 'Language: Not Original'
   score: -10000

profiles/(French MULTi.VO) UHD Bluray + WEB.yml

@@ -21,6 +21,10 @@ qualities:
     name: WEBRip-2160p
   - id: 4
     name: Bluray-2160p
+upgrade_until:
+  name: Bluray|WEB 2160p
+  id: -1
+  description: ''
 custom_formats:
 - name: 'Language: Not Original'
   score: -10000

profiles/(French MULTi.VO) UHD Remux (2160p).yml

@@ -21,6 +21,9 @@ qualities:
     name: Bluray-2160p
 - name: Remux-2160p
   id: 3
+upgrade_until:
+  name: Remux-2160p
+  id: 3
 custom_formats:
 - name: 'Language: Not Original'
   score: -10000

profiles/(German) HD Bluray + WEB.yml

@@ -25,6 +25,10 @@ qualities:
     name: WEBRip-1080p
   - id: 10
     name: Bluray-1080p
+upgrade_until:
+  name: Merged QPs
+  id: -1
+  description: ''
 custom_formats:
 - name: German 1080p Booster
   score: 650

profiles/(German) HD Remux + WEB.yml

@@ -18,6 +18,10 @@ qualities:
     name: WEBRip-1080p
   - id: 8
     name: Remux-1080p
+upgrade_until:
+  name: Merged QPs
+  id: -1
+  description: ''
 custom_formats:
 - name: German 1080p Booster
   score: 650

profiles/(German) Remux + WEB 2160p.yml

@@ -18,6 +18,10 @@ qualities:
     name: WEBDL-2160p
   - id: 3
     name: Remux-2160p
+upgrade_until:
+  name: Merged QPs
+  id: -1
+  description: ''
 custom_formats:
 - name: German 1080p Booster
   score: 650

profiles/(German) UHD Bluray + WEB (Alternative).yml

@@ -31,6 +31,10 @@ qualities:
     name: WEBDL-2160p
   - id: 4
     name: Bluray-2160p
+upgrade_until:
+  name: Merged QPs
+  id: -1
+  description: ''
 custom_formats:
 - name: German 1080p Booster
   score: 650

profiles/(German) UHD Bluray + WEB.yml

@@ -18,6 +18,10 @@ qualities:
     name: WEBDL-2160p
   - id: 4
     name: Bluray-2160p
+upgrade_until:
+  name: Merged QPs
+  id: -1
+  description: ''
 custom_formats:
 - name: German 1080p Booster
   score: 650

profiles/(SQP) SQP-1 (1080p).yml

@@ -30,6 +30,10 @@ qualities:
     name: WEBRip-1080p
   - id: 10
     name: Bluray-1080p
+upgrade_until:
+  name: Bluray|WEB-1080p
+  id: -1
+  description: ''
 custom_formats:
 - name: TrueHD ATMOS
   score: -10000

profiles/(SQP) SQP-1 (2160p).yml

@@ -40,6 +40,9 @@ qualities:
     name: WEBRip-2160p
 - name: Bluray-2160p
   id: 4
+upgrade_until:
+  name: Bluray-2160p
+  id: 4
 custom_formats:
 - name: TrueHD ATMOS
   score: -10000

profiles/(SQP) SQP-1 WEB (1080p).yml

@@ -24,6 +24,10 @@ qualities:
     name: WEBRip-1080p
   - id: 10
     name: Bluray-1080p
+upgrade_until:
+  name: Bluray|WEB-1080p
+  id: -1
+  description: ''
 custom_formats:
 - name: TrueHD ATMOS
   score: -10000

profiles/(SQP) SQP-1 WEB (2160p).yml

@@ -34,6 +34,10 @@ qualities:
     name: WEBRip-2160p
   - id: 4
     name: Bluray-2160p
+upgrade_until:
+  name: Bluray|WEB-2160p
+  id: -2
+  description: ''
 custom_formats:
 - name: TrueHD ATMOS
   score: -10000

profiles/(SQP) SQP-2.yml

@@ -32,6 +32,10 @@ qualities:
     name: Remux-2160p
   - id: 4
     name: Bluray-2160p
+upgrade_until:
+  name: WEB|Remux|Bluray|2160p
+  id: -1
+  description: ''
 custom_formats:
 - name: DV HDR10Plus
   score: 1500

profiles/(SQP) SQP-3 (Audio).yml

@@ -30,6 +30,10 @@ qualities:
     name: WEBDL-2160p
   - id: 3
     name: Remux-2160p
+upgrade_until:
+  name: WEB|Remux|2160p
+  id: -1
+  description: ''
 custom_formats:
 - name: TrueHD Atmos
   score: 5000

profiles/(SQP) SQP-3.yml

@@ -30,6 +30,10 @@ qualities:
     name: WEBRip-2160p
   - id: 3
     name: Remux-2160p
+upgrade_until:
+  name: WEB|Remux|2160p
+  id: -1
+  description: ''
 custom_formats:
 - name: DV HDR10Plus
   score: 1500

profiles/(SQP) SQP-4.yml

@@ -28,6 +28,10 @@ qualities:
     name: WEBRip-2160p
   - id: 5
     name: WEBDL-2160p
+upgrade_until:
+  name: WEB|2160p
+  id: -1
+  description: ''
 custom_formats:
 - name: DV HDR10Plus
   score: 1500

profiles/(SQP) SQP-5.yml

@@ -30,6 +30,10 @@ qualities:
     name: WEBRip-2160p
   - id: 5
     name: WEBDL-2160p
+upgrade_until:
+  name: WEBDL|Bluray|2160p
+  id: -1
+  description: ''
 custom_formats:
 - name: DV HDR10Plus
   score: 1500

profiles/HD Bluray + WEB.yml

@@ -20,6 +20,9 @@ qualities:
     name: WEBRip-1080p
 - name: Bluray-1080p
   id: 10
+upgrade_until:
+  name: Bluray-1080p
+  id: 10
 custom_formats:
 - name: HD Bluray Tier 01
   score: 1800

profiles/Remux + WEB 1080p.yml

@@ -18,6 +18,9 @@ qualities:
     name: WEBRip-1080p
 - name: Remux-1080p
   id: 8
+upgrade_until:
+  name: Remux-1080p
+  id: 8
 custom_formats:
 - name: Remux Tier 01
   score: 1950

profiles/Remux + WEB 2160p.yml

@@ -18,6 +18,9 @@ qualities:
     name: WEBRip-2160p
 - name: Remux-2160p
   id: 3
+upgrade_until:
+  name: Remux-2160p
+  id: 3
 custom_formats:
 - name: DV HDR10Plus
   score: 1500

profiles/Remux 2160p (Alternative).yml

@@ -64,6 +64,9 @@ qualities:
   id: 4
 - name: Remux-2160p
   id: 3
+upgrade_until:
+  name: Remux-2160p
+  id: 3
 custom_formats:
 - name: DV HDR10Plus
   score: 1500

profiles/Remux 2160p (Combined).yml

@@ -33,6 +33,9 @@ qualities:
   id: 4
 - name: Remux-2160p
   id: 3
+upgrade_until:
+  name: Remux-2160p
+  id: 3
 custom_formats:
 - name: DV HDR10Plus
   score: 1500

profiles/UHD Bluray + WEB.yml

@@ -18,6 +18,9 @@ qualities:
     name: WEBRip-2160p
 - name: Bluray-2160p
   id: 4
+upgrade_until:
+  name: Bluray-2160p
+  id: 4
 custom_formats:
 - name: DV HDR10Plus
   score: 1500

scripts/generate.py

@@ -7,11 +7,15 @@
 # ///
 import os
 import sys
+import yaml
 
 from utils.custom_formats import collect_custom_formats
 from utils.regex_patterns import collect_regex_patterns
 from utils.profiles import collect_profiles
 
+# Prevent aliases from showing up
+yaml.Dumper.ignore_aliases = lambda *args: True
+
 
 def clear_output_dir(output_dir):
     if not os.path.exists(output_dir):

scripts/utils/profiles.py

@@ -97,10 +97,21 @@ def collect_qualities(items):
     return qualities
 
 
+def get_upgrade_until(quality_name, profile_qualities):
+    found_quality = next(
+        quality for quality in profile_qualities if quality["name"] == quality_name
+    )
+    if found_quality:
+        found_quality = found_quality.copy()
+        found_quality.pop("qualities", None)
+    return found_quality
+
+
 def collect_profile(service, input_json, output_dir):
     # Compose YAML structure
     name = input_json.get("name", "")
     trash_id = input_json.get("trash_id", "")
+    profile_qualities = collect_qualities(input_json.get("items", []))
     yml_data = {
         "name": get_file_name(name),
         "description": f"""[Profile from TRaSH-Guides.](https://trash-guides.info/{service.capitalize()}/{service}-setup-quality-profiles)
@@ -112,7 +123,8 @@ def collect_profile(service, input_json, output_dir):
         "minCustomFormatScore": input_json.get("minFormatScore", 0),
         "upgradeUntilScore": input_json.get("cutoffFormatScore", 0),
         "minScoreIncrement": input_json.get("minUpgradeFormatScore", 0),
-        "qualities": collect_qualities(input_json.get("items", [])),
+        "qualities": profile_qualities,
+        "upgrade_until": get_upgrade_until(input_json.get("cutoff"), profile_qualities),
         "custom_formats": collect_profile_formats(
             input_json.get("trash_score_set"),
             input_json.get("formatItems", {}),