From f00e1d74931f74d66f172e78f669309a5b60e7ba Mon Sep 17 00:00:00 2001 From: jacqueline Date: Fri, 19 Jul 2024 16:11:22 +1000 Subject: Fix track ids containing '\n' not decoding properly This has been the cause of the elusive "selecting a track opens it like an index" bug :) --- src/tangara/database/records.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/tangara/database') diff --git a/src/tangara/database/records.cpp b/src/tangara/database/records.cpp index 88ddbd91..3e76ecad 100644 --- a/src/tangara/database/records.cpp +++ b/src/tangara/database/records.cpp @@ -19,6 +19,7 @@ #include "cppbor.h" #include "cppbor_parse.h" +#include "debug.hpp" #include "esp_log.h" #include "database/index.hpp" @@ -229,16 +230,16 @@ auto ParseIndexKey(const leveldb::Slice& slice) -> std::optional { std::istringstream in(key_data.substr(header_length + 1)); std::stringbuf buffer{}; + // FIXME: what if the item contains a '\0'? Probably we make a big mess. in.get(buffer, kFieldSeparator); if (buffer.str().size() > 0) { result.item = buffer.str(); } - buffer = {}; - in.get(buffer); - std::string id_str = buffer.str(); + std::string id_str = + key_data.substr(header_length + 1 + buffer.str().size() + 1); if (id_str.size() > 1) { - result.track = BytesToTrackId(id_str.substr(1)); + result.track = BytesToTrackId(id_str); } return result; @@ -252,6 +253,7 @@ auto BytesToTrackId(std::span bytes) -> std::optional { auto [res, unused, err] = cppbor::parse( reinterpret_cast(bytes.data()), bytes.size()); if (!res || res->type() != cppbor::UINT) { + ESP_LOGE(kTag, "Track ID parsing failed!!"); return {}; } return res->asUint()->unsignedValue(); -- cgit v1.2.3