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

fix(mac) check package fileVersion during install

Browse source
This commit is contained in:
Keyman Server 2022-03-23 15:40:05 +11:00
parent 5a3f314c77
commit 39ddbdcde0
1 changed files with 103 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
View file

@ -34,6 +34,19 @@ NSString *const kKMLegacyApps = @"KMLegacyApps";
NSString *const kKeymanKeyboardDownloadCompletedNotification = @"kKeymanKeyboardDownloadCompletedNotification";
@implementation NSString (VersionNumbers)
- (NSString *)shortenedVersionNumberString {
static NSString *const unnecessaryVersionSuffix = @".0";
NSString *shortenedVersionNumber = self;
while ([shortenedVersionNumber hasSuffix:unnecessaryVersionSuffix]) {
shortenedVersionNumber = [shortenedVersionNumber substringToIndex:shortenedVersionNumber.length - unnecessaryVersionSuffix.length];
}
return shortenedVersionNumber;
}
@end
@interface KMInputMethodAppDelegate ()
@property (nonatomic, strong) KMPackageReader *packageReader;
@end
@ -1165,42 +1178,111 @@ extern const CGKeyCode kProcessPendingBuffer;
}
}
// TODO: This seriously needs to be refactored out of the app delegate and into
// a keyboard install module
- (BOOL)unzipFile:(NSString *)filePath {
BOOL didUnzip = NO;
NSError *error = nil;
NSString *fileName = filePath.lastPathComponent;
NSString *folderName = [fileName stringByDeletingPathExtension];
// First we unzip into a temp folder, and check kmp.json for the fileVersion
// before we continue installation. We don't want to overwrite existing
// package if it is there if the files are not compatible with the installed
// version of Keyman.
NSString *tempFolderName = [folderName stringByAppendingString:@".tmp.install"];
NSString *tempDestFolder = [self.keyboardsPath stringByAppendingPathComponent:tempFolderName];
ZipArchive *za = [[ZipArchive alloc] init];
if ([za UnzipOpenFile:filePath]) {
NSString *destFolder = [self.keyboardsPath stringByAppendingPathComponent:folderName];
if (self.debugMode) {
NSLog(@"Unzipping %@ to %@", filePath, destFolder);
if ([[NSFileManager defaultManager] fileExistsAtPath:destFolder])
NSLog(@"The destiination folder already exists. Overwriting...");
NSLog(@"Unzipping %@ to %@", filePath, tempDestFolder);
if ([[NSFileManager defaultManager] fileExistsAtPath:tempDestFolder])
NSLog(@"The temp destination folder already exists. Overwriting...");
}
didUnzip = [za UnzipFileTo:destFolder overWrite:YES];
didUnzip = [za UnzipFileTo:tempDestFolder overWrite:YES];
[za UnzipCloseFile];
}
if (didUnzip) {
if (self.debugMode)
NSLog(@"Unzipped file: %@", filePath);
NSString * keyboardFolderPath = [self.keyboardsPath stringByAppendingPathComponent:folderName];
[self installFontsAtPath:keyboardFolderPath];
for (NSString *kmxFile in [self KMXFilesAtPath:keyboardFolderPath]) {
if (self.debugMode)
NSLog(@"Adding keyboard to list of active keyboards: %@", kmxFile);
if (![self.activeKeyboards containsObject:kmxFile])
[self.activeKeyboards addObject:kmxFile];
}
[self saveActiveKeyboards];
if (!didUnzip) {
NSLog(@"Failed to unzip file: %@", filePath);
return NO;
}
else {
if (self.debugMode) {
NSLog(@"Failed to unzip file: %@", filePath);
if (self.debugMode)
NSLog(@"Unzipped file: %@", filePath);
BOOL didInstall = NO;
// Check the package info to ensure that we support this version
KMPackageInfo *packageInfo = [self loadPackageInfo:tempDestFolder];
if(packageInfo == nil) {
NSLog(@"Could not find kmp.json in %@", filePath);
} else {
NSString* requiredVersion = [packageInfo.fileVersion shortenedVersionNumberString];
KeymanVersionInfo keymanVersionInfo = [self versionInfo];
NSString *currentVersion = [keymanVersionInfo.versionRelease shortenedVersionNumberString];
if ([requiredVersion compare:currentVersion options:NSNumericSearch] == NSOrderedDescending) {
// currentVersion is lower than the requiredVersion
NSLog(@"Package %@ requires a newer version of Keyman: %@", filePath, requiredVersion);
} else {
didInstall = YES;
}
}
return didUnzip;
NSString *destFolder = [self.keyboardsPath stringByAppendingPathComponent:folderName];
// Remove existing package if it exists
if (didInstall && [[NSFileManager defaultManager] fileExistsAtPath:destFolder]) {
if(self.debugMode) {
NSLog(@"The destination folder already exists. Overwriting...");
}
[[NSFileManager defaultManager] removeItemAtPath:destFolder error:&error];
if (error != nil) {
NSLog(@"Unable to remove destination folder %@", destFolder);
didInstall = NO;
}
}
//
// We believe this package is valid, let's go ahead and install it
//
// Rename the temp folder to the desired dest folder. removing existing folder first
if(didInstall) {
[[NSFileManager defaultManager] moveItemAtPath:tempDestFolder toPath:destFolder error:&error];
if (error != nil) {
NSLog(@"Unable to move temp folder %@ to dest folder %@", tempDestFolder, destFolder);
didInstall = NO;
}
}
if(!didInstall) {
[[NSFileManager defaultManager] removeItemAtPath:tempDestFolder error:&error];
if (error != nil) {
NSLog(@"Unable to remove temp folder %@", tempDestFolder);
}
return NO;
}
// Package has installed, now scan for keyboards and fonts
// TODO: we need to be reading the kmp.json data to determine keyboards to install
NSString * keyboardFolderPath = [self.keyboardsPath stringByAppendingPathComponent:folderName];
[self installFontsAtPath:keyboardFolderPath];
for (NSString *kmxFile in [self KMXFilesAtPath:keyboardFolderPath]) {
if (self.debugMode)
NSLog(@"Adding keyboard to list of active keyboards: %@", kmxFile);
if (![self.activeKeyboards containsObject:kmxFile])
[self.activeKeyboards addObject:kmxFile];
}
[self saveActiveKeyboards];
return YES;
}
- (NSString *)fontsPath {