cats: convert first element to number or return zero in case of error

- adds a bit more readability to the code
bareos · Sep 24, 2020 · 909948c · 909948c
1 parent 9e83658
commit 909948c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/core/src/cats/cats.h b/core/src/cats/cats.h
@@ -499,6 +499,14 @@ class db_list_ctx : public BStringList {
   void add(JobId_t id) { push_back(std::to_string(id)); }
 
   std::string GetAsString() { return Join(','); }
+  uint64_t GetFrontAsInteger()
+  {
+    try {
+      return std::stoull(at(0));
+    } catch (...) {
+      return 0;
+    }
+  }
 };
 
 typedef enum

diff --git a/core/src/dird/backup.cc b/core/src/dird/backup.cc
@@ -357,7 +357,7 @@ bool SendAccurateCurrentFiles(JobControlRecord* jcr)
   jcr->file_bsock->fsend("accurate files=%s\n", nb.GetAsString().c_str());
 
   if (jcr->HasBase) {
-    jcr->nb_base_files = str_to_int64(nb.GetAsString().c_str());
+    jcr->nb_base_files = nb.GetFrontAsInteger();
     if (!jcr->db->CreateBaseFileList(jcr, jobids.GetAsString().c_str())) {
       Jmsg(jcr, M_FATAL, 0, "error in jcr->db->CreateBaseFileList:%s\n",
            jcr->db->strerror());

diff --git a/core/src/tests/test_db_list_ctx.cc b/core/src/tests/test_db_list_ctx.cc
@@ -102,3 +102,16 @@ TEST(db_list_ctx, list)
   EXPECT_TRUE(bstrcmp(list1.GetAsString().c_str(), "11,12,13"));
   EXPECT_STREQ(list1.GetAsString().c_str(), "11,12,13");
 }
+
+TEST(db_list_ctx, GetFrontAsInteger)
+{
+  db_list_ctx nb;
+
+  EXPECT_EQ(0, nb.GetFrontAsInteger());
+
+  nb.add(11);
+  EXPECT_EQ(11, nb.GetFrontAsInteger());
+
+  nb.add(12);
+  EXPECT_EQ(11, nb.GetFrontAsInteger());
+}