erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-11 03:15:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

feat(ios/engine): adjustments after splitting off package-id commit

Browse source
This commit is contained in:
jahorton 2020-06-12 10:30:14 +07:00
parent e76255706a
commit 4b4fc3304f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ios/engine/KMEI/KeymanEngine/Classes/Migrations.swift
View file

@ -532,7 +532,6 @@ public enum Migrations {
_ resources: [Resource], matchLocal localPackages: [Package]) -> [Resource] {
// Step 2 - determine which resources were installed from our locally-available KMPs,
// then migrate by reinstalling the KMP.
var processedResources: [Resource] = []
var matched: [Resource] = []
localPackages.forEach { package in
@ -561,9 +560,17 @@ public enum Migrations {
return matched.contains(where: { $0.typedFullID == resource.typedFullID }) ? nil : resource
}
unmatched.forEach { resource in
let processedUnmatched: [Resource] = unmatched.compactMap { resource in
// TODO: Migrate 'em by generating kmp.json files in their folders.
// Generated 'package' id: the resource's own ID, since that's where it's stored.
// This can't be done directly. BUT, once the kmp.json is written and loaded as a package,
// we can parse the KMP to get the version with a package ID.
var processedResource = resource
//processedResource.packageID = resource.id
return processedResource
}
return matched + unmatched