Declare all folder names in a single source file (#2039)

portapack-mayhem · Mar 25, 2024 · d5c8525 · d5c8525
1 parent d9bbd1b
commit d5c8525
Show file tree

Hide file tree

Showing 56 changed files with 224 additions and 105 deletions.
diff --git a/firmware/application/CMakeLists.txt b/firmware/application/CMakeLists.txt
@@ -190,6 +190,7 @@ set(CPPSRC
 	event_m0.cpp
 	file_reader.cpp
 	file.cpp
+	file_path.cpp
 	freqman_db.cpp
 	freqman.cpp
 	io_convert.cpp

diff --git a/firmware/application/app_settings.cpp b/firmware/application/app_settings.cpp
@@ -30,6 +30,7 @@
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"
 
 #include <algorithm>
 #include <cstring>
@@ -40,7 +41,7 @@ using namespace portapack;
 
 namespace {
 fs::path get_settings_path(const std::string& app_name) {
-    return fs::path{SETTINGS_DIR} / app_name + u".ini";
+    return settings_dir / app_name + u".ini";
 }
 }  // namespace
 
@@ -156,7 +157,7 @@ bool save_settings(std::string_view store_name, const SettingBindings& bindings)
     File f;
     auto path = get_settings_path(std::string{store_name});
 
-    ensure_directory(SETTINGS_DIR);
+    ensure_directory(settings_dir);
     auto error = f.create(path);
     if (error)
         return false;

diff --git a/firmware/application/app_settings.hpp b/firmware/application/app_settings.hpp
@@ -36,9 +36,6 @@
 #include "max283x.hpp"
 #include "string_format.hpp"
 
-// Folder to store app settings, pmem_fileflag, and date_fileflag
-#define SETTINGS_DIR u"/SETTINGS"
-
 // Bring in the string_view literal.
 using std::literals::operator""sv;
 

diff --git a/firmware/application/apps/acars_app.cpp b/firmware/application/apps/acars_app.cpp
@@ -24,6 +24,7 @@
 
 #include "baseband_api.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "file_path.hpp"
 
 using namespace portapack;
 using namespace acars;
@@ -77,7 +78,7 @@ ACARSAppView::ACARSAppView(NavigationView& nav)
 
     logger = std::make_unique<ACARSLogger>();
     if (logger)
-        logger->append(LOG_ROOT_DIR "/ACARS.TXT");
+        logger->append(logs_dir / u"ACARS.TXT");
 }
 
 ACARSAppView::~ACARSAppView() {

diff --git a/firmware/application/apps/acars_app.hpp b/firmware/application/apps/acars_app.hpp
@@ -35,7 +35,7 @@
 
 class ACARSLogger {
    public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
         return log_file.append(filename);
     }
 

diff --git a/firmware/application/apps/ais_app.cpp b/firmware/application/apps/ais_app.cpp
@@ -23,6 +23,7 @@
 
 #include "string_format.hpp"
 #include "database.hpp"
+#include "file_path.hpp"
 
 #include "baseband_api.hpp"
 
@@ -399,7 +400,7 @@ AISAppView::AISAppView(NavigationView& nav)
 
     logger = std::make_unique<AISLogger>();
     if (logger) {
-        logger->append(LOG_ROOT_DIR "/AIS.TXT");
+        logger->append(logs_dir / u"AIS.TXT");
     }
 }
 

diff --git a/firmware/application/apps/ble_comm_app.cpp b/firmware/application/apps/ble_comm_app.cpp
@@ -32,6 +32,7 @@
 #include "string_format.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "ui_text.hpp"
+#include "file_path.hpp"
 
 using namespace portapack;
 using namespace modems;
@@ -100,7 +101,7 @@ BLECommView::BLECommView(NavigationView& nav)
         logging = v;
 
         if (logger && logging)
-            logger->append(LOG_ROOT_DIR "/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
+            logger->append(logs_dir.string() + "/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
     };
 
     options_channel.on_change = [this](size_t, int32_t i) {

diff --git a/firmware/application/apps/ble_comm_app.hpp b/firmware/application/apps/ble_comm_app.hpp
@@ -42,7 +42,7 @@
 
 class BLECommLogger {
    public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
         return log_file.append(filename);
     }
 

diff --git a/firmware/application/apps/ble_rx_app.cpp b/firmware/application/apps/ble_rx_app.cpp
@@ -470,10 +470,7 @@ BLERxView::BLERxView(NavigationView& nav)
         logging = v;
 
         if (logger && logging)
-            logger->append(
-                "BLERX/Logs"
-                "/BLELOG_" +
-                to_string_timestamp(rtc_time::now()) + ".TXT");
+            logger->append(blerx_dir.string() + "/Logs/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
     };
     check_log.set_value(logging);
 

diff --git a/firmware/application/apps/ble_rx_app.hpp b/firmware/application/apps/ble_rx_app.hpp
@@ -36,12 +36,13 @@
 #include "log_file.hpp"
 #include "utility.hpp"
 #include "usb_serial_thread.hpp"
+#include "file_path.hpp"
 
 #include "recent_entries.hpp"
 
 class BLELogger {
    public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
         return log_file.append(filename);
     }
 
@@ -133,7 +134,7 @@ class BleRecentEntryDetailView : public View {
     void on_save_file(const std::string value, BLETxPacket packetToSave);
     bool saveFile(const std::filesystem::path& path, BLETxPacket packetToSave);
     std::string packetFileBuffer{};
-    std::filesystem::path packet_save_path{u"BLERX/Lists/????.csv"};
+    std::filesystem::path packet_save_path{blerx_dir / u"Lists/????.csv"};
 
     static constexpr uint8_t total_data_lines{5};
 
@@ -250,9 +251,9 @@ class BLERxView : public View {
     uint64_t total_count = 0;
     std::vector<std::string> searchList{};
 
-    std::filesystem::path find_packet_path{u"BLERX/Find/????.TXT"};
-    std::filesystem::path log_packets_path{u"BLERX/Logs/????.TXT"};
-    std::filesystem::path packet_save_path{u"BLERX/Lists/????.csv"};
+    std::filesystem::path find_packet_path{blerx_dir / u"Find/????.TXT"};
+    std::filesystem::path log_packets_path{blerx_dir / u"Logs/????.TXT"};
+    std::filesystem::path packet_save_path{blerx_dir / u"Lists/????.csv"};
 
     static constexpr auto header_height = 4 * 16;
     static constexpr auto switch_button_height = 3 * 16;

diff --git a/firmware/application/apps/ble_tx_app.cpp b/firmware/application/apps/ble_tx_app.cpp
@@ -34,6 +34,7 @@
 #include "portapack_persistent_memory.hpp"
 #include "rtc_time.hpp"
 #include "string_format.hpp"
+#include "file_path.hpp"
 
 using namespace portapack;
 using namespace modems;

diff --git a/firmware/application/apps/ble_tx_app.hpp b/firmware/application/apps/ble_tx_app.hpp
@@ -36,6 +36,7 @@
 #include "replay_thread.hpp"
 #include "log_file.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"
 
 #include "recent_entries.hpp"
 
@@ -44,7 +45,7 @@
 
 class BLELoggerTx {
    public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
         return log_file.append(filename);
     }
 
@@ -138,7 +139,7 @@ class BLETxView : public View {
     uint32_t prev_value{0};
 
     std::filesystem::path file_path{};
-    std::filesystem::path packet_save_path{u"BLETX/BLETX_????.TXT"};
+    std::filesystem::path packet_save_path{bletx_dir / u"BLETX_????.TXT"};
     uint8_t channel_number = 37;
     bool auto_channel = false;
 
@@ -165,7 +166,7 @@ class BLETxView : public View {
 
     std::unique_ptr<FileWrapper> dataFileWrapper{};
     File dataFile{};
-    std::filesystem::path dataTempFilePath{u"BLETX/dataFileTemp.TXT"};
+    std::filesystem::path dataTempFilePath{bletx_dir / u"dataFileTemp.TXT"};
     std::vector<uint16_t> markedBytes{};
     CursorPos cursor_pos{};
     uint8_t marked_counter = 0;

diff --git a/firmware/application/apps/capture_app.hpp b/firmware/application/apps/capture_app.hpp
@@ -31,6 +31,7 @@
 #include "ui_spectrum.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
+#include "file_path.hpp"
 
 namespace ui {
 
@@ -101,7 +102,7 @@ class CaptureAppView : public View {
     RecordView record_view{
         {0 * 8, 2 * 16, 30 * 8, 1 * 16},
         u"BBD_????.*",
-        u"CAPTURES",
+        captures_dir,
         RecordView::FileType::RawS16,
         16384,
         3};

diff --git a/firmware/application/apps/ert_app.cpp b/firmware/application/apps/ert_app.cpp
@@ -31,6 +31,7 @@ using namespace portapack;
 
 #include "crc.hpp"
 #include "string_format.hpp"
+#include "file_path.hpp"
 
 namespace ert {
 
@@ -129,7 +130,7 @@ ERTAppView::ERTAppView(NavigationView& nav)
 
     logger = std::make_unique<ERTLogger>();
     if (logger) {
-        logger->append(LOG_ROOT_DIR "/ERT.TXT");
+        logger->append(logs_dir / u"ERT.TXT");
     }
 }
 

diff --git a/firmware/application/apps/pocsag_app.cpp b/firmware/application/apps/pocsag_app.cpp
@@ -27,6 +27,7 @@
 #include "portapack_persistent_memory.hpp"
 #include "string_format.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"
 
 using namespace portapack;
 using namespace pocsag;
@@ -115,7 +116,7 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav)
                                     : FILTER_DROP;
     }
 
-    logger.append(LOG_ROOT_DIR "/POCSAG.TXT");
+    logger.append(logs_dir / u"POCSAG.TXT");
 
     field_squelch.set_value(receiver_model.squelch_level());
     field_squelch.on_change = [this](int32_t v) {

diff --git a/firmware/application/apps/pocsag_app.hpp b/firmware/application/apps/pocsag_app.hpp
@@ -39,7 +39,7 @@
 
 class POCSAGLogger {
    public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
         return log_file.append(filename);
     }
 

diff --git a/firmware/application/apps/soundboard_app.cpp b/firmware/application/apps/soundboard_app.cpp
@@ -28,6 +28,7 @@
 #include "tonesets.hpp"
 #include "ui_tone_key.hpp"
 #include "audio.hpp"
+#include "file_path.hpp"
 
 using namespace tonekey;
 using namespace portapack;
@@ -164,7 +165,7 @@ void SoundBoardView::refresh_list() {
 
     // List directories and files, put directories up top
     uint32_t count = 0;
-    for (const auto& entry : std::filesystem::directory_iterator(u"WAV", u"*")) {
+    for (const auto& entry : std::filesystem::directory_iterator(wav_dir, u"*")) {
         if (std::filesystem::is_regular_file(entry.status())) {
             if (entry.path().string().length()) {
                 auto entry_extension = entry.path().extension().string();
@@ -173,7 +174,7 @@ void SoundBoardView::refresh_list() {
                     c = toupper(c);
 
                 if (entry_extension == ".WAV") {
-                    if (reader->open(u"/WAV/" + entry.path().native())) {
+                    if (reader->open(wav_dir / entry.path())) {
                         if ((reader->channels() == 1) && ((reader->bits_per_sample() == 8) || (reader->bits_per_sample() == 16))) {
                             // sounds[c].ms_duration = reader->ms_duration();
                             // sounds[c].path = u"WAV/" + entry.path().native();

diff --git a/firmware/application/apps/tpms_app.cpp b/firmware/application/apps/tpms_app.cpp
@@ -30,6 +30,7 @@ using namespace portapack;
 #include "string_format.hpp"
 
 #include "utility.hpp"
+#include "file_path.hpp"
 
 namespace tpms {
 
@@ -176,7 +177,7 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 
     logger = std::make_unique<TPMSLogger>();
     if (logger) {
-        logger->append(LOG_ROOT_DIR "/TPMS.TXT");
+        logger->append(logs_dir / u"TPMS.TXT");
     }
 }
 

diff --git a/firmware/application/apps/ui_adsb_rx.cpp b/firmware/application/apps/ui_adsb_rx.cpp
@@ -31,6 +31,7 @@
 #include "portapack_persistent_memory.hpp"
 #include "rtc_time.hpp"
 #include "string_format.hpp"
+#include "file_path.hpp"
 
 using namespace portapack;
 
@@ -390,7 +391,7 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {
     };
 
     logger = std::make_unique<ADSBLogger>();
-    logger->append(LOG_ROOT_DIR "/ADSB.TXT");
+    logger->append(logs_dir / u"ADSB.TXT");
 
     receiver_model.enable();
     baseband::set_adsb();

diff --git a/firmware/application/apps/ui_aprs_rx.cpp b/firmware/application/apps/ui_aprs_rx.cpp
@@ -27,6 +27,7 @@
 #include "baseband_api.hpp"
 #include "string_format.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "file_path.hpp"
 
 using namespace portapack;
 
@@ -111,7 +112,7 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
 
     logger = std::make_unique<APRSLogger>();
     if (logger)
-        logger->append(LOG_ROOT_DIR "/APRS.TXT");
+        logger->append(logs_dir / u"APRS.TXT");
 
     baseband::set_aprs(1200);
 

diff --git a/firmware/application/apps/ui_aprs_rx.hpp b/firmware/application/apps/ui_aprs_rx.hpp
@@ -36,10 +36,11 @@
 
 #include "log_file.hpp"
 #include "utility.hpp"
+#include "file_path.hpp"
 
 class APRSLogger {
    public:
-    Optional<File::Error> append(const std::string& filename) {
+    Optional<File::Error> append(const std::filesystem::path& filename) {
         return log_file.append(filename);
     }
 
@@ -232,7 +233,7 @@ class APRSRxView : public View {
     RecordView record_view{
         {0 * 8, 1 * 16, 30 * 8, 1 * 16},
         u"AFS_????.WAV",
-        u"APRS",
+        aprs_dir,
         RecordView::FileType::WAV,
         4096,
         4};