Moved private and public archives to res/raw/ for dealing with android library projects.

leonrd · leonrd · commit c6d3e319f3d5 · 2013-03-09T12:10:20.000+02:00
diff --git a/distribute.sh b/distribute.sh
@@ -559,7 +559,7 @@ function run_distribute() {
 	cd "$DIST_PATH"
 
 	debug "Create initial layout"
-	try mkdir assets bin private res templates
+	try mkdir assets bin private res res/raw templates
 
 	debug "Copy default files"
 	try cp -a $SRC_PATH/default.properties .
diff --git a/src/build.py b/src/build.py
@@ -264,24 +264,24 @@ def make_package(args):
         sys.exit(-1)
 
     # Delete the old assets.
-    if os.path.exists('assets/public.mp3'):
-        os.unlink('assets/public.mp3')
+    if os.path.exists('res/raw/public_pack.tar'):
+        os.unlink('res/raw/public_pack.tar')
 
-    if os.path.exists('assets/private.mp3'):
-        os.unlink('assets/private.mp3')
+    if os.path.exists('res/raw/private_pack.tar'):
+        os.unlink('res/raw/private_pack.tar')
 
     # In order to speedup import and initial depack,
     # construct a python27.zip
     make_pythonzip()
 
     # Package up the private and public data.
     if args.private:
-        make_tar('assets/private.mp3', ['private', args.private])
+        make_tar('res/raw/private_pack.tar', ['private', args.private])
     else:
-        make_tar('assets/private.mp3', ['private'])
+        make_tar('res/raw/private_pack.tar', ['private'])
 
     if args.dir:
-        make_tar('assets/public.mp3', [args.dir], args.ignore_path)
+        make_tar('res/raw/public_pack.tar', [args.dir], args.ignore_path)
 
     # Copy over the icon and presplash files.
     shutil.copy(args.icon or default_icon, 'res/drawable/icon.png')
diff --git a/src/src/org/renpy/android/AssetExtract.java b/src/src/org/renpy/android/AssetExtract.java
@@ -17,18 +17,17 @@
 
 import java.util.zip.GZIPInputStream;
 
-import android.content.res.AssetManager;
+import android.content.Context;
+import android.content.res.Resources;
 
 import org.xeustechnologies.jtar.*;
 
 class AssetExtract {
 
-    private AssetManager mAssetManager = null;
     private Activity mActivity = null;
     
     AssetExtract(Activity act) {
         mActivity = act;
-        mAssetManager = act.getAssets();
     }
     
     public boolean extractTar(String asset, String target) {
@@ -38,8 +37,12 @@ public boolean extractTar(String asset, String target) {
         InputStream assetStream = null;
         TarInputStream tis = null;
         
+        Context appContext = mActivity.getApplicationContext();
+        Resources res = appContext.getResources();  
+        int resId = res.getIdentifier(asset, "raw", appContext.getPackageName());	 
+        
         try {
-            assetStream = mAssetManager.open(asset, AssetManager.ACCESS_STREAMING);
+            assetStream = res.openRawResource(resId);
             tis = new TarInputStream(new BufferedInputStream(new GZIPInputStream(new BufferedInputStream(assetStream, 8192)), 8192));
         } catch (IOException e) {
             Log.e("python", "opening up extract tar", e);
diff --git a/src/src/org/renpy/android/PythonActivity.java b/src/src/org/renpy/android/PythonActivity.java
@@ -189,7 +189,7 @@ public void unpackData(final String resource, File target) {
             target.mkdirs();
 
             AssetExtract ae = new AssetExtract(this);
-            if (!ae.extractTar(resource + ".mp3", target.getAbsolutePath())) {
+            if (!ae.extractTar(resource + "_pack", target.getAbsolutePath())) {
                 toastError("Could not extract " + resource + " data.");
             }
 

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public void unpackData(final String resource, File target) {`
`189`	`189`	`target.mkdirs();`
`190`	`190`
`191`	`191`	`AssetExtract ae = new AssetExtract(this);`
`192`		`- if (!ae.extractTar(resource + ".mp3", target.getAbsolutePath())) {`
	`192`	`+ if (!ae.extractTar(resource + "_pack", target.getAbsolutePath())) {`
`193`	`193`	`toastError("Could not extract " + resource + " data.");`
`194`	`194`	`}`
`195`	`195`