From 06aca259cbb84c41a002e5a93735b289cc2aa93a Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Wed, 22 Nov 2023 14:38:52 +1100
Subject: Add basic lua browser screen

---
 src/database/database.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/database/database.cpp')

diff --git a/src/database/database.cpp b/src/database/database.cpp
index 88ae7bbe..dad983d0 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -846,8 +846,7 @@ auto IndexRecord::Expand(std::size_t page_size) const
   if (track_) {
     return {};
   }
-  IndexKey::Header new_header = ExpandHeader(key_.header, key_.item);
-  std::string new_prefix = EncodeIndexPrefix(new_header);
+  std::string new_prefix = EncodeIndexPrefix(ExpandHeader());
   return Continuation{
       .prefix = {new_prefix.data(), new_prefix.size()},
       .start_key = {new_prefix.data(), new_prefix.size()},
@@ -857,6 +856,10 @@ auto IndexRecord::Expand(std::size_t page_size) const
   };
 }
 
+auto IndexRecord::ExpandHeader() const -> IndexKey::Header {
+  return ::database::ExpandHeader(key_.header, key_.item);
+}
+
 Iterator::Iterator(std::weak_ptr<Database> db, const IndexInfo& idx)
     : db_(db), pos_mutex_(), current_pos_(), prev_pos_() {
   std::string prefix = EncodeIndexPrefix(
@@ -887,6 +890,11 @@ auto Iterator::Next(Callback cb) -> void {
         db->dbGetPage<IndexRecord>(*current_pos_)};
     prev_pos_ = current_pos_;
     current_pos_ = res->next_page();
+    if (!res || res->values().empty() || !res->values()[0]) {
+      ESP_LOGI(kTag, "dropping empty result");
+      InvokeNull(cb);
+      return;
+    }
     std::invoke(cb, *res->values()[0]);
   });
 }
-- 
cgit v1.2.3