Archive extraction, correct paths and permissions

Author: imilka

src/processing/mode/android/AndroidMode.java

@@ -116,14 +116,23 @@ protected File getCoreZipLocation() {
 //    return sdk;
 //  }
 
+  public void loadSDK() {
+    try {
+      sdk = AndroidSDK.load();
+    } catch (BadSDKException e) {
+      e.printStackTrace();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
 
   public void checkSDK(Editor parent) {
     if (sdk == null) {
       try {
         sdk = AndroidSDK.load();
         // FIXME REVERT THIS STATEMENT AFTER TESTING (should be ==)
-        if (sdk != null) {
-          sdk = AndroidSDK.locate(parent);
+        if (sdk == null) {
+          sdk = AndroidSDK.locate(parent, this);
         }
       } catch (BadSDKException e) {
         e.printStackTrace();

src/processing/mode/android/AndroidSDK.java

@@ -1,6 +1,7 @@
 package processing.mode.android;
 
 import processing.app.Base;
+import processing.app.Editor;
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.exec.ProcessHelper;
@@ -233,7 +234,7 @@ public static AndroidSDK load() throws BadSDKException, IOException {
   }
 
 
-  static public AndroidSDK locate(final Frame window)
+  static public AndroidSDK locate(final Frame window, final AndroidMode androidMode)
       throws BadSDKException, IOException {
     final int result = showLocateDialog(window);
     if (result == JOptionPane.CANCEL_OPTION) {
@@ -244,7 +245,7 @@ static public AndroidSDK locate(final Frame window)
       //Base.openURL(ANDROID_SDK_URL);
       //throw new BadSDKException("No SDK installed.");
 
-      return download();
+      return download(androidMode);
     }
     while (true) {
       // TODO this is really a yucky way to do this stuff. fix it.
@@ -263,13 +264,13 @@ static public AndroidSDK locate(final Frame window)
     }
   }
 
-  static public AndroidSDK download() throws BadSDKException {
+  static public AndroidSDK download(final AndroidMode androidMode) throws BadSDKException {
     AndroidMode.sdkDownloadInProgress = true;
 
     SwingUtilities.invokeLater(new Runnable() {
       @Override
       public void run() {
-        SDKDownloader downloader = new SDKDownloader();
+        SDKDownloader downloader = new SDKDownloader(androidMode);
         downloader.startDownload();
       }
     });

src/processing/mode/android/SDKDownloader.java

@@ -18,12 +18,12 @@
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 public class SDKDownloader extends JFrame implements PropertyChangeListener {
 
@@ -35,6 +35,8 @@ public class SDKDownloader extends JFrame implements PropertyChangeListener {
   public static final String PROPERTY_CHANGE_EVENT_TOTAL = "total";
   private static final String PROPERTY_CHANGE_EVENT_DOWNLOADED = "downloaded";
 
+  private AndroidMode androidMode;
+
   JProgressBar progressBar;
   JLabel downloadedTextArea;
 
@@ -56,41 +58,45 @@ protected Object doInBackground() throws Exception {
       String hostOs = getOsString();
       File modeFolder = new File(Base.getSketchbookModesFolder() + "/AndroidMode");
 
-      // creating sdk root folder
+      // creating sdk folders
       File sdkFolder = new File(modeFolder, "sdk");
       if(!sdkFolder.exists()) sdkFolder.mkdir();
+      File platformsFolder = new File(sdkFolder, "platforms");
+      if(!platformsFolder.exists()) platformsFolder.mkdir();
+      File buildToolsFolder = new File(sdkFolder, "build-tools");
+      if(!buildToolsFolder.exists()) buildToolsFolder.mkdir();
 
       // creating temp folder for downloaded zip packages
       File tempFolder = new File(modeFolder, "temp");
       if(!tempFolder.exists()) tempFolder.mkdir();
 
-      // creating sdk folders
-      File toolsFolder = new File(sdkFolder, "tools"); toolsFolder.mkdir();
-      File platformToolsFolder = new File(sdkFolder, "platform-tools"); platformToolsFolder.mkdir();
-      File buildToolsFolder = new File(sdkFolder, "build-tools"); buildToolsFolder.mkdir();
-      File platformsFoolder = new File(sdkFolder, "platforms"); platformsFoolder.mkdir();
-      File platformFolder = new File(platformsFoolder, "android-10"); platformFolder.mkdir();
-
       try {
         SDKUrlHolder downloadUrls = getDownloadUrls(URL_REPOSITORY, hostOs);
         firePropertyChange(PROPERTY_CHANGE_EVENT_TOTAL, 0, downloadUrls.totalSize);
         totalSize = downloadUrls.totalSize;
 
         // tools
         File downloadedTools = new File(tempFolder, downloadUrls.toolsFilename);
-        downloadFile(downloadUrls.toolsUrl, downloadedTools);
+        downloadAndUnpack(downloadUrls.toolsUrl, downloadedTools, sdkFolder);
 
         // platform-tools
         File downloadedPlatformTools = new File(tempFolder, downloadUrls.platformToolsFilename);
-        downloadFile(downloadUrls.platformToolsUrl, downloadedPlatformTools);
+        downloadAndUnpack(downloadUrls.platformToolsUrl, downloadedPlatformTools, sdkFolder);
 
         // build-tools
         File downloadedBuildTools = new File(tempFolder, downloadUrls.buildToolsFilename);
-        downloadFile(downloadUrls.buildToolsUrl, downloadedBuildTools);
+        downloadAndUnpack(downloadUrls.buildToolsUrl, downloadedBuildTools, buildToolsFolder);
 
         // platform
         File downloadedPlatform = new File(tempFolder, downloadUrls.platformFilename);
-        downloadFile(downloadUrls.platformUrl, downloadedPlatform);
+        downloadAndUnpack(downloadUrls.platformUrl, downloadedPlatform, platformsFolder);
+
+        if(Base.isLinux() || Base.isMacOS()) {
+          Runtime.getRuntime().exec("chmod -R 755 " + sdkFolder.getAbsolutePath());
+        }
+
+        Base.getPlatform().setenv("ANDROID_SDK", sdkFolder.getAbsolutePath());
+        androidMode.loadSDK();
       } catch (ParserConfigurationException e) {
         // TODO Handle exceptions here somehow (ie show error message) and handle at least mkdir() results (above)
         e.printStackTrace();
@@ -105,9 +111,10 @@ protected Object doInBackground() throws Exception {
     @Override
     protected void done() {
       super.done();
+      setVisible(false);
     }
 
-    private void downloadFile(String urlString, File saveTo) throws IOException {
+    private void downloadAndUnpack(String urlString, File saveTo, File unpackTo) throws IOException {
       URL url = new URL(urlString);
       URLConnection conn = url.openConnection();
 
@@ -126,6 +133,8 @@ private void downloadFile(String urlString, File saveTo) throws IOException {
 
       inputStream.close();
       outputStream.close();
+
+      extractFolder(saveTo, unpackTo);
     }
 
     private String getOsString() {
@@ -229,9 +238,11 @@ public static String humanReadableByteCount(long bytes, boolean si) {
     return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
   }
 
-  public SDKDownloader() {
+  public SDKDownloader(AndroidMode androidMode) {
     super("Android SDK downloading...");
 
+    this.androidMode = androidMode;
+
     createLayout();
   }
 
@@ -320,4 +331,46 @@ public void actionPerformed(ActionEvent actionEvent) {
     setVisible(true);
     setAlwaysOnTop(true);
   }
+
+  static public void extractFolder(File file, File newPath) throws IOException {
+    int BUFFER = 2048;
+    ZipFile zip = new ZipFile(file);
+    Enumeration zipFileEntries = zip.entries();
+
+    // Process each entry
+    while (zipFileEntries.hasMoreElements())
+    {
+      // grab a zip file entry
+      ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
+      String currentEntry = entry.getName();
+      File destFile = new File(newPath, currentEntry);
+      //destFile = new File(newPath, destFile.getName());
+      File destinationParent = destFile.getParentFile();
+
+      // create the parent directory structure if needed
+      destinationParent.mkdirs();
+
+      if (!entry.isDirectory())
+      {
+        BufferedInputStream is = new BufferedInputStream(zip
+            .getInputStream(entry));
+        int currentByte;
+        // establish buffer for writing file
+        byte data[] = new byte[BUFFER];
+
+        // write the current file to disk
+        FileOutputStream fos = new FileOutputStream(destFile);
+        BufferedOutputStream dest = new BufferedOutputStream(fos,
+            BUFFER);
+
+        // read and write until last byte is encountered
+        while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
+          dest.write(data, 0, currentByte);
+        }
+        dest.flush();
+        dest.close();
+        is.close();
+      }
+    }
+  }
 }