kylefang/react-native-code-push
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-code-push.git synced 2026-06-14 01:54:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix getCurrentPackage

Browse Source
This commit is contained in:
Geoffrey Goh
2016-02-11 21:18:00 -08:00
parent 009ae205f8
commit 7bb4e1099e
5 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
CodePushPackage.m
View File

@@ -142,7 +142,7 @@ NSString * const UnzippedFolderName = @"unzipped";
NSString *folderPath = [CodePushPackage getCurrentPackageFolderPath:error];
if (!*error) {
if (!folderPath) {
return [NSDictionary dictionary];
return nil;
}
NSString *packagePath = [folderPath stringByAppendingPathComponent:@"app.json"];
@@ -159,7 +159,7 @@ NSString * const UnzippedFolderName = @"unzipped";
}
}
return NULL;
return nil;
}
+ (NSDictionary *)getPackage:(NSString *)packageHash
@@ -204,15 +204,22 @@ NSString * const UnzippedFolderName = @"unzipped";
failCallback:(void (^)(NSError *err))failCallback
{
NSString *newPackageFolderPath = [self getPackageFolderPath:updatePackage[@"packageHash"]];
NSError *error = nil;
NSError *error;
if (![[NSFileManager defaultManager] fileExistsAtPath:newPackageFolderPath]) {
[[NSFileManager defaultManager] createDirectoryAtPath:newPackageFolderPath
if (![[NSFileManager defaultManager] fileExistsAtPath:[self getCodePushPath]]) {
[[NSFileManager defaultManager] createDirectoryAtPath:[self getCodePushPath]
withIntermediateDirectories:YES
attributes:nil
error:&error];
}
if ([[NSFileManager defaultManager] fileExistsAtPath:newPackageFolderPath]) {
// This removes any stale data in newPackageFolderPath that could have been left
// uncleared due to a crash or error during the download or install process.
[[NSFileManager defaultManager] removeItemAtPath:newPackageFolderPath
error:&error];
}
if (error) {
return failCallback(error);
}
@@ -259,9 +266,9 @@ NSString * const UnzippedFolderName = @"unzipped";
return;
}
[CodePushPackage copyEntriesInFolder:currentPackageFolderPath
destFolder:newPackageFolderPath
error:&error];
[[NSFileManager defaultManager] copyItemAtPath:currentPackageFolderPath
toPath:newPackageFolderPath
error:&error];
if (error) {
failCallback(error);
return;