From ca8f29d58faeb84d0c77a0d81d123c8c9191950c Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Fri, 4 Jan 2013 20:34:54 +0100
Subject: [PATCH] Extract all assets/ into cache/.

---
 .../retroarch/browser/OverlayActivity.java    |  6 +++
 .../src/org/retroarch/browser/RetroArch.java  | 54 +++++++++++++++++++
 .../org/retroarch/browser/ShaderActivity.java |  6 +++
 3 files changed, 66 insertions(+)

diff --git a/android/phoenix/src/org/retroarch/browser/OverlayActivity.java b/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
index 1e422909f7..0d93209c06 100644
--- a/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
@@ -1,10 +1,16 @@
 package org.retroarch.browser;
 
+import java.io.File;
+
 import android.os.Bundle;
 
 public class OverlayActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		File overlayDir = new File(getCacheDir(), "Overlays");
+		if (overlayDir.exists())
+			super.setStartDirectory(overlayDir.getAbsolutePath());
+		
 		super.addAllowedExt(".cfg");
 		super.setPathSettingKey("input_overlay");
 		super.onCreate(savedInstanceState);
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index d11639f732..5b9be2af83 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -5,6 +5,7 @@ import org.retroarch.R;
 import java.io.*;
 
 import android.content.*;
+import android.content.res.AssetManager;
 import android.app.*;
 import android.os.*;
 import android.preference.PreferenceManager;
@@ -57,6 +58,50 @@ public class RetroArch extends Activity implements
 		float rate = display.getRefreshRate();
 		return rate;
 	}
+	
+	private byte[] loadAsset(String asset) throws IOException {
+		String path = asset;
+		InputStream stream = getAssets().open(path);
+		int len = stream.available();
+		byte[] buf = new byte[len];
+		stream.read(buf, 0, len);
+		return buf;
+	}
+	
+	private void extractAssets(AssetManager manager, String cacheDir, String relativePath, int level) throws IOException {
+		final String[] paths = manager.list(relativePath);
+		if (paths != null && paths.length > 0) { // Directory
+			Log.i(TAG, "Extracting assets directory: " + relativePath);
+			for (final String path : paths)
+				extractAssets(manager, cacheDir, relativePath + (level > 0 ? File.separator : "") + path, level + 1);	
+		} else { // File, extract.
+			Log.i(TAG, "Extracting assets file: " + relativePath);
+			
+			String parentPath = new File(relativePath).getParent();
+			
+			File parentFile = new File(cacheDir, parentPath);
+			Log.i(TAG, "Creating folder: " + parentFile.getAbsolutePath());
+			parentFile.mkdirs(); // Doesn't throw.
+			
+			byte[] asset = loadAsset(relativePath);
+			BufferedOutputStream writer = new BufferedOutputStream(
+					new FileOutputStream(new File(cacheDir, relativePath)));
+
+			writer.write(asset, 0, asset.length);
+			writer.flush();
+			writer.close();
+		}
+	}
+	
+	private void extractAssets() {
+		try {
+			AssetManager assets = getAssets();
+			String cacheDir = getCacheDir().getAbsolutePath();
+			extractAssets(assets, cacheDir, "", 0);
+		} catch (IOException e) {
+			Log.e(TAG, "Failed to extract assets to cache.");			
+		}
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -68,6 +113,15 @@ public class RetroArch extends Activity implements
 			config = new ConfigFile();
 		}
 		
+		// Extracting assets appears to take considerable amount of time, so
+		// move extraction to a thread.
+		Thread assetThread = new Thread(new Runnable() {
+			public void run() {
+				extractAssets();
+			}
+		});
+		assetThread.start();
+		
 		setContentView(R.layout.line_list);
 
 		// Setup the list
diff --git a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
index 02062f4830..43cc16329d 100644
--- a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
@@ -1,10 +1,16 @@
 package org.retroarch.browser;
 
+import java.io.File;
+
 import android.os.Bundle;
 
 public class ShaderActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		File shaderDir = new File(getCacheDir(), "Shaders");
+		if (shaderDir.exists())
+			super.setStartDirectory(shaderDir.getAbsolutePath());
+		
 		super.addAllowedExt(".shader");
 		super.setPathSettingKey("video_bsnes_shader");
 		super.onCreate(savedInstanceState);