Download emulator images separately

codeanticode · codeanticode · commit b9ea3d3c8a4f · 2016-06-10T10:36:23.000-04:00
diff --git a/src/processing/mode/android/AVD.java b/src/processing/mode/android/AVD.java
@@ -27,6 +27,7 @@
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
 
+import java.awt.Frame;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -87,7 +88,7 @@ public class AVD {
 
   /** Default virtual wear device used by Processing. */
   static public final AVD wearAVD =
-    new AVD("Wear-Processing-0" + Base.getRevision(),
+    new AVD("Processing-Wear-0" + Base.getRevision(),
             AndroidBuild.target_platform, "android-wear", WEAR_SKIN);  
   
   public AVD(final String name, final String target, 
@@ -283,16 +284,20 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 
 
 
-  static public boolean ensureProperAVD(final AndroidSDK sdk) {
+  static public boolean ensureProperAVD(final Frame window, final AndroidMode mode, 
+      final AndroidSDK sdk) {
     try {
       
       if (AndroidBuild.appComponent == AndroidBuild.WATCHFACE) {
         if (wearAVD.exists(sdk)) {
           return true;
         }
         if (wearAVD.badness()) {
-          Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
-          return false;
+          boolean res = AndroidSDK.locateSysImage(window, mode, true);
+          if (!res) {
+            Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
+            return false;
+          }
         }
         if (wearAVD.create(sdk)) {
           return true;
@@ -302,8 +307,11 @@ static public boolean ensureProperAVD(final AndroidSDK sdk) {
           return true;
         }
         if (defaultAVD.badness()) {
-          Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
-          return false;
+          boolean res = AndroidSDK.locateSysImage(window, mode, false);
+          if (!res) {
+            Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
+            return false;
+          }
         }
         if (defaultAVD.create(sdk)) {
           return true;
diff --git a/src/processing/mode/android/AndroidEditor.java b/src/processing/mode/android/AndroidEditor.java
@@ -572,7 +572,7 @@ public void run() {
         startIndeterminate();
         prepareRun();
         try {
-          androidMode.handleRunEmulator(sketch, AndroidEditor.this);
+          androidMode.handleRunEmulator(sketch, AndroidEditor.this, AndroidEditor.this);
         } catch (SketchException e) {
           statusError(e);
         } catch (IOException e) {
diff --git a/src/processing/mode/android/AndroidMode.java b/src/processing/mode/android/AndroidMode.java
@@ -256,15 +256,16 @@ static public String getDateStamp(long stamp) {
 //      runtime.launch(false);
 //    }
 //  }
-  public void handleRunEmulator(Sketch sketch, RunnerListener listener) throws SketchException, IOException {
+  public void handleRunEmulator(Sketch sketch, AndroidEditor editor, 
+      RunnerListener listener) throws SketchException, IOException {
     listener.startIndeterminate();
     listener.statusNotice("Starting build...");
     AndroidBuild build = new AndroidBuild(sketch, this);
 
     listener.statusNotice("Building Android project...");
     build.build("debug");
         
-    boolean avd = AVD.ensureProperAVD(sdk);
+    boolean avd = AVD.ensureProperAVD(editor, this, sdk);
     if (!avd) {
       SketchException se =
         new SketchException("Could not create a virtual device for the emulator.");
diff --git a/src/processing/mode/android/AndroidSDK.java b/src/processing/mode/android/AndroidSDK.java
@@ -64,6 +64,22 @@ class AndroidSDK {
       "the command line tools from <a href=\"" + DOWNLOAD_URL + "\">here</a>. Make sure to install<br>" +
       "the SDK platform for API " + AndroidBuild.target_sdk + ".";
     
+  private static final String ANDROID_SYS_IMAGE_PRIMARY =
+      "Download emulator?";
+
+  private static final String ANDROID_SYS_IMAGE_SECONDARY =
+      "The emulator does not appear to be installed, <br>" +
+      "Do you want Processing to download and install it now? <br>" +
+      "Otherwise, you will need to do it through SDK manager.";
+
+  private static final String ANDROID_SYS_IMAGE_WEAR_PRIMARY =
+      "Download watch emulator?";
+
+  private static final String ANDROID_SYS_IMAGE_WEAR_SECONDARY =
+      "The watch emulator does not appear to be installed, <br>" +
+      "Do you want Processing to download and install it now? <br>" +
+      "Otherwise, you will need to do it through SDK manager.";    
+    
   private static final String SELECT_ANDROID_SDK_FOLDER =
     "Choose the location of the Android SDK";
 
@@ -284,6 +300,19 @@ static public AndroidSDK locate(final Frame window, final AndroidMode androidMod
       throw new CancelException("User canceled attempt to find SDK"); 
     }
   }
+  
+  static public boolean locateSysImage(final Frame window, 
+      final AndroidMode androidMode, boolean wear)
+      throws BadSDKException, CancelException, IOException {
+    final int result = showDownloadSysImageDialog(window, wear);
+    if (result == JOptionPane.YES_OPTION) {
+      return downloadSysImage(window, androidMode, wear);
+    } else if (result == JOptionPane.NO_OPTION) {
+      return false;
+    } else {
+      return false; 
+    }
+  }
 
   static public AndroidSDK download(final Frame editor, final AndroidMode androidMode) 
       throws BadSDKException, CancelException {
@@ -299,6 +328,22 @@ static public AndroidSDK download(final Frame editor, final AndroidMode androidM
     }
     return sdk;
   }
+  
+  static public boolean downloadSysImage(final Frame editor, 
+      final AndroidMode androidMode, final boolean wear) 
+      throws BadSDKException, CancelException {
+    final SysImageDownloader downloader = new SysImageDownloader(editor, androidMode, wear);    
+    downloader.run(); // This call blocks until the SDK download complete, or user cancels.
+    
+    if (downloader.cancelled()) {
+      throw new CancelException("User canceled emulator download");  
+    } 
+    boolean res = downloader.getResult();
+    if (!res) {
+      throw new BadSDKException("Emulator could not be downloaded");
+    }
+    return res;
+  }
 
   static public int showLocateDialog(Frame editor) {
     // Pane formatting adapted from the Quaqua guide
@@ -335,6 +380,43 @@ static public int showLocateDialog(Frame editor) {
       return JOptionPane.CLOSED_OPTION;
     }
   }
+  
+  
+  static public int showDownloadSysImageDialog(Frame editor, boolean wear) {
+    String msg1 = wear ? ANDROID_SYS_IMAGE_WEAR_PRIMARY : ANDROID_SYS_IMAGE_PRIMARY;
+    String msg2 = wear ? ANDROID_SYS_IMAGE_WEAR_SECONDARY : ANDROID_SYS_IMAGE_SECONDARY;
+    
+    JOptionPane pane =
+        new JOptionPane("<html> " +
+            "<head> <style type=\"text/css\">"+
+            "b { font: 13pt \"Lucida Grande\" }"+
+            "p { font: 11pt \"Lucida Grande\"; margin-top: 8px; width: 300px }"+
+            "</style> </head>" +
+            "<b>" + msg1 + "</b>" +
+            "<p>" + msg2 + "</p>",
+            JOptionPane.QUESTION_MESSAGE);
+
+    String[] options = new String[] { "Yes", "No" };
+    pane.setOptions(options);
+
+    // highlight the safest option ala apple hig
+    pane.setInitialValue(options[0]);
+
+    JDialog dialog = pane.createDialog(editor, null);
+    dialog.setTitle("");
+    dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);  
+    dialog.setVisible(true);
+
+    Object result = pane.getValue();
+    if (result == options[0]) {
+      return JOptionPane.YES_OPTION;
+    } else if (result == options[1]) {
+      return JOptionPane.NO_OPTION;
+    } else {
+      return JOptionPane.CLOSED_OPTION;
+    }
+  }
+  
 
   // this was banished from Base because it encourages bad practice.
   // TODO figure out a better way to handle the above.
diff --git a/src/processing/mode/android/SDKDownloader.java b/src/processing/mode/android/SDKDownloader.java
@@ -52,12 +52,6 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   private static final String URL_REPOSITORY = "https://dl-ssl.google.com/android/repository/repository-11.xml";
   private static final String URL_REPOSITORY_FOLDER = "http://dl-ssl.google.com/android/repository/";
   private static final String URL_USB_DRIVER = "https://dl-ssl.google.com//android/repository/latest_usb_driver_windows.zip";
-  private static final String URL_SYS_IMAGES = "https://dl-ssl.google.com/android/repository/sys-img/android/sys-img.xml";
-  private static final String URL_SYS_IMAGES_FOLDER = "http://dl-ssl.google.com/android/repository/sys-img/android/";
-  private static final String URL_SYS_IMAGES_WEAR = "https://dl-ssl.google.com/android/repository/sys-img/android-wear/sys-img.xml";
-  private static final String URL_SYS_IMAGES_WEAR_FOLDER = "https://dl-ssl.google.com/android/repository/sys-img/android-wear/";
-  private static final String SYSTEM_IMAGE = "Intel x86 Atom System Image";  
-  private static final String SYSTEM_IMAGE_WEAR = "Android Wear Intel x86 Atom System Image";
   
   private static final String PROPERTY_CHANGE_EVENT_TOTAL = "total";
   private static final String PROPERTY_CHANGE_EVENT_DOWNLOADED = "downloaded";
@@ -77,9 +71,7 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   class SDKUrlHolder {
     public String platformVersion;
     public String platformToolsUrl, buildToolsUrl, platformUrl, toolsUrl;
-    public String sysImgUrl, sysImgTag, sysImgWearUrl, sysImgWearTag;
     public String platformToolsFilename, buildToolsFilename, platformFilename, toolsFilename;
-    public String sysImgFilename, sysImgWearFilename;
     public int totalSize = 0;
   }
 
@@ -90,11 +82,6 @@ class SDKDownloadTask extends SwingWorker<Object, Object> {
 
     @Override
     protected Object doInBackground() throws Exception {
-      
-      
-//      File modeDirectory = new File(folder, getTypeName());
-//      
-//      File modeFolder = new File(Base.getSketchbookModesFolder() + "/AndroidMode");
 
       File modeFolder = mode.getFolder();
       
@@ -105,8 +92,6 @@ protected Object doInBackground() throws Exception {
       if (!platformsFolder.exists()) platformsFolder.mkdir();
       File buildToolsFolder = new File(sdkFolder, "build-tools");
       if (!buildToolsFolder.exists()) buildToolsFolder.mkdir();
-      File sysImgFolder = new File(sdkFolder, "system-images");
-      if (!sysImgFolder.exists()) sysImgFolder.mkdir();
       File extrasFolder = new File(sdkFolder, "extras");
       if(!extrasFolder.exists()) extrasFolder.mkdir();
 
@@ -115,8 +100,7 @@ protected Object doInBackground() throws Exception {
       if (!tempFolder.exists()) tempFolder.mkdir();
 
       try {
-        SDKUrlHolder downloadUrls = getDownloadUrls(URL_REPOSITORY, 
-            URL_SYS_IMAGES, URL_SYS_IMAGES_WEAR, Platform.getName());
+        SDKUrlHolder downloadUrls = getDownloadUrls(URL_REPOSITORY, Platform.getName());
         firePropertyChange(PROPERTY_CHANGE_EVENT_TOTAL, 0, downloadUrls.totalSize);
         totalSize = downloadUrls.totalSize;
 
@@ -136,22 +120,6 @@ protected Object doInBackground() throws Exception {
         File downloadedPlatform = new File(tempFolder, downloadUrls.platformFilename);
         downloadAndUnpack(downloadUrls.platformUrl, downloadedPlatform, platformsFolder, false);
         
-        // system images
-        File downloadedSysImg = new File(tempFolder, downloadUrls.sysImgFilename);
-        File tmp = new File(sysImgFolder, "android-" + AndroidBuild.target_sdk);
-        if (!tmp.exists()) tmp.mkdir();
-        File sysImgFinalFolder = new File(tmp, downloadUrls.sysImgTag);
-        if (!sysImgFinalFolder.exists()) sysImgFinalFolder.mkdir();
-        downloadAndUnpack(downloadUrls.sysImgUrl, downloadedSysImg, sysImgFinalFolder, false);  
-
-        // wear system images
-        File downloadedSysImgWear = new File(tempFolder, downloadUrls.sysImgWearFilename);
-        tmp = new File(sysImgFolder, "android-" + AndroidBuild.target_sdk);
-        if (!tmp.exists()) tmp.mkdir();
-        File sysImgWearFinalFolder = new File(tmp, downloadUrls.sysImgWearTag);
-        if (!sysImgWearFinalFolder.exists()) sysImgWearFinalFolder.mkdir();
-        downloadAndUnpack(downloadUrls.sysImgWearUrl, downloadedSysImgWear, sysImgWearFinalFolder, false);
-        
         // usb driver
         if (Platform.isWindows()) {
           File usbDriverFolder = new File(extrasFolder, "google");
@@ -235,9 +203,7 @@ private void downloadAndUnpack(String urlString, File saveTo,
       AndroidMode.extractFolder(saveTo, unpackTo, setExec);
     }
 
-    private SDKUrlHolder getDownloadUrls(String repositoryUrl, 
-        String repositorySysImgUrlString, String repositorySysImgWearUrlString, 
-        String requiredHostOs) 
+    private SDKUrlHolder getDownloadUrls(String repositoryUrl, String requiredHostOs) 
         throws ParserConfigurationException, IOException, SAXException {
       SDKUrlHolder urlHolder = new SDKUrlHolder();
 
@@ -312,55 +278,6 @@ private SDKUrlHolder getDownloadUrls(String repositoryUrl,
         }
       }
       
-      // system image
-      Document docSysImg = db.parse(new URL(repositorySysImgUrlString).openStream());
-      NodeList sysImgList = docSysImg.getElementsByTagName("sdk:system-image");
-      for (int i = 0; i < sysImgList.getLength(); i++) {
-        Node img = sysImgList.item(i);
-        NodeList level = ((Element) img).getElementsByTagName("sdk:api-level");
-        NodeList desc = ((Element) img).getElementsByTagName("sdk:description");
-        NodeList codename = ((Element) img).getElementsByTagName("sdk:codename");
-        // Only considering nodes without a codename, which correspond to the platform
-        // pre-releases.        
-        if (level.item(0).getTextContent().equals(AndroidBuild.target_sdk) &&
-            desc.item(0).getTextContent().equals(SYSTEM_IMAGE) && 
-            codename.item(0) == null) {          
-          NodeList tag = ((Element) img).getElementsByTagName("sdk:tag-id");
-          urlHolder.sysImgTag = tag.item(0).getTextContent();          
-          archiveListItem = ((Element) img).getElementsByTagName("sdk:archives").item(0);
-          Node archiveItem = ((Element) archiveListItem).getElementsByTagName("sdk:archive").item(0);
-          urlHolder.sysImgFilename = ((Element) archiveItem).getElementsByTagName("sdk:url").item(0).getTextContent();
-          urlHolder.sysImgUrl = URL_SYS_IMAGES_FOLDER + urlHolder.sysImgFilename;
-          urlHolder.totalSize += Integer.parseInt(((Element) archiveItem).getElementsByTagName("sdk:size").item(0).getTextContent());
-          break;
-        }
-      }      
-
-      // wear system image
-      Document docSysImgWear = db.parse(new URL(repositorySysImgWearUrlString).openStream());
-      NodeList sysImgWearList = docSysImgWear.getElementsByTagName("sdk:system-image");
-      for (int i = 0; i < sysImgWearList.getLength(); i++) {
-        Node img = sysImgWearList.item(i);
-        NodeList level = ((Element) img).getElementsByTagName("sdk:api-level");
-        NodeList desc = ((Element) img).getElementsByTagName("sdk:description");
-        NodeList codename = ((Element) img).getElementsByTagName("sdk:codename");
-        // Only considering nodes without a codename, which correspond to the platform
-        // pre-releases.        
-        if (level.item(0).getTextContent().equals(AndroidBuild.target_sdk) &&
-            desc.item(0).getTextContent().equals(SYSTEM_IMAGE_WEAR) && 
-            codename.item(0) == null) {          
-          NodeList tag = ((Element) img).getElementsByTagName("sdk:tag-id");
-          urlHolder.sysImgWearTag = tag.item(0).getTextContent();          
-          archiveListItem = ((Element) img).getElementsByTagName("sdk:archives").item(0);
-          Node archiveItem = ((Element) archiveListItem).getElementsByTagName("sdk:archive").item(0);
-          urlHolder.sysImgWearFilename = ((Element) archiveItem).getElementsByTagName("sdk:url").item(0).getTextContent();
-          urlHolder.sysImgWearUrl = URL_SYS_IMAGES_WEAR_FOLDER + urlHolder.sysImgWearFilename;
-          urlHolder.totalSize += Integer.parseInt(((Element) archiveItem).getElementsByTagName("sdk:size").item(0).getTextContent());
-          break;
-        }
-      }        
-      
-      
       return urlHolder;
     }
   }
diff --git a/src/processing/mode/android/SysImageDownloader.java b/src/processing/mode/android/SysImageDownloader.java
