Skip to content

Commit

Permalink
Merge branch 'v0.3.x-bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
basiliscos committed May 11, 2024
2 parents c94bb12 + 8cd0a4b commit dcee961
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ find_package(uriparser REQUIRED)
find_package(tomlplusplus REQUIRED)
find_package(nlohmann_json REQUIRED)

set(SYNCSPIRIT_VERSION "v0.3.1")
set(SYNCSPIRIT_VERSION "v0.3.2")

configure_file(misc/syncspirit-config.h.in include/syncspirit-config.h @ONLY)
set(Protobuf_IMPORT_DIRS ${syncspirit_SOURCE_DIR}/src/protobuf)
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ after the core completion.

# changes

## 0.3.2 (11-May-2024)
- [bugfix] folder scan isn't triggered on startup

## 0.3.1 (23-Apr-2024)
- [feature] added `syncspirit` binary fow windows xp
- [build, docs] improved build documentation
Expand Down
5 changes: 4 additions & 1 deletion src/constants.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
// SPDX-FileCopyrightText: 2019-2022 Ivan Baidakou

#include "constants.h"
#include "syncspirit-config.h"

namespace syncspirit::constants {

const char *client_name = "syncspirit";
const char *issuer_name = "syncthing";
const char *protocol_name = "bep/1.0";
const char *relay_protocol_name = "bep-relay";
const char *client_version = "v0.01";
const char *client_version = SYNCSPIRIT_VERSION;

} // namespace syncspirit::constants
2 changes: 1 addition & 1 deletion src/ui-daemon/governor_actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void governor_actor_t::configure(r::plugin::plugin_base_t &plugin) noexcept {
plugin->subscribe_actor(&governor_actor_t::on_scan_completed, coordinator);
}
});
p.discover_name(net::names::fs_scanner, fs_scanner, true).link(false);
p.discover_name(net::names::fs_scanner, fs_scanner, true).link(true);
});
}

Expand Down
3 changes: 2 additions & 1 deletion tests/060-bep.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "model/device_id.h"
#include "utils/error_code.h"
#include "utils/uri.h"
#include "syncspirit-config.h"

using namespace syncspirit;
using namespace syncspirit::test;
Expand Down Expand Up @@ -77,7 +78,7 @@ TEST_CASE("hello", "[bep]") {
auto &msg = std::get<proto::message::Hello>(v.message);
CHECK(msg->device_name() == "test-device");
CHECK(msg->client_name() == "syncspirit");
CHECK(msg->client_version() == "v0.3.0");
CHECK(msg->client_version() == SYNCSPIRIT_VERSION);
}
}

Expand Down

0 comments on commit dcee961

Please sign in to comment.