karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Export: filename template now distinguishes between {date} and {time}.

Browse Source
This commit is contained in:
Dennis Guse
2022-05-18 23:21:38 +02:00
parent 17ad13d559
commit 24eb768707
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/io/file/TrackFilenameGeneratorTest.java
+5 -4
View File
@@ -28,10 +28,11 @@ public class TrackFilenameGeneratorTest {
@Parameterized.Parameters @Parameterized.Parameters
public static Collection<String[]> data() { public static Collection<String[]> data() {
return Arrays.asList(new String[][]{ return Arrays.asList(new String[][]{
{"{uuid}_{name}", "0000fee0_Best Track.gpx" }, {"{uuid}_{name}", "0000fee0_Best Track.gpx"},
{"{name}_{uuid}", "Best Track_0000fee0.gpx" }, {"{name}_{uuid}", "Best Track_0000fee0.gpx"},
{"{time}_{name}", "2020-02-02T02_02_02Z_Best Track.gpx" }, {"{time}_{name}", "02_02_02_Best Track.gpx"},
{ApplicationProvider.getApplicationContext().getString(R.string.export_filename_format_default), "2020-02-02T02_02_02Z_Best Track.gpx" }, {"{date}_{name}", "2020-02-02_Best Track.gpx"},
{ApplicationProvider.getApplicationContext().getString(R.string.export_filename_format_default), "2020-02-02_02_02_02_Best Track.gpx"},
}); });
} }
src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
+5 -3
View File
@@ -21,10 +21,11 @@ public class TrackFilenameGenerator {
public static final String UUID_KEY = "{uuid}"; public static final String UUID_KEY = "{uuid}";
public static final String TRACKNAME_KEY = "{name}"; public static final String TRACKNAME_KEY = "{name}";
public static final String CATEGORY_KEY = "{category}"; public static final String CATEGORY_KEY = "{category}";
public static final String STARTTIME_KEY = "{time}"; public static final String STARTTIME_TIME_KEY = "{time}";
public static final String STARTTIME_DATE_KEY = "{date}";
public static String getAllOptions() { public static String getAllOptions() {
return Stream.of(UUID_KEY, TRACKNAME_KEY, CATEGORY_KEY, STARTTIME_KEY) return Stream.of(UUID_KEY, TRACKNAME_KEY, CATEGORY_KEY, STARTTIME_TIME_KEY, STARTTIME_DATE_KEY)
.collect(Collectors.joining(", ")); .collect(Collectors.joining(", "));
} }
@@ -40,7 +41,8 @@ public class TrackFilenameGenerator {
values.put(UUID_KEY, track.getUuid().toString().substring(0, 8)); values.put(UUID_KEY, track.getUuid().toString().substring(0, 8));
values.put(TRACKNAME_KEY, track.getName()); values.put(TRACKNAME_KEY, track.getName());
values.put(CATEGORY_KEY, track.getCategory()); values.put(CATEGORY_KEY, track.getCategory());
values.put(STARTTIME_KEY, track.getStartTime().toString()); values.put(STARTTIME_TIME_KEY, track.getStartTime().toLocalTime().toString());
values.put(STARTTIME_DATE_KEY, track.getStartTime().toLocalDate().toString());
return FileUtils.sanitizeFileName(format(template, values)) + "." + trackFileFormat.getExtension(); return FileUtils.sanitizeFileName(format(template, values)) + "." + trackFileFormat.getExtension();
} }
src/main/res/values/settings.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<bool name="post_workout_export_enabled_default" translatable="false">false</bool> <bool name="post_workout_export_enabled_default" translatable="false">false</bool>
<string name="export_filename_format_key" translatable="false">instantExportFilename</string> <string name="export_filename_format_key" translatable="false">instantExportFilename</string>
<string name="export_filename_format_default" translatable="false">{time}_{name}</string> <string name="export_filename_format_default" translatable="false">{date}_{time}_{name}</string>
<string name="settings_import" translatable="false">settingsImport</string> <string name="settings_import" translatable="false">settingsImport</string>
<string name="settings_export" translatable="false">settingsExport</string> <string name="settings_export" translatable="false">settingsExport</string>