finishing template implementation

benfry · benfry · commit 58e82a895c82 · 2016-08-10T19:16:07.000-04:00
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -241,30 +241,48 @@ public File addTemplateFiles(File sketchFolder,
     File newbieFile =
       new File(sketchFolder, sketchName + "." + getDefaultExtension());
 
-    // First see if the user has overridden the default template
-    File templateFolder = getUserTemplateFolder();
-    if (!templateFolder.exists()) {
-      // If not, see if the Mode has its own template
-      templateFolder = getTemplateFolder();
-    }
-    if (templateFolder.exists()) {
-      Util.copyDir(templateFolder, sketchFolder);
-      File templateFile =
-        new File(sketchFolder, "sketch." + getDefaultExtension());
-      if (!templateFile.renameTo(newbieFile)) {
-        throw new IOException("Error while assigning the sketch template.");
+    try {
+      // First see if the user has overridden the default template
+      File templateFolder = checkSketchbookTemplate();
+
+      // Next see if the Mode has its own template
+      if (templateFolder == null) {
+        templateFolder = getTemplateFolder();
       }
-    } else {
-      if (!newbieFile.createNewFile()) {
-        throw new IOException(newbieFile + " already exists.");
+      if (templateFolder.exists()) {
+        Util.copyDir(templateFolder, sketchFolder);
+        File templateFile =
+          new File(sketchFolder, "sketch." + getDefaultExtension());
+        if (!templateFile.renameTo(newbieFile)) {
+          System.err.println("Error while assigning the sketch template.");
+        }
+      } else {
+        if (!newbieFile.createNewFile()) {
+          System.err.println(newbieFile + " already exists.");
+        }
       }
+    } catch (Exception e) {
+      // just spew out this error and try to recover below
+      e.printStackTrace();
     }
     return newbieFile;
   }
 
 
-  public File getUserTemplateFolder() {
-    return new File(Base.getSketchbookTemplatesFolder(), getTitle());
+  /**
+   * See if the user has their own template for this Mode. If the default
+   * extension is "pde", this will look for a file called sketch.pde to use
+   * as the template for all sketches.
+   */
+  protected File checkSketchbookTemplate() {
+    File user = new File(Base.getSketchbookTemplatesFolder(), getTitle());
+    if (user.exists()) {
+      File template = new File(user, "sketch." + getDefaultExtension());
+      if (template.exists() && template.canRead()) {
+        return user;
+      }
+    }
+    return null;
   }
 
 
diff --git a/todo.txt b/todo.txt
@@ -23,15 +23,20 @@ X   https://github.com/processing/processing/issues/4606
 X change PdeInputHandler constructor
 X   check whether this breaks other Modes before releasing
 X   added extra constructor to keep things working
-_ allow modes to specify their own base file name
-_   need to move "is this a sketch?" handling into Mode
-_ favicon handling for p5jsMode
-_ move template subst code to Util
-_ in Mode: TokenMarker getTokenMarker(SketchCode code)
-_   passes through to no args version if not overridden
 X change PdeKeywords to PdeTokenMarker
 X   doesn't seem to cause any breakage, but will keep an eye out
 X added getSketchbookTemplatesFolder() to Base
+o move template subst code to Util
+X in Mode: TokenMarker getTokenMarker(SketchCode code)
+X   passes through to no args version if not overridden
+_   note this in the docs
+X implement templates
+_   write short docs
+_   https://github.com/processing/processing/issues/4306
+_   https://github.com/processing/processing/issues/4352
+
+_ allow modes to specify their own base file name
+_   need to move "is this a sketch?" handling into Mode
 
 _ modify line number color when no lines extend that far?
 _   https://github.com/processing/processing/pull/4560
