[#335] Getting package size fixed.

- conn.getContentLength() returns -1 when the file is sent in
chunks, so it cannot be used; instead it is computed.

Author: ilg-ul

bundles/ilg.gnumcueclipse.packs.data/src/ilg/gnumcueclipse/packs/cmsis/PdscParserForContent.java

@@ -11,13 +11,6 @@
 
 package ilg.gnumcueclipse.packs.cmsis;
 
-import ilg.gnumcueclipse.core.Xml;
-import ilg.gnumcueclipse.packs.core.tree.Node;
-import ilg.gnumcueclipse.packs.core.tree.Property;
-import ilg.gnumcueclipse.packs.core.tree.Type;
-import ilg.gnumcueclipse.packs.data.Activator;
-import ilg.gnumcueclipse.packs.data.Utils;
-
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
@@ -26,6 +19,13 @@
 
 import com.github.zafarkhaja.semver.Version;
 
+import ilg.gnumcueclipse.core.Xml;
+import ilg.gnumcueclipse.packs.core.tree.Node;
+import ilg.gnumcueclipse.packs.core.tree.Property;
+import ilg.gnumcueclipse.packs.core.tree.Type;
+import ilg.gnumcueclipse.packs.data.Activator;
+import ilg.gnumcueclipse.packs.data.Utils;
+
 public class PdscParserForContent extends PdscParser {
 
 	public void parse(String pdscNname, String version, Node parent) {
@@ -131,7 +131,7 @@ public void parse(String pdscNname, String version, Node parent) {
 				// Default as for unavailable packages
 				String size = "0";
 				try {
-					int sz = Utils.getRemoteFileSize(new URL(archiveUrl));
+					int sz = Utils.getRemoteFileSize(new URL(archiveUrl), fOut);
 					if (sz > 0) {
 						size = String.valueOf(sz);
 					}

bundles/ilg.gnumcueclipse.packs.data/src/ilg/gnumcueclipse/packs/data/Utils.java

@@ -33,9 +33,6 @@
 import org.eclipse.ui.console.MessageConsoleStream;
 
 import ilg.gnumcueclipse.core.StringUtils;
-import ilg.gnumcueclipse.packs.core.data.PacksStorage;
-import ilg.gnumcueclipse.packs.core.tree.Node;
-import ilg.gnumcueclipse.packs.xcdl.ContentSerialiser;
 
 public class Utils {
 
@@ -51,10 +48,11 @@ public static InputStream checkForUtf8BOM(InputStream inputStream) throws IOExce
 		return pushbackInputStream;
 	}
 
-	public static int getRemoteFileSize(URL url) throws IOException {
+	public static int getRemoteFileSize(URL url, MessageConsoleStream out) throws IOException {
 
 		URLConnection connection;
 		while (true) {
+			out.println("Getting size of \"" + url + "\"...");
 			connection = url.openConnection();
 			if ("file".equals(url.getProtocol())) { //$NON-NLS-1$
 				break;
@@ -79,6 +77,20 @@ public static int getRemoteFileSize(URL url) throws IOException {
 		}
 
 		int length = connection.getContentLength();
+		if (length < 0) {
+			// conn.getContentLength() returns -1 when the file is sent in
+			// chunks, so it cannot be used; instead it is computed.
+			InputStream input = connection.getInputStream();
+			int totalBytes = 0;
+			byte[] buf = new byte[1024];
+			int bytesRead;
+			while ((bytesRead = input.read(buf)) > 0) {
+				totalBytes += bytesRead;
+			}
+			input.close();
+			
+			length = totalBytes;
+		}
 
 		if (connection instanceof HttpURLConnection) {
 			((HttpURLConnection) connection).disconnect();
@@ -172,40 +184,40 @@ public static void copyFile(URL sourceUrl, File destinationFile, MessageConsoleS
 			}
 		}
 
-		int size = connection.getContentLength();
-		if (size <= 0) {
-			throw new IOException("Illegal PDSC file size " + size);
-		}
-		String sizeString = StringUtils.convertSizeToString(size);
-		if (out != null) {
-			String s = destinationFile.getPath();
-			if (s.endsWith(".download")) {
-				s = s.substring(0, s.length() - ".download".length());
-			}
-			out.println("Copy " + sizeString);
-			out.println(" from \"" + url + "\"");
-			if (!url.equals(sourceUrl)) {
-				out.println(" redirected from \"" + sourceUrl + "\"");
-			}
-			out.println(" to   \"" + s + "\"");
-		}
-
 		destinationFile.getParentFile().mkdirs();
 
 		InputStream input = connection.getInputStream();
 		OutputStream output = new FileOutputStream(destinationFile);
 
+		// conn.getContentLength() returns -1 when the file is sent in
+		// chunks, so it cannot be used; instead it is computed.
+		int totalBytes = 0;
+		
 		byte[] buf = new byte[1024];
 		int bytesRead;
 		while ((bytesRead = input.read(buf)) > 0) {
 			output.write(buf, 0, bytesRead);
 			if (monitor != null) {
 				monitor.worked(bytesRead);
 			}
+			totalBytes += bytesRead;
 		}
 		output.close();
 		input.close();
 
+		if (out != null) {
+			String s = destinationFile.getPath();
+			if (s.endsWith(".download")) {
+				s = s.substring(0, s.length() - ".download".length());
+			}
+			out.println("Copied " + totalBytes + " bytes");
+			out.println(" from \"" + url + "\"");
+			if (!url.equals(sourceUrl)) {
+				out.println(" redirected from \"" + sourceUrl + "\"");
+			}
+			out.println(" to   \"" + s + "\"");
+		}
+
 		if (connection instanceof HttpURLConnection) {
 			((HttpURLConnection) connection).disconnect();
 			// System.out.println("Disconnect "+connection);

bundles/ilg.gnumcueclipse.packs/src/ilg/gnumcueclipse/packs/jobs/InstallJob.java

@@ -114,7 +114,7 @@ protected IStatus run(IProgressMonitor monitor) {
 
 		int workUnits = 0;
 		for (int i = 0; i < packsToInstall.size(); ++i) {
-			workUnits += computeWorkUnits(packsToInstall.get(i));
+			workUnits += computeWorkUnits(packsToInstall.get(i), fOut);
 		}
 
 		workUnits++;
@@ -200,7 +200,7 @@ protected IStatus run(IProgressMonitor monitor) {
 		return status;
 	}
 
-	private int computeWorkUnits(Node versionNode) {
+	private int computeWorkUnits(Node versionNode, MessageConsoleStream out) {
 
 		int workUnits = 0;
 
@@ -215,7 +215,7 @@ private int computeWorkUnits(Node versionNode) {
 		String pdscUrl = packNode.getProperty(Property.ARCHIVE_URL);
 		if (pdscUrl.length() > 0) {
 			try {
-				int sz = Utils.getRemoteFileSize(new URL(pdscUrl));
+				int sz = Utils.getRemoteFileSize(new URL(pdscUrl), out);
 				if (sz > 0) {
 					workUnits += sz;
 				}