Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CURA-11035] Plugins specify a verion-range, slots just a version. #4

Merged
merged 2 commits into from
Sep 20, 2023
Merged

[CURA-11035] Plugins specify a verion-range, slots just a version. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e480544
Plugins specify a verion-range, slots just a version.
rburema Sep 15, 2023
b7b30ca
Use grpc definitions from testing
jellespijker Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import os
from pathlib import Path

from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
Expand Down Expand Up @@ -63,7 +62,7 @@ def layout(self):
cmake_layout(self)

def requirements(self):
self.requires("curaengine_grpc_definitions/latest@ultimaker/cura_10446")
self.requires("curaengine_grpc_definitions/latest@ultimaker/testing")
self.requires("asio-grpc/2.6.0")
self.requires("boost/1.82.0")
self.requires("spdlog/1.11.0")
Expand Down
4 changes: 2 additions & 2 deletions include/plugin/handshake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct Handshake
boost::asio::use_awaitable);

spdlog::info("Received handshake request");
spdlog::info("Slot ID: {}, slot version range: {}, plugin name: {}, plugin version: {}", static_cast<int>(request.slot_id()), request.version_range(), request.plugin_name(), request.plugin_version());
spdlog::info("Slot ID: {}, slot version: {}, plugin name: {}, plugin version: {}", static_cast<int>(request.slot_id()), request.version(), request.plugin_name(), request.plugin_version());

const bool exists = Settings::validatePlugin(request, metadata);
if (!exists)
Expand All @@ -52,7 +52,7 @@ struct Handshake

cura::plugins::slots::handshake::v0::CallResponse response;
response.set_plugin_name(static_cast<std::string>(metadata->plugin_name));
response.set_slot_version(static_cast<std::string>(metadata->slot_version));
response.set_slot_version_range(static_cast<std::string>(metadata->slot_version_range));
response.set_plugin_version(static_cast<std::string>(metadata->plugin_version));
for (auto slot_id : broadcast_subscriptions)
{
Expand Down
2 changes: 1 addition & 1 deletion include/plugin/metadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace plugin

struct Metadata
{
std::string_view slot_version{ "0.1.0-alpha" };
std::string_view slot_version_range{ ">=0.1.0" };
std::string_view plugin_name{ cmdline::NAME };
std::string_view plugin_version{ cmdline::VERSION };
};
Expand Down
Loading