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

Merge pull request #243 from Microsoft/ios_debug

Browse Source 
Simplify JS bundle discovery strategy
This commit is contained in:
Jonathan Carter
2016-03-13 13:36:34 -07:00
parent 841ff90f6f e27968e32e
commit dfc22223e4
7 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
View File

@@ -365,7 +365,7 @@ public class CodePush {
try {
WritableMap mutableUpdatePackage = CodePushUtils.convertReadableMapToWritableMap(updatePackage);
mutableUpdatePackage.putString(BINARY_MODIFIED_TIME_KEY, "" + getBinaryResourcesModifiedTime());
codePushPackage.downloadPackage(applicationContext, mutableUpdatePackage, new DownloadProgressCallback() {
codePushPackage.downloadPackage(applicationContext, mutableUpdatePackage, CodePush.this.assetsBundleFileName, new DownloadProgressCallback() {
@Override
public void call(DownloadProgress downloadProgress) {
getReactApplicationContext()

4
android/app/src/main/java/com/microsoft/codepush/react/CodePushPackage.java
View File

@@ -151,7 +151,7 @@ public class CodePushPackage {
}
}
public void downloadPackage(Context applicationContext, ReadableMap updatePackage,
public void downloadPackage(Context applicationContext, ReadableMap updatePackage, String expectedBundleFileName,
DownloadProgressCallback progressCallback) throws IOException {
String newUpdateHash = CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY);
String newUpdateFolderPath = getPackageFolderPath(newUpdateHash);
@@ -243,7 +243,7 @@ public class CodePushPackage {
// For zip updates, we need to find the relative path to the jsBundle and save it in the
// metadata so that we can find and run it easily the next time.
String relativeBundlePath = CodePushUpdateUtils.findJSBundleInUpdateContents(newUpdateFolderPath);
String relativeBundlePath = CodePushUpdateUtils.findJSBundleInUpdateContents(newUpdateFolderPath, expectedBundleFileName);
if (relativeBundlePath == null) {
throw new CodePushInvalidUpdateException("Update is invalid - no files with extension .bundle, .js or .jsbundle were found in the update package.");

12
android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java
View File

@@ -79,24 +79,20 @@ public class CodePushUpdateUtils {
}
}
public static String findJSBundleInUpdateContents(String folderPath) {
public static String findJSBundleInUpdateContents(String folderPath, String expectedFileName) {
File folder = new File(folderPath);
File[] folderFiles = folder.listFiles();
for (File file : folderFiles) {
String fullFilePath = CodePushUtils.appendPathComponent(folderPath, file.getName());
if (file.isDirectory()) {
String mainBundlePathInSubFolder = findJSBundleInUpdateContents(fullFilePath);
String mainBundlePathInSubFolder = findJSBundleInUpdateContents(fullFilePath, expectedFileName);
if (mainBundlePathInSubFolder != null) {
return CodePushUtils.appendPathComponent(file.getName(), mainBundlePathInSubFolder);
}
} else {
String fileName = file.getName();
int dotIndex = fileName.lastIndexOf(".");
if (dotIndex >= 0) {
String fileExtension = fileName.substring(dotIndex + 1);
if (fileExtension.equals("bundle") || fileExtension.equals("js") || fileExtension.equals("jsbundle")) {
return fileName;
}
if (fileName.equals(expectedFileName)) {
return fileName;
}
}
}

2
ios/CodePush/CodePush.h
View File

@@ -70,6 +70,7 @@ failCallback:(void (^)(NSError *err))failCallback;
@interface CodePushPackage : NSObject
+ (void)downloadPackage:(NSDictionary *)updatePackage
expectedBundleFileName:(NSString *)expectedBundleFileName
progressCallback:(void (^)(long long, long long))progressCallback
doneCallback:(void (^)())doneCallback
failCallback:(void (^)(NSError *err))failCallback;
@@ -113,6 +114,7 @@ failCallback:(void (^)(NSError *err))failCallback;
error:(NSError **)error;
+ (NSString *)findMainBundleInFolder:(NSString *)folderPath
expectedFileName:(NSString *)expectedFileName
error:(NSError **)error;
+ (NSString *)assetsFolderName;

4
ios/CodePush/CodePush.m
View File

@@ -419,7 +419,9 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
forKey:BinaryBundleDateKey];
}
[CodePushPackage downloadPackage:mutableUpdatePackage
[CodePushPackage
downloadPackage:mutableUpdatePackage
expectedBundleFileName:[bundleResourceName stringByAppendingPathExtension:bundleResourceExtension]
// The download is progressing forward
progressCallback:^(long long expectedContentLength, long long receivedContentLength) {
dispatch_async(_methodQueue, ^{

3
ios/CodePush/CodePushPackage.m
View File

@@ -205,6 +205,7 @@ NSString * const UnzippedFolderName = @"unzipped";
}
+ (void)downloadPackage:(NSDictionary *)updatePackage
expectedBundleFileName:(NSString *)expectedBundleFileName
progressCallback:(void (^)(long long, long long))progressCallback
doneCallback:(void (^)())doneCallback
failCallback:(void (^)(NSError *err))failCallback
@@ -360,7 +361,9 @@ NSString * const UnzippedFolderName = @"unzipped";
}
NSString *relativeBundlePath = [CodePushUpdateUtils findMainBundleInFolder:newUpdateFolderPath
expectedFileName:expectedBundleFileName
error:&error];
if (error) {
failCallback(error);
return;

9
ios/CodePush/CodePushUpdateUtils.m
View File

@@ -118,6 +118,7 @@ NSString * const ManifestFolderPrefix = @"CodePush";
}
+ (NSString *)findMainBundleInFolder:(NSString *)folderPath
expectedFileName:(NSString *)expectedFileName
error:(NSError **)error
{
NSArray* folderFiles = [[NSFileManager defaultManager]
@@ -132,7 +133,9 @@ NSString * const ManifestFolderPrefix = @"CodePush";
BOOL isDir = NO;
if ([[NSFileManager defaultManager] fileExistsAtPath:fullFilePath
isDirectory:&isDir] && isDir) {
NSString *mainBundlePathInFolder = [self findMainBundleInFolder:fullFilePath error:error];
NSString *mainBundlePathInFolder = [self findMainBundleInFolder:fullFilePath
expectedFileName:expectedFileName
error:error];
if (*error) {
return nil;
}
@@ -140,9 +143,7 @@ NSString * const ManifestFolderPrefix = @"CodePush";
if (mainBundlePathInFolder) {
return [fileName stringByAppendingPathComponent:mainBundlePathInFolder];
}
} else if ([[fileName pathExtension] isEqualToString:@"bundle"] ||
[[fileName pathExtension] isEqualToString:@"jsbundle"] ||
[[fileName pathExtension] isEqualToString:@"js"]) {
} else if ([fileName isEqualToString:expectedFileName]) {
return fileName;
}
}