Merge pull request arduino#1773 from oni303/minus_support

added support for '-' in filenames
frezik · Mar 4, 2014 · 4c8199e · 4c8199e
2 parents 2380a8f + efedfa7
commit 4c8199e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
@@ -2063,9 +2063,10 @@ static public String sanitizeName(String origName) {
     for (int i = 0; i < c.length; i++) {
       if (((c[i] >= '0') && (c[i] <= '9')) ||
           ((c[i] >= 'a') && (c[i] <= 'z')) ||
-          ((c[i] >= 'A') && (c[i] <= 'Z'))) {
+          ((c[i] >= 'A') && (c[i] <= 'Z')) ||
+          ((i > 0) && (c[i] == '-')) ||
+          ((i > 0) && (c[i] == '.'))) {
         buffer.append(c[i]);
-
       } else {
         buffer.append('_');
       }

diff --git a/app/src/processing/app/SketchCode.java b/app/src/processing/app/SketchCode.java
@@ -87,7 +87,7 @@ public SketchCode(File file, String extension) {
 
   protected void makePrettyName() {
     prettyName = file.getName();
-    int dot = prettyName.indexOf('.');
+    int dot = prettyName.lastIndexOf('.');
     prettyName = prettyName.substring(0, dot);
   }