[bugfix, win32] governor actor, fix parsing folder path

Author: basiliscos

CMakeLists.txt

@@ -32,7 +32,7 @@ find_package(uriparser REQUIRED)
 find_package(tomlplusplus REQUIRED)
 find_package(nlohmann_json REQUIRED)
 
-set(SYNCSPIRIT_VERSION "v0.3.2")
+set(SYNCSPIRIT_VERSION "v0.3.3")
 
 configure_file(misc/syncspirit-config.h.in include/syncspirit-config.h @ONLY)
 set(Protobuf_IMPORT_DIRS ${syncspirit_SOURCE_DIR}/src/protobuf)

src/ui-daemon/command/add_folder.cpp

@@ -19,8 +19,9 @@ outcome::result<command_ptr_t> add_folder_t::construct(std::string_view in) noex
     std::string id;
 
     auto it = pair_iterator_t(in);
+    bool skip_colon = false;
     while (true) {
-        auto r = it.next();
+        auto r = it.next(skip_colon);
         if (r) {
             auto &v = r.value();
             if (v.first == "label") {
@@ -29,6 +30,7 @@ outcome::result<command_ptr_t> add_folder_t::construct(std::string_view in) noex
                 path = v.second;
             } else if (v.first == "id") {
                 id = v.second;
+                skip_colon = true;
             }
         } else {
             break;
@@ -91,6 +93,8 @@ bool add_folder_t::execute(governor_actor_t &actor) noexcept {
         }
     }
 
+    log->debug("{}, going to add folder '{}' on '{}'", actor.get_identity(), folder.label(), folder.path());
+
     auto diff = cluster_diff_ptr_t(new modify::create_folder_t(folder));
     actor.send<model::payload::model_update_t>(actor.coordinator, std::move(diff), this);
     actor.add_callback(this, [&actor, folder_id = folder.id()]() -> bool {

src/ui-daemon/command/pair_iterator.cpp

@@ -5,10 +5,13 @@
 
 using namespace syncspirit::daemon::command;
 
-std::optional<pair_iterator_t::pair_t> pair_iterator_t::next() noexcept {
-    auto colon = in.find(":");
-    if (colon == in.npos) {
-        colon = in.size();
+std::optional<pair_iterator_t::pair_t> pair_iterator_t::next(bool skip_colon) noexcept {
+    auto colon = in.size();
+    if (!skip_colon) {
+        auto colon_pos = in.find(":");
+        if (colon_pos != in.npos) {
+            colon = colon_pos;
+        }
     }
 
     auto it = in.substr(0, colon);

src/ui-daemon/command/pair_iterator.h

@@ -14,7 +14,7 @@ struct pair_iterator_t {
 
     inline pair_iterator_t(std::string_view in_) noexcept : in(in_) {}
 
-    std::optional<pair_t> next() noexcept;
+    std::optional<pair_t> next(bool skip_colon = false) noexcept;
     std::string_view in;
 };