mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-22 13:35:42 -05:00
#2742 System / Date / Talkgroup or Radio recording folder layout
Adds the layout and builds the preferences example path from the folder logic, so the example always matches where recordings are written (including the hour folder position). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -24,6 +24,7 @@ import io.github.dsheirer.preference.record.RecordPreference;
|
||||
import io.github.dsheirer.record.BasebandRecordFormat;
|
||||
import io.github.dsheirer.record.RecordFormat;
|
||||
import io.github.dsheirer.record.RecordingFolderLayout;
|
||||
import io.github.dsheirer.record.RecordingFolders;
|
||||
import javafx.beans.value.ChangeListener;
|
||||
import javafx.beans.value.ObservableValue;
|
||||
import javafx.geometry.Insets;
|
||||
@@ -105,9 +106,9 @@ public class RecordPreferenceEditor extends HBox
|
||||
Runnable updateExample = () -> {
|
||||
RecordingFolderLayout layout = layoutComboBox.getValue();
|
||||
hourFolder.setDisable(layout == null || !layout.hasDate());
|
||||
example.setText("Example: " + (layout == null || layout == RecordingFolderLayout.NONE ?
|
||||
"<recordings>/" : "<recordings>/" + layout.getExample() + "/" +
|
||||
(hourFolder.isSelected() ? "14/" : "")) + "<recording file>");
|
||||
String folders = layout != null ? RecordingFolders.getExample(layout, hourFolder.isSelected()) : "";
|
||||
example.setText("Example: <recordings>/" + (folders.isEmpty() ? "" : folders + "/") +
|
||||
"<recording file>");
|
||||
};
|
||||
layoutComboBox.valueProperty().addListener((observable, oldValue, layout) -> {
|
||||
if(layout != null)
|
||||
|
||||
@@ -24,32 +24,23 @@ package io.github.dsheirer.record;
|
||||
*/
|
||||
public enum RecordingFolderLayout
|
||||
{
|
||||
NONE("No subfolders", "<recordings>"),
|
||||
DATE("Date", "2026-11-22"),
|
||||
DATE_SYSTEM("Date / System", "2026-11-22/Metro"),
|
||||
SYSTEM_DATE("System / Date", "Metro/2026-11-22"),
|
||||
SYSTEM_SITE_DATE("System / Site / Date", "Metro/Site-1/2026-11-22"),
|
||||
SYSTEM_CHANNEL_DATE("System / Channel / Date", "Metro/Control-A/2026-11-22"),
|
||||
SYSTEM_TALKGROUP_DATE("System / Talkgroup or Radio / Date", "Metro/TG_1001/2026-11-22"),
|
||||
TALKGROUP_DATE("Talkgroup or Radio / Date", "TG_1001/2026-11-22");
|
||||
NONE("No subfolders"),
|
||||
DATE("Date"),
|
||||
DATE_SYSTEM("Date / System"),
|
||||
SYSTEM_DATE("System / Date"),
|
||||
SYSTEM_SITE_DATE("System / Site / Date"),
|
||||
SYSTEM_CHANNEL_DATE("System / Channel / Date"),
|
||||
SYSTEM_TALKGROUP_DATE("System / Talkgroup or Radio / Date"),
|
||||
SYSTEM_DATE_TALKGROUP("System / Date / Talkgroup or Radio"),
|
||||
TALKGROUP_DATE("Talkgroup or Radio / Date");
|
||||
|
||||
public static final RecordingFolderLayout DEFAULT = SYSTEM_DATE;
|
||||
|
||||
private final String mLabel;
|
||||
private final String mExample;
|
||||
|
||||
RecordingFolderLayout(String label, String example)
|
||||
RecordingFolderLayout(String label)
|
||||
{
|
||||
mLabel = label;
|
||||
mExample = example;
|
||||
}
|
||||
|
||||
/**
|
||||
* Example folder path for this layout
|
||||
*/
|
||||
public String getExample()
|
||||
{
|
||||
return mExample;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -66,7 +57,7 @@ public enum RecordingFolderLayout
|
||||
public boolean hasSystemFolder()
|
||||
{
|
||||
return this == DATE_SYSTEM || this == SYSTEM_DATE || this == SYSTEM_SITE_DATE || this == SYSTEM_CHANNEL_DATE ||
|
||||
this == SYSTEM_TALKGROUP_DATE;
|
||||
this == SYSTEM_TALKGROUP_DATE || this == SYSTEM_DATE_TALKGROUP;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -98,6 +98,17 @@ public final class RecordingFolders
|
||||
return folder;
|
||||
}
|
||||
|
||||
/**
|
||||
* Example recording folder path for the layout, for display in the preferences
|
||||
* @return e.g. Metro/2026-11-22/TG_1001
|
||||
*/
|
||||
public static String getExample(RecordingFolderLayout layout, boolean hourFolder)
|
||||
{
|
||||
long time = LocalDateTime.of(2026, 11, 22, 14, 0).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
|
||||
return String.join("/", getFolderNames(layout, hourFolder,
|
||||
new CallFolders("Metro", "Site 1", "Control A", "TG_1001"), time));
|
||||
}
|
||||
|
||||
/**
|
||||
* Subfolder names for the recording, outermost first.
|
||||
*/
|
||||
@@ -146,6 +157,12 @@ public final class RecordingFolders
|
||||
names.add(clean(folders.talkgroup(), UNKNOWN_TALKGROUP));
|
||||
names.add(date);
|
||||
}
|
||||
case SYSTEM_DATE_TALKGROUP ->
|
||||
{
|
||||
names.add(system);
|
||||
names.add(date);
|
||||
names.add(clean(folders.talkgroup(), UNKNOWN_TALKGROUP));
|
||||
}
|
||||
case TALKGROUP_DATE ->
|
||||
{
|
||||
names.add(clean(folders.talkgroup(), UNKNOWN_TALKGROUP));
|
||||
|
||||
@@ -64,6 +64,8 @@ public class RecordingFoldersTest
|
||||
assertEquals(List.of("Metro", "TG_1001", "2026-11-22"), names(RecordingFolderLayout.SYSTEM_TALKGROUP_DATE,
|
||||
false));
|
||||
assertEquals(List.of("TG_1001", "2026-11-22"), names(RecordingFolderLayout.TALKGROUP_DATE, false));
|
||||
assertEquals(List.of("Metro", "2026-11-22", "TG_1001"), names(RecordingFolderLayout.SYSTEM_DATE_TALKGROUP,
|
||||
false));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -71,6 +73,8 @@ public class RecordingFoldersTest
|
||||
{
|
||||
assertEquals(List.of("Metro", "2026-11-22", "14"), names(RecordingFolderLayout.SYSTEM_DATE, true));
|
||||
assertEquals(List.of("2026-11-22", "14", "Metro"), names(RecordingFolderLayout.DATE_SYSTEM, true));
|
||||
assertEquals(List.of("Metro", "2026-11-22", "14", "TG_1001"),
|
||||
names(RecordingFolderLayout.SYSTEM_DATE_TALKGROUP, true));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user