finishing up protocol handler for Windows

benfry · benfry · commit 57ee4c6832cc · 2023-02-16T07:48:27.000-05:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -1362,31 +1362,35 @@ private File moveLikeSketchFolder(File pdeFile, String baseName) throws IOExcept
 
 
   /**
-   * Handling pde:// URLs
-   * @param location everything after pde://
+   * Handler for pde:// protocol URIs
+   * @param schemeUri the full URI, including pde://
    */
-  public void handleLocation(String location) {
-    // if it leads with a slash, then it's a file url
-    if (location.charAt(0) == '/') {
-      handleOpen(location);  // it's a full path to a file
-    } else {
-      // turn it into an https url
-      final String url = "https://" + location;
-      if (location.toLowerCase().endsWith(".pdez") ||
-        location.toLowerCase().endsWith(".pdex")) {
-        String extension = location.substring(location.length() - 5);
-        try {
-          File tempFile = File.createTempFile("scheme", extension);
-          if (PApplet.saveStream(tempFile, Util.createInput(url))) {
-            handleOpen(tempFile.getAbsolutePath());
-          } else {
-            System.err.println("Could not open " + tempFile);
+  public Editor handleScheme(String schemeUri) {
+    String location = schemeUri.substring(6);
+    if (location.length() > 0) {
+      // if it leads with a slash, then it's a file url
+      if (location.charAt(0) == '/') {
+        handleOpen(location);  // it's a full path to a file
+      } else {
+        // turn it into an https url
+        final String url = "https://" + location;
+        if (location.toLowerCase().endsWith(".pdez") ||
+          location.toLowerCase().endsWith(".pdex")) {
+          String extension = location.substring(location.length() - 5);
+          try {
+            File tempFile = File.createTempFile("scheme", extension);
+            if (PApplet.saveStream(tempFile, Util.createInput(url))) {
+              return handleOpen(tempFile.getAbsolutePath());
+            } else {
+              System.err.println("Could not open " + tempFile);
+            }
+          } catch (IOException e) {
+            e.printStackTrace();
           }
-        } catch (IOException e) {
-          e.printStackTrace();
         }
       }
     }
+    return null;
   }
 
 
@@ -1395,6 +1399,10 @@ public void handleLocation(String location) {
    * Note that the user may have selected/double-clicked any .pde in a sketch.
    */
   public Editor handleOpen(String path) {
+    if (path.startsWith("pde://")) {
+      return handleScheme(path);
+    }
+
     if (path.endsWith(SKETCH_BUNDLE_EXT)) {
       return openSketchBundle(path);
 
diff --git a/app/src/processing/app/platform/DefaultPlatform.java b/app/src/processing/app/platform/DefaultPlatform.java
@@ -26,8 +26,6 @@
 import java.awt.Desktop;
 import java.awt.Font;
 import java.io.File;
-import java.io.IOException;
-import java.net.URI;
 
 import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
@@ -39,7 +37,6 @@
 
 import processing.app.Base;
 import processing.app.Preferences;
-import processing.app.Util;
 import processing.app.ui.Toolkit;
 import processing.awt.ShimAWT;
 import processing.core.PApplet;
diff --git a/app/src/processing/app/platform/MacPlatform.java b/app/src/processing/app/platform/MacPlatform.java
@@ -33,7 +33,6 @@
 
 import processing.app.Base;
 import processing.app.Messages;
-import processing.app.Util;
 import processing.app.ui.About;
 import processing.core.PApplet;
 import processing.data.StringList;
@@ -95,11 +94,12 @@ public void initBase(Base base) {
 
     desktop.setOpenURIHandler((event) -> {
       // https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html
-      URI uri = event.getURI();
-      String location = uri.toString().substring(6);
-      if (location.length() > 0) {
-        base.handleLocation(location);
-      }
+//      URI uri = event.getURI();
+      base.handleScheme(event.getURI().toString());
+//      String location = uri.toString().substring(6);
+//      if (location.length() > 0) {
+//        base.handleLocation(location);
+//      }
     });
   }
 
