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: sanitize habit name before creating folder

Browse Source 
Fix #113
This commit is contained in:
Alinson S. Xavier
2016-05-25 10:05:54 -04:00
parent a4b6728721
commit 88e8aad0d8
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,8 @@
package org.isoron.uhabits.io; package org.isoron.uhabits.io;
import android.support.annotation.NonNull;
import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.CheckmarkList; import org.isoron.uhabits.models.CheckmarkList;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
@@ -64,7 +66,10 @@ public class HabitsCSVExporter
for(Habit h : habits) for(Habit h : habits)
{ {
String habitDirName = String.format("%03d %s/", h.position + 1, h.name); String sane = sanitizeFilename(h.name);
String habitDirName = String.format("%03d %s", h.position + 1, sane);
habitDirName = habitDirName.trim() + "/";
new File(exportDirName + habitDirName).mkdirs(); new File(exportDirName + habitDirName).mkdirs();
generateDirs.add(habitDirName); generateDirs.add(habitDirName);
@@ -73,6 +78,13 @@ public class HabitsCSVExporter
} }
} }
@NonNull
private String sanitizeFilename(String name)
{
String s = name.replaceAll("[^a-zA-Z0-9\\._-]+", "");
return s.substring(0, Math.min(s.length(), 100));
}
private void writeScores(String habitDirName, ScoreList scores) throws IOException private void writeScores(String habitDirName, ScoreList scores) throws IOException
{ {
String path = habitDirName + "Scores.csv"; String path = habitDirName + "Scores.csv";

3
app/src/main/java/org/isoron/uhabits/models/Habit.java
View File

@@ -489,7 +489,7 @@ public class Habit extends Model
*/ */
public static void writeCSV(List<Habit> habits, Writer out) throws IOException public static void writeCSV(List<Habit> habits, Writer out) throws IOException
{ {
String header[] = { "Name", "Description", "NumRepetitions", "Interval", "Color" }; String header[] = { "Position", "Name", "Description", "NumRepetitions", "Interval", "Color" };
CSVWriter csv = new CSVWriter(out); CSVWriter csv = new CSVWriter(out);
csv.writeNext(header, false); csv.writeNext(header, false);
@@ -498,6 +498,7 @@ public class Habit extends Model
{ {
String[] cols = String[] cols =
{ {
String.format("%03d", habit.position + 1),
habit.name, habit.name,
habit.description, habit.description,
Integer.toString(habit.freqNum), Integer.toString(habit.freqNum),