neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-09 06:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes potentially incorrect versions order when merging StoreApp

Browse Source
This commit is contained in:
Riley Testut
2022-11-16 17:31:44 -06:00
committed by Magesh K
parent 7409c0ef4e
commit 83d39666d2
1 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
AltStoreCore/Model/MergePolicy.swift
View File

@@ -75,12 +75,40 @@ open class MergePolicy: RSTRelationshipPreservingMergePolicy
if let contextApp = conflict.conflictingObjects.first as? StoreApp if let contextApp = conflict.conflictingObjects.first as? StoreApp
{ {
let contextVersions = Set(contextApp._versions.lazy.compactMap { $0 as? AppVersion }.map { $0.version }) let databaseVersions = Set(databaseObject._versions.lazy.compactMap { $0 as? AppVersion }.map { $0.version })
for case let appVersion as AppVersion in databaseObject._versions where !contextVersions.contains(appVersion.version) let sortIndexesByVersion = contextApp._versions.lazy.compactMap { $0 as? AppVersion }.reduce(into: [:]) { $0[$1.version] = contextApp._versions.index(of: $1) }
let contextVersions = sortIndexesByVersion.keys
var mergedVersions = Set<AppVersion>()
for case let appVersion as AppVersion in databaseObject._versions
{ {
print("[ALTLog] Deleting cached app version: \(appVersion.appBundleID + "_" + appVersion.version), not in:", contextApp.versions.map { $0.appBundleID + "_" + $0.version }) if contextVersions.contains(appVersion.version)
appVersion.managedObjectContext?.delete(appVersion) {
// Version # exists in context, so add existing appVersion to mergedVersions.
mergedVersions.insert(appVersion)
}
else
{
// Version # does NOT exist in context, so delete existing appVersion.
appVersion.managedObjectContext?.delete(appVersion)
}
} }
for case let appVersion as AppVersion in contextApp._versions where !databaseVersions.contains(appVersion.version)
{
// Add context appVersion only if version # doesn't already exist in databaseVersions.
mergedVersions.insert(appVersion)
}
// Make sure versions are sorted in correct order.
let sortedVersions = mergedVersions.sorted { (versionA, versionB) in
let indexA = sortIndexesByVersion[versionA.version] ?? .max
let indexB = sortIndexesByVersion[versionB.version] ?? .max
return indexA < indexB
}
databaseObject.setVersions(sortedVersions)
} }
case let databaseObject as Source: case let databaseObject as Source:
@@ -112,5 +140,17 @@ open class MergePolicy: RSTRelationshipPreservingMergePolicy
} }
try super.resolve(constraintConflicts: conflicts) try super.resolve(constraintConflicts: conflicts)
for conflict in conflicts
{
switch conflict.databaseObject
{
case let databaseObject as StoreApp:
// Update versions post-merging to make sure latestSupportedVersion is correct.
databaseObject.setVersions(databaseObject.versions)
default: break
}
}
} }
} }