timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-06-14 03:16:28 +10:00
Code Issues Packages Projects Releases Wiki Activity

products.py: Work around index being offset on deletion

Browse Source 
Resolves non-latest builds appearing in latest dictionary
This commit is contained in:
Mykola Grymalyuk
2024-07-31 10:54:15 -06:00
parent 628fe4f8fc
commit 7897cd14b6
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opencore_legacy_patcher/sucatalog/products.py
+11 -6
View File
@@ -200,9 +200,12 @@ class CatalogProducts:
if len(supported_versions) == 4:
break
# invert the list
# Invert the list
supported_versions = supported_versions[::-1]
# Create duplicate product list
products_copy = products.copy()
# Remove all but the newest version
for version in supported_versions:
_newest_version = packaging.version.parse("0.0.0")
@@ -229,7 +232,7 @@ class CatalogProducts:
continue
try:
if packaging.version.parse(installer["Version"]) < _newest_version:
products.remove(installer)
products_copy.pop(products_copy.index(installer))
except packaging.version.InvalidVersion:
pass
@@ -238,15 +241,17 @@ class CatalogProducts:
if installer["Catalog"] in [SeedType.CustomerSeed, SeedType.DeveloperSeed, SeedType.PublicSeed]:
for installer_2 in products:
if installer_2["Version"].split(".")[0] == installer["Version"].split(".")[0] and installer_2["Catalog"] not in [SeedType.CustomerSeed, SeedType.DeveloperSeed, SeedType.PublicSeed]:
if installer in products:
products.remove(installer)
if installer in products_copy:
products_copy.pop(products_copy.index(installer))
# Remove EOL versions (older than n-3)
for installer in products:
if installer["Version"].split(".")[0] < supported_versions[-4].value:
products.remove(installer)
if installer in products_copy:
products_copy.pop(products_copy.index(installer))
return products
return products_copy
@cached_property