perform check for flag in package.json

Author: petekanev

src/src/com/tns/AssetExtractor.java

@@ -2,8 +2,8 @@
 
 import java.io.File;
 
-
 import android.content.Context;
+import android.util.Log;
 
 public class AssetExtractor
 {
@@ -34,5 +34,13 @@ else if (extractPolicy.shouldExtract(context))
 
 			extractAssets(apkPath, inputPath, outputPath, forceOverwrite);
 		}
+		else
+		{
+			Log.d("~~~~~~~~", "SKIPPED EXTRACTION");
+			if (logger.isEnabled())
+			{
+				logger.write("Skipped extraction of assets in " + inputPath);
+			}
+		}
 	}
 }

src/src/com/tns/V8Config.java

@@ -11,6 +11,8 @@ class V8Config
 	private static final String AndroidKey = "android";
 	private static final String V8FlagsKey = "v8Flags";
 	private static final String CodeCacheKey = "codeCache";
+	// TODO: EnableHeapSnapshotKey is subject to approval and change
+	private static final String EnableHeapSnapshotKey = "heapSnapshotEnable";
 	private static final String HeapSnapshotScriptKey = "heapSnapshotScript";
 	private static final String HeapSnapshotBlobKey = "heapSnapshotBlob";
 	private static final String SnapshotFile = "snapshot.blob";
@@ -22,6 +24,7 @@ public static Object[] fromPackageJSON(File appDir)
 		File packageInfo = new File(appDir, "/app/package.json");
 		if (!packageInfo.exists())
 		{
+			android.util.Log.d("~~~~~~~~", "A PACKAGE INFO DOES NOT EXIST");
 			return result;
 		}
 
@@ -31,6 +34,8 @@ public static Object[] fromPackageJSON(File appDir)
 			rootObject = FileSystem.readJSONFile(packageInfo);
 			if (rootObject != null && rootObject.has(AndroidKey))
 			{
+				android.util.Log.d("~~~~~~~~", "Getting keys inside android");
+				
 				JSONObject androidObject = rootObject.getJSONObject(AndroidKey);
 				if (androidObject.has(V8FlagsKey))
 				{
@@ -61,6 +66,12 @@ public static Object[] fromPackageJSON(File appDir)
 				{
 					result[4] = androidObject.getString(ProfilerOutputDirKey);
 				}
+				if(androidObject.has(EnableHeapSnapshotKey))
+				{
+
+					android.util.Log.d("~~~~~~~~", "Found thy key");
+					result[5] = androidObject.getBoolean(EnableHeapSnapshotKey);
+				}
 			}
 		}
 		catch (Exception e)
@@ -83,7 +94,9 @@ private static Object[] makeDefaultOptions()
 			// a binary file containing an already saved snapshot
 			"",
 			// V8 profiler output directory
-			""
+			"",
+			// enable heapsnapshots extraction, false by default 
+			false
 		};
 
 		return result;

test-app/src/com/tns/DefaultExtractPolicy.java

@@ -35,7 +35,7 @@ public boolean shouldExtract(Context context)
 		if (oldAssetsThumb == null) {
 			return true;
 		} else {
-			String currentThumb = getAssetThumb(context);
+			String currentThumb = getAssetsThumb(context);
 
 			if(currentThumb != null  && !currentThumb.equals(oldAssetsThumb)) {
 				return true;
@@ -61,7 +61,7 @@ public FileExtractor extractor() {
 		return null;
 	}
 
-	public String getAssetThumb(Context context) {
+	public String getAssetsThumb(Context context) {
 		return generateAssetsThumb(context);
 	}
 

test-app/src/com/tns/RuntimeHelper.java

@@ -67,23 +67,36 @@ public void initRuntime() {
 			Object[] v8Config = V8Config.fromPackageJSON(appDir);
 
 			if (!skipAssetExtraction) {
+				if(logger.isEnabled()) {
+					logger.write("Extracting assets...");
+				}
+				
 				AssetExtractor aE = new AssetExtractor(null, logger);
 
 				String outputDir = app.getFilesDir().getPath() + File.separator;
-				
+
+				Log.d("~~~~~~~~", "EXTRACTING LE APP CRAP");
 				aE.extractAssets(app, "app", outputDir, extractPolicy);
 				aE.extractAssets(app, "internal", outputDir, extractPolicy);
 				aE.extractAssets(app, "metadata", outputDir, extractPolicy);
 
-				boolean shouldExtractSnapshots = !v8Config[3].toString().isEmpty();
+				// at earlier point the package.json will not have been extracted, so we now fetch the real, non-default values from the file
+				v8Config = V8Config.fromPackageJSON(appDir);
+				
+				boolean shouldExtractSnapshots = (Boolean)v8Config[5];
 				if(shouldExtractSnapshots) {
-					System.out.println("EXTRACTING A SNAPSHOT!");
+					if(logger.isEnabled()) {
+						logger.write("Extracting snapshot blob");
+					}
+
 					aE.extractAssets(app,  "snapshots/" + Build.CPU_ABI + "/snapshot.blob", outputDir, extractPolicy);
 				}
 
 				extractPolicy.setAssetsThumb(app);
 			}
 
+			
+			
 			ClassLoader classLoader = app.getClassLoader();
 			File dexDir = new File(rootDir, "code_cache/secondary-dexes");
 			String dexThumb = null;