Improve handing of tracks with missing titles

2 files changed, 4 insertions, 1 deletions

diff --git a/src/audio/fatfs_audio_input.cpp b/src/audio/fatfs_audio_input.cpp
index de64b14b..7726a94a 100644
--- a/src/audio/fatfs_audio_input.cpp
+++ b/src/audio/fatfs_audio_input.cpp
@@ -111,6 +111,9 @@ auto FatfsAudioInput::OpenFile(const std::string& path) -> bool {
     ESP_LOGE(kTag, "failed to read tags");
     return false;
   }
+  if (!tags->title()) {
+    tags->title(path);
+  }
 
   auto stream_type = ContainerToStreamType(tags->encoding());
   if (!stream_type.has_value()) {
diff --git a/src/database/track.cpp b/src/database/track.cpp
index 943606ce..141a9b7e 100644
--- a/src/database/track.cpp
+++ b/src/database/track.cpp
@@ -302,6 +302,6 @@ auto Track::TitleOrFilename() const -> std::pmr::string {
   if (start == std::pmr::string::npos) {
     return data().filepath;
   }
-  return data().filepath.substr(start);
+  return data().filepath.substr(start + 1);
 }
 }  // namespace database