Display download percentage when fetching library info

Author: Plastix

app/src/processing/app/contrib/ContributionManager.java

@@ -15,7 +15,7 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along 
+  You should have received a copy of the GNU General Public License along
   with this program; if not, write to the Free Software Foundation, Inc.
   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
@@ -43,7 +43,7 @@ public class ContributionManager {
   /**
    * Blocks until the file is downloaded or an error occurs. Returns true if the
    * file was successfully downloaded, false otherwise.
-   * 
+   *
    * @param source
    *          the URL of the file to download
    * @param dest
@@ -67,17 +67,18 @@ static boolean download(URL source, File dest, ProgressMonitor progress) {
       conn.setReadTimeout(60 * 1000);
       conn.setRequestMethod("GET");
       conn.connect();
-  
+
       if (progress != null) {
         // TODO this is often -1, may need to set progress to indeterminate
         int fileSize = conn.getContentLength();
+        progress.max = fileSize;
 //      System.out.println("file size is " + fileSize);
-        progress.startTask(Language.text("contrib.progress.downloading"), fileSize); 
+        progress.startTask(Language.text("contrib.progress.downloading"), fileSize);
       }
-  
+
       InputStream in = conn.getInputStream();
       FileOutputStream out = new FileOutputStream(dest);
-  
+
       byte[] b = new byte[8192];
       int amount;
       if (progress != null) {
@@ -95,7 +96,7 @@ static boolean download(URL source, File dest, ProgressMonitor progress) {
       out.flush();
       out.close();
       success = true;
-      
+
     } catch (SocketTimeoutException ste) {
       if (progress != null) {
         progress.error(ste);
@@ -106,15 +107,15 @@ static boolean download(URL source, File dest, ProgressMonitor progress) {
         progress.error(ioe);
         progress.cancel();
       }
-      // Hiding stack trace. An error has been shown where needed. 
+      // Hiding stack trace. An error has been shown where needed.
 //      ioe.printStackTrace();
     }
     if (progress != null)
       progress.finished();
     return success;
   }
 
-  
+
   /**
    * Non-blocking call to download and install a contribution in a new thread.
    *
@@ -143,10 +144,10 @@ public void run() {
 
           try {
             download(url, contribZip, downloadProgress);
-            
+
             if (!downloadProgress.isCanceled() && !downloadProgress.isError()) {
               installProgress.startTask(Language.text("contrib.progress.installing"), ProgressMonitor.UNKNOWN);
-              LocalContribution contribution = 
+              LocalContribution contribution =
                 ad.install(editor.getBase(), contribZip, false, status);
 
               if (contribution != null) {
@@ -196,11 +197,11 @@ public void run() {
 
   /**
    * Non-blocking call to download and install a contribution in a new thread.
-   * 
+   *
    * @param url
    *          Direct link to the contribution.
    * @param ad
-   *          The AvailableContribution to be downloaded and installed. 
+   *          The AvailableContribution to be downloaded and installed.
    */
   static void downloadAndInstallOnStartup(final Base base, final URL url,
                                           final AvailableContribution ad) {
@@ -215,7 +216,7 @@ public void run() {
 
           try {
             download(url, contribZip, null);
-            
+
             LocalContribution contribution = ad.install(base, contribZip,
                                                         false, null);
 
@@ -233,7 +234,7 @@ public void run() {
             }
 
             contribZip.delete();
-            
+
             handleUpdateFailedMarkers(ad, filename.substring(0, filename.lastIndexOf('.')));
 
           } catch (Exception e) {
@@ -353,27 +354,27 @@ static public String getFileName(File libFile) {
 
     return fileName;
   }
-  
-  
-  /** 
+
+
+  /**
    * Called by Base to clean up entries previously marked for deletion
    * and remove any "requires restart" flags.
    * Also updates all entries previously marked for update.
    */
   static public void cleanup(final Base base) throws Exception {
-    
+
     deleteTemp(Base.getSketchbookModesFolder());
     deleteTemp(Base.getSketchbookToolsFolder());
-    
+
     deleteFlagged(Base.getSketchbookLibrariesFolder());
     deleteFlagged(Base.getSketchbookModesFolder());
     deleteFlagged(Base.getSketchbookToolsFolder());
-    
+
     installPreviouslyFailed(base, Base.getSketchbookModesFolder());
     updateFlagged(base, Base.getSketchbookModesFolder());
-    
+
     updateFlagged(base, Base.getSketchbookToolsFolder());
-    
+
     SwingWorker s = new SwingWorker<Void, Void>() {
 
       @Override
@@ -389,8 +390,8 @@ protected Void doInBackground() throws Exception {
     };
     s.execute();
 
-    
-    
+
+
     clearRestartFlags(Base.getSketchbookModesFolder());
     clearRestartFlags(Base.getSketchbookToolsFolder());
   }
@@ -400,7 +401,7 @@ protected Void doInBackground() throws Exception {
    * Deletes the icky tmp folders that were left over from installs and updates
    * in the previous run of Processing. Needed to be called only on the tools
    * and modes sketchbook folders.
-   * 
+   *
    * @param root
    */
   static private void deleteTemp(File root) {
@@ -421,7 +422,7 @@ static private void deleteTemp(File root) {
 
   /**
    * Deletes all the modes/tools/libs that are flagged for removal.
-   * 
+   *
    * @param root
    * @throws Exception
    */
@@ -436,12 +437,12 @@ public boolean accept(File folder) {
       Base.removeDir(folder);
     }
   }
-  
-  
+
+
   /**
    * Installs all the modes/tools whose installation failed during an
    * auto-update the previous time Processing was started up.
-   * 
+   *
    * @param base
    * @param root
    * @throws Exception
@@ -470,7 +471,7 @@ public boolean accept(File folder) {
 
   /**
    * Updates all the flagged modes/tools.
-   * 
+   *
    * @param base
    * @param root
    * @throws Exception
@@ -502,24 +503,24 @@ else if (type.equalsIgnoreCase("libraries")) //putting this here, just in case
       updateContribsNames.add(properties.get("name"));
       Base.removeDir(folder);
     }
-    
+
     Iterator<AvailableContribution> iter = contribListing.advertisedContributions.iterator();
     while (iter.hasNext()) {
       AvailableContribution availableContribs = iter.next();
       if (updateContribsNames.contains(availableContribs.getName())) {
         updateContribsList.add(availableContribs);
       }
     }
-    
+
     Iterator<AvailableContribution> iter2 = updateContribsList.iterator();
     while (iter2.hasNext()) {
       AvailableContribution contribToUpdate = iter2.next();
       installOnStartUp(base, contribToUpdate);
       contribListing.replaceContribution(contribToUpdate, contribToUpdate);
     }
   }
-  
-  
+
+
   static private void installOnStartUp(final Base base, final AvailableContribution availableContrib) {
     if (availableContrib.link == null) {
       Base.showWarning(Language.interpolate("contrib.errors.update_on_restart_failed", availableContrib.getName()),
@@ -528,16 +529,16 @@ static private void installOnStartUp(final Base base, final AvailableContributio
     }
     try {
       URL downloadUrl = new URL(availableContrib.link);
-      
+
       ContributionManager.downloadAndInstallOnStartup(base, downloadUrl, availableContrib);
-      
+
     } catch (MalformedURLException e) {
       Base.showWarning(Language.interpolate("contrib.errors.update_on_restart_failed", availableContrib.getName()),
                        Language.text("contrib.errors.malformed_url"), e);
     }
   }
-  
-  
+
+
   static private void clearRestartFlags(File root) throws Exception {
     File[] folderList = root.listFiles(new FileFilter() {
       public boolean accept(File folder) {

app/src/processing/app/contrib/ContributionManagerDialog.java

@@ -459,11 +459,18 @@ protected void updateContributionListing() {
 
 
   protected void downloadAndUpdateContributionListing() {
-    status.setMessage(Language.text("contrib.status.downloading_list"));
     retryConnectingButton.setEnabled(false);
     contribListing.downloadAvailableList(new ProgressMonitor() {
-      
-      public void finished() {
+
+        @Override
+        public void setProgress(int value) {
+            super.setProgress(value);
+            int percent = (int)(value * 100.0f / this.max);
+            status.setMessage(Language.text("contrib.status.downloading_list") + " (" + percent + "%)");
+        }
+
+        @Override
+        public void finished() {
         super.finished();
 
         updateContributionListing();

app/src/processing/app/contrib/ProgressMonitor.java

@@ -15,7 +15,7 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along 
+  You should have received a copy of the GNU General Public License along
   with this program; if not, write to the Free Software Foundation, Inc.
   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
@@ -36,7 +36,7 @@
 //
 //  /**
 //   * Starts a new task with the given name.
-//   * 
+//   *
 //   * @param maxValue
 //   *          the amount of progress that must be made before a task is
 //   *          finished. This may be set to UNKNOWN.
@@ -64,28 +64,28 @@
 //   * Requests for the task to be cancelled by setting isCanceled() to true.
 //   */
 //  public void cancel();
-//  
+//
 //  /**
 //   * @return <code>true</code> if an error occured while completing the task
 //   */
 //  public boolean isError();
-//  
+//
 //  /**
 //   * @return an exception that caused the error, may be null.
 //   */
 //  public Exception getException();
-//  
+//
 //  /**
 //   * Indicates that an error occurred while performing the task. Exception may
 //   * be null.
 //   */
 //  public void error(Exception e);
-//  
+//
 //  /**
 //   * Returns true if this task is complete
 //   */
 //  public boolean isFinished();
-//  
+//
 //  /**
 //   * This is called when the current task is finished. This should always be
 //   * called when a task is finished, whether or not an error occurred or the
@@ -102,15 +102,16 @@ abstract class ProgressMonitor {
   boolean error = false;
   boolean finished = false;
   Exception exception;
+  int max;
   int progress = 0;
-  
+
   public void startTask(String name, int maxValue) {
   }
-  
+
   public void setProgress(int value) {
     progress = value;
   }
-  
+
   public int getProgress() {
     return progress;
   }
@@ -122,7 +123,7 @@ public boolean isCanceled() {
   public void cancel() {
     canceled = true;
   }
-  
+
   public boolean isError() {
     return error;
   }
@@ -135,11 +136,11 @@ public void error(Exception e) {
     error = true;
     exception = e;
   }
-  
+
   public boolean isFinished() {
     return finished;
   }
-  
+
   public void finished() {
     finished = true;
   }