isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

CSV export: allow spaces on filename and fix tests

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-06-04 22:06:01 -04:00
parent 650971bf36
commit cabcd5b1bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitTest.java
View File

@@ -366,9 +366,9 @@ public class HabitTest extends BaseTest
HabitFixtures.createShortHabit(); HabitFixtures.createShortHabit();
String expectedCSV = String expectedCSV =
"Name,Description,NumRepetitions,Interval,Color\n" + "Position,Name,Description,NumRepetitions,Interval,Color\n" +
"Meditate,Did you meditate this morning?,1,1,#AFB42B\n" + "001,Meditate,Did you meditate this morning?,1,1,#AFB42B\n" +
"Wake up early,Did you wake up before 6am?,2,3,#00897B\n"; "002,Wake up early,Did you wake up before 6am?,2,3,#00897B\n";
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
Habit.writeCSV(Habit.getAll(true), writer); Habit.writeCSV(Habit.getAll(true), writer);

2
app/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java
View File

@@ -81,7 +81,7 @@ public class HabitsCSVExporter
@NonNull @NonNull
private String sanitizeFilename(String name) private String sanitizeFilename(String name)
{ {
String s = name.replaceAll("[^a-zA-Z0-9\\._-]+", ""); String s = name.replaceAll("[^ a-zA-Z0-9\\._-]+", "");
return s.substring(0, Math.min(s.length(), 100)); return s.substring(0, Math.min(s.length(), 100));
} }