Fix: handling .ggb files

Author: mstfelg

desktop/src/main/java/org/geogebra/desktop/GeoGebra3D.java

@@ -96,23 +96,27 @@ public static void main(String[] args) {
 			fileArgs[i] = args[i];
 		}
 
-		prefs = new AppPrefs(objCfg, modPath);
-		GeoGebraFrame3D wnd = new GeoGebraFrame3D();
-		App3D app = new App3D(fileArgs, wnd, prefs);
-		wnd.init(app);
+		App3D app = appInstance(fileArgs);
 
 		if (!interactiveEh)
 			return;
 
         Scanner scanner = new Scanner(System.in);
         while (scanner.hasNextLine()) {
             String line = scanner.nextLine();
-            wnd.getApplication().getFullGuiManager()
+            app.getFullGuiManager()
 				.getFullAlgebraInput().sendCmd(line);
         }
         scanner.close();
 	}
-	
+
+	public static App3D appInstance(String[] fileArgs) {
+		GeoGebraFrame3D wnd = new GeoGebraFrame3D();
+		App3D app = new App3D(fileArgs, wnd, new AppPrefs(objCfg, modPath));
+		wnd.init(app);
+		return app;
+	}
+
 	private static void version() {
 		System.out.println(""
 			+ "GeoSquared v" + GeoGebraConstants.VERSION_STRING + " "

desktop/src/main/java/org/geogebra/desktop/main/AppD.java

@@ -43,6 +43,7 @@
 import java.awt.event.WindowListener;
 import java.awt.image.BufferedImage;
 import java.awt.image.MemoryImageSource;
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -474,7 +475,15 @@ public AppD(String[] args, JFrame frame, AppPrefs prefs) {
 		// loadModule clears up previous constructions
 		this.prefs = prefs;
 		this.prefs.applyTo(this);
+
 		boolean fileLoaded = false;
+		if (args != null && args[0] != null && !args[0].equals("")) {
+			fileLoaded = loadModule(Paths.get(args[0]));
+			if (!fileLoaded) {
+				System.out.println("Invalid file");
+				System.exit(1);
+			}
+		}
 
 		// initialize GUI
 		if (isUsingFullGui()) {
@@ -2684,30 +2693,37 @@ public String getExt(Path p) {
 		return fileName.substring(idx + 1);
 	}
 
+	public static InputStream ggb2gsq(Path ggbPath) throws IOException {
+		String target = "geogebra.xml";
+		ZipInputStream zstream = new ZipInputStream(Files.newInputStream(ggbPath));
+		ZipEntry entry;
+
+		while ((entry = zstream.getNextEntry()) != null)
+			if (entry.getName().equals(target))
+				return new BufferedInputStream(zstream);
+
+		zstream.close();
+		return null;
+	}
+
 	public boolean loadModule(Path p) {
 		String ext = getExt(p);
 		if (ext == null || ext.equals(""))
 			return false;
 
 		InputStream fstream;
 		try {
-			fstream = new FileInputStream(p.toFile());
+			fstream = Files.newInputStream(p);
 		} catch (Exception e) {return false;}
-
 		// Decompress first
 		if (ext.equals("ggb")) {
-			ZipInputStream zstream = new ZipInputStream(fstream);
-			ZipEntry entry;
 			try {
-				while ((entry = zstream.getNextEntry()) != null) {
-					// Construction file
-					if (entry.getName().equals("geogebra.xml")) {
-						fstream = new InflaterInputStream(zstream);
-						break;
-					}
+				fstream = ggb2gsq(p);
+				if (fstream == null) {
+					Log.error("Invalid GGB file");
+					return false;
 				}
-			}
-			catch (Exception e) {}
+			} catch (Exception e) {}
 		}
 
 		Reader freader = null;