mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-12 03:27:55 +00:00
feature add function for web to get the machine storage space.
This commit is contained in:
@@ -4853,8 +4853,9 @@ void GUI_App::check_new_version_sf(bool show_tips, bool by_user)
|
|||||||
|
|
||||||
Semver server_version = get_version(version_info.version_str, matcher);
|
Semver server_version = get_version(version_info.version_str, matcher);
|
||||||
|
|
||||||
if (current_version >= server_version && by_user) {
|
if (current_version >= server_version) {
|
||||||
this->no_new_version();
|
if(by_user)
|
||||||
|
this->no_new_version();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2084,11 +2084,9 @@ void SSWCP_MachineOption_Instance::process()
|
|||||||
sw_ServerClientManagerSetUserinfo();
|
sw_ServerClientManagerSetUserinfo();
|
||||||
} else if (m_cmd == "sw_DefectDetactionConfig"){
|
} else if (m_cmd == "sw_DefectDetactionConfig"){
|
||||||
sw_DefectDetactionConfig();
|
sw_DefectDetactionConfig();
|
||||||
} else if (m_cmd == GETCAMERA_TIMELAPSE_INSTANCE) {
|
}
|
||||||
CmdForwarding();
|
|
||||||
}
|
|
||||||
else if (m_cmd == GET_DEVICEDATA_STORAGESPACE) {
|
else if (m_cmd == GET_DEVICEDATA_STORAGESPACE) {
|
||||||
CmdForwarding();
|
sw_GetDeviceDataStorageSpace();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
handle_general_fail();
|
handle_general_fail();
|
||||||
@@ -3674,6 +3672,28 @@ void SSWCP_MachineOption_Instance::sw_UploadCameraTimelapse()
|
|||||||
handle_general_fail();
|
handle_general_fail();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void SSWCP_MachineOption_Instance::CmdForwarding()
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
std::shared_ptr<PrintHost> host = nullptr;
|
||||||
|
wxGetApp().get_connect_host(host);
|
||||||
|
|
||||||
|
if (!host) {
|
||||||
|
handle_general_fail(-1, "Connection lost!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto weak_self = std::weak_ptr<SSWCP_Instance>(shared_from_this());
|
||||||
|
host->test_async_wcp_mqtt_moonraker(m_param_data, [weak_self](const json& response) {
|
||||||
|
auto self = weak_self.lock();
|
||||||
|
if (self) {
|
||||||
|
SSWCP_Instance::on_mqtt_msg_arrived(self, response);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (std::exception& e) {
|
||||||
|
handle_general_fail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void SSWCP_MachineOption_Instance::sw_GetTimelapseInstance()
|
void SSWCP_MachineOption_Instance::sw_GetTimelapseInstance()
|
||||||
{
|
{
|
||||||
@@ -3698,8 +3718,9 @@ void SSWCP_MachineOption_Instance::sw_GetTimelapseInstance()
|
|||||||
handle_general_fail();
|
handle_general_fail();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void SSWCP_MachineOption_Instance::sw_GetDeviceDataStorageSpace()
|
||||||
|
{
|
||||||
|
|
||||||
void SSWCP_MachineOption_Instance::CmdForwarding() {
|
|
||||||
try {
|
try {
|
||||||
std::shared_ptr<PrintHost> host = nullptr;
|
std::shared_ptr<PrintHost> host = nullptr;
|
||||||
wxGetApp().get_connect_host(host);
|
wxGetApp().get_connect_host(host);
|
||||||
@@ -3710,7 +3731,7 @@ void SSWCP_MachineOption_Instance::CmdForwarding() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto weak_self = std::weak_ptr<SSWCP_Instance>(shared_from_this());
|
auto weak_self = std::weak_ptr<SSWCP_Instance>(shared_from_this());
|
||||||
host->async_delete_camera_timelapse(m_param_data, [weak_self](const json& response) {
|
host->async_get_userdata_space(m_param_data, [weak_self](const json& response) {
|
||||||
auto self = weak_self.lock();
|
auto self = weak_self.lock();
|
||||||
if (self) {
|
if (self) {
|
||||||
SSWCP_Instance::on_mqtt_msg_arrived(self, response);
|
SSWCP_Instance::on_mqtt_msg_arrived(self, response);
|
||||||
@@ -3721,7 +3742,6 @@ void SSWCP_MachineOption_Instance::CmdForwarding() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SSWCP_MachineOption_Instance::sw_DeleteCameraTimelapse()
|
void SSWCP_MachineOption_Instance::sw_DeleteCameraTimelapse()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
@@ -5844,7 +5864,6 @@ std::unordered_set<std::string> SSWCP::m_machine_option_cmd_list = {
|
|||||||
"sw_GetTimelapseInstance",
|
"sw_GetTimelapseInstance",
|
||||||
"sw_ServerClientManagerSetUserinfo",
|
"sw_ServerClientManagerSetUserinfo",
|
||||||
"sw_DefectDetactionConfig",
|
"sw_DefectDetactionConfig",
|
||||||
GETCAMERA_TIMELAPSE_INSTANCE,
|
|
||||||
GET_DEVICEDATA_STORAGESPACE
|
GET_DEVICEDATA_STORAGESPACE
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -5936,7 +5955,6 @@ void SSWCP::handle_web_message(std::string message, wxWebView* webview) {
|
|||||||
if (payload.count("event_id") && !payload["event_id"].is_null()) {
|
if (payload.count("event_id") && !payload["event_id"].is_null()) {
|
||||||
event_id = payload["event_id"].get<std::string>();
|
event_id = payload["event_id"].get<std::string>();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<SSWCP_Instance> instance = create_sswcp_instance(cmd, header, params, event_id, webview);
|
std::shared_ptr<SSWCP_Instance> instance = create_sswcp_instance(cmd, header, params, event_id, webview);
|
||||||
if (instance) {
|
if (instance) {
|
||||||
if (event_id != "") {
|
if (event_id != "") {
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ using tcp = asio::ip::tcp;
|
|||||||
#define GET_PRIVACY_STATUS "sw_GetUserUpdatePrivacy"
|
#define GET_PRIVACY_STATUS "sw_GetUserUpdatePrivacy"
|
||||||
#define UPLOAD_CAMERA_TIMELAPSE "sw_UploadCameraTimelapse"
|
#define UPLOAD_CAMERA_TIMELAPSE "sw_UploadCameraTimelapse"
|
||||||
#define DELETE_CAMERA_TIMELAPSE "sw_DeleteCameraTimelapse"
|
#define DELETE_CAMERA_TIMELAPSE "sw_DeleteCameraTimelapse"
|
||||||
#define GETCAMERA_TIMELAPSE_INSTANCE "sw_GetCameraTimelapseInstance"
|
|
||||||
#define GET_DEVICEDATA_STORAGESPACE "sw_GetDeviceDataStorageSpace"
|
#define GET_DEVICEDATA_STORAGESPACE "sw_GetDeviceDataStorageSpace"
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
@@ -426,6 +425,8 @@ private:
|
|||||||
|
|
||||||
void sw_DefectDetactionConfig();
|
void sw_DefectDetactionConfig();
|
||||||
|
|
||||||
|
void sw_GetDeviceDataStorageSpace();
|
||||||
|
|
||||||
void CmdForwarding();
|
void CmdForwarding();
|
||||||
|
|
||||||
// Download machine file
|
// Download machine file
|
||||||
|
|||||||
@@ -2399,6 +2399,30 @@ void Moonraker_Mqtt::async_get_timelapse_instance(const nlohmann::json& targets,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//get the mechine local storage space
|
||||||
|
void Moonraker_Mqtt::async_get_userdata_space(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)> callback)
|
||||||
|
{
|
||||||
|
auto& wcp_loger = GUI::WCP_Logger::getInstance();
|
||||||
|
std::string method = "camera.get_timelapse_instance";
|
||||||
|
|
||||||
|
json params = json::object();
|
||||||
|
|
||||||
|
params = targets;
|
||||||
|
|
||||||
|
if (!send_to_request(method, params, true, callback,
|
||||||
|
[callback, &wcp_loger]() {
|
||||||
|
BOOST_LOG_TRIVIAL(warning) << "[Moonraker_Mqtt] get uoser storage space";
|
||||||
|
wcp_loger.add_log("get uoser storage space timeout", false, "", "Moonraker_Mqtt", "warning");
|
||||||
|
json res;
|
||||||
|
res["error"] = "timeout";
|
||||||
|
callback(res);
|
||||||
|
}) &&callback) {
|
||||||
|
BOOST_LOG_TRIVIAL(error) << "[Moonraker_Mqtt]send the cmd to get uoser storage space fail";
|
||||||
|
wcp_loger.add_log("send the cmd to get uoser storage space fail", false, "", "Moonraker_Mqtt", "error");
|
||||||
|
callback(json::value_t::null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 请求删除延时摄影文件
|
// 请求删除延时摄影文件
|
||||||
void Moonraker_Mqtt::async_delete_camera_timelapse(const nlohmann::json& targets,
|
void Moonraker_Mqtt::async_delete_camera_timelapse(const nlohmann::json& targets,
|
||||||
std::function<void(const nlohmann::json& response)> callback)
|
std::function<void(const nlohmann::json& response)> callback)
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ public:
|
|||||||
|
|
||||||
virtual void async_defect_detaction_config(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
virtual void async_defect_detaction_config(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
||||||
|
|
||||||
|
virtual void async_get_userdata_space(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// Internal upload implementations
|
// Internal upload implementations
|
||||||
@@ -272,6 +273,8 @@ public:
|
|||||||
|
|
||||||
virtual void async_get_timelapse_instance(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) override;
|
virtual void async_get_timelapse_instance(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) override;
|
||||||
|
|
||||||
|
virtual void async_get_userdata_space(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) override;
|
||||||
|
|
||||||
virtual void async_defect_detaction_config(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) override;
|
virtual void async_defect_detaction_config(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) override;
|
||||||
|
|
||||||
void set_connection_lost(std::function<void()> callback) override;
|
void set_connection_lost(std::function<void()> callback) override;
|
||||||
|
|||||||
@@ -170,6 +170,8 @@ public:
|
|||||||
virtual void async_delete_camera_timelapse(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
virtual void async_delete_camera_timelapse(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
||||||
|
|
||||||
virtual void async_get_timelapse_instance(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
virtual void async_get_timelapse_instance(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
||||||
|
|
||||||
|
virtual void async_get_userdata_space(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
||||||
|
|
||||||
virtual void async_defect_detaction_config(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
virtual void async_defect_detaction_config(const nlohmann::json& targets, std::function<void(const nlohmann::json& response)>) {}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user