diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 2e9577e9c8..bd357ef59e 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -2345,7 +2345,7 @@ bool PresetCollection::reset_project_embedded_presets() return re_select; } -void PresetCollection::set_sync_info_and_save(std::string name, std::string setting_id, std::string syncinfo, long long update_time) +void PresetCollection::set_sync_info_and_save(std::string name, std::string setting_id, std::string syncinfo, long long update_time, const std::string& user_id) { lock(); const std::string canonical_name = this->canonical_preset_name(name); @@ -2363,7 +2363,10 @@ void PresetCollection::set_sync_info_and_save(std::string name, std::string sett preset2.save_info(); } } - preset->setting_id = setting_id; + if (!setting_id.empty()) + preset->setting_id = setting_id; + if (!user_id.empty()) + preset->user_id = user_id; if (update_time > 0) preset->updated_time = update_time; if (preset->sync_info == "update") @@ -2653,6 +2656,9 @@ bool PresetCollection::load_user_preset(std::string name, std::mapbase_id = based_id; iter->filament_id = cloud_filament_id; update_alias(*iter); + // Persist the cloud-assigned identity to disk, mirroring the equal/newer branch + // above; otherwise the id stays only in memory and the next launch rewrites it. + iter->save_info(); //presets_loaded.emplace_back(*it->second); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", update the user preset %1% from cloud, type %2%, setting_id %3%, base_id %4%, sync_info %5% inherits %6%, filament_id %7%") % iter->name %Preset::get_type_string(m_type) %iter->setting_id %iter->base_id %iter->sync_info %iter->inherits() % iter->filament_id; diff --git a/src/libslic3r/Preset.hpp b/src/libslic3r/Preset.hpp index 2b1fb372af..f06c8f4224 100644 --- a/src/libslic3r/Preset.hpp +++ b/src/libslic3r/Preset.hpp @@ -603,7 +603,7 @@ public: void update_after_user_presets_loaded(); //BBS: get user presets int get_user_presets(PresetBundle *preset_bundle, std::vector &result_presets); - void set_sync_info_and_save(std::string name, std::string setting_id, std::string syncinfo, long long update_time); + void set_sync_info_and_save(std::string name, std::string setting_id, std::string syncinfo, long long update_time, const std::string& user_id); bool need_sync(std::string name, std::string setting_id, long long update_time); //BBS: add function to generate differed preset for save diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 23ae29d8d7..756775a4d9 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -7204,11 +7204,11 @@ void GUI_App::sync_preset(Preset* preset, bool force) BOOST_LOG_TRIVIAL(trace) << "sync_preset: sync operation: " << preset->sync_info << " success! preset = " << preset->name; if (preset->type == Preset::Type::TYPE_FILAMENT) { - preset_bundle->filaments.set_sync_info_and_save(preset->name, setting_id, updated_info, update_time); + preset_bundle->filaments.set_sync_info_and_save(preset->name, setting_id, updated_info, update_time, m_agent->get_user_id()); } else if (preset->type == Preset::Type::TYPE_PRINT) { - preset_bundle->prints.set_sync_info_and_save(preset->name, setting_id, updated_info, update_time); + preset_bundle->prints.set_sync_info_and_save(preset->name, setting_id, updated_info, update_time, m_agent->get_user_id()); } else if (preset->type == Preset::Type::TYPE_PRINTER) { - preset_bundle->printers.set_sync_info_and_save(preset->name, setting_id, updated_info, update_time); + preset_bundle->printers.set_sync_info_and_save(preset->name, setting_id, updated_info, update_time, m_agent->get_user_id()); } } } @@ -7907,7 +7907,7 @@ void GUI_App::force_push_conflicting_preset(const std::string& setting_id) ? OrcaCloudServiceAgent::generate_uuid_for_setting_id(preset.name, user_id) : preset.setting_id; if (preset_id == setting_id) { - coll->set_sync_info_and_save(preset.name, setting_id, "update", 0); + coll->set_sync_info_and_save(preset.name, setting_id, "update", 0, user_id); break; } } diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp index c3e67afef1..7aa2b1ab2e 100644 --- a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp +++ b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp @@ -1129,6 +1129,19 @@ std::string OrcaCloudServiceAgent::request_setting_id(std::string name, if (http_code) *http_code = result.http_code; + // 409 duplicate_profile_uuid in the create path means the deterministic id we + // just generated already exists in this account: the earlier create succeeded. + // Adopt it instead of failing, so sync_preset persists the id and stops retrying. + if (result.http_code == 409 && result.conflict_code == -2 + && !result.server_version.id.empty() && result.server_version.id == new_id) { + if (values_map && result.server_version.updated_time != 0) + (*values_map)[IOT_JSON_KEY_UPDATED_TIME] = std::to_string(result.server_version.updated_time); + if (http_code) + *http_code = 200; + BOOST_LOG_TRIVIAL(info) << "OrcaCloudServiceAgent: request_setting_id adopted existing profile id " << new_id << " (409 duplicate_profile_uuid)"; + return new_id; + } + if (result.success) { if (values_map && result.new_updated_time != 0) { (*values_map)[IOT_JSON_KEY_UPDATED_TIME] = std::to_string(result.new_updated_time); @@ -1394,6 +1407,7 @@ SyncPushResult OrcaCloudServiceAgent::sync_push(const std::string& profile_id, SyncPushResult result; result.success = false; result.http_code = 0; + result.conflict_code = 0; result.server_deleted = false; nlohmann::json body; @@ -1429,20 +1443,30 @@ SyncPushResult OrcaCloudServiceAgent::sync_push(const std::string& profile_id, err_body = json; if (json.is_null()) { result.server_deleted = true; - } else { - auto& profile_data = json["server_profile"]; - result.server_version.id = profile_data.value("id", ""); - result.server_version.name = profile_data.value("name", ""); - result.server_version.updated_time = profile_data.value(ORCA_JSON_KEY_UPDATE_TIME, 0); + } else if (json.is_object()) { + result.conflict_code = json.value("code", 0); + if (json.contains("server_profile") && !json["server_profile"].is_null()) { + auto& profile_data = json["server_profile"]; + result.server_version.id = profile_data.value("id", ""); + result.server_version.name = profile_data.value("name", ""); + result.server_version.updated_time = profile_data.value(ORCA_JSON_KEY_UPDATE_TIME, 0); + } } } catch (...) {} - // Surface the conflict via the http-error callback with the local preset name injected. - // The raw server body omits the name for tombstone (-3) conflicts (server_profile is null), - // but the GUI needs it to regenerate the deterministic setting_id for a force push. - if (!err_body.is_object()) - err_body = nlohmann::json::object(); - err_body["name"] = name; - invoke_http_error_callback(409, err_body.dump()); + // Create-path duplicate_profile_uuid (-2) is an idempotent success: the deterministic id + // already exists, so the caller adopts the returned id. Skip the conflict notification, + // otherwise every already-imported preset would raise a Pull/Force-push prompt on each launch. + const bool is_create = original_updated_time.empty(); + const bool auto_resolved_duplicate = (is_create && result.conflict_code == -2); + if (!auto_resolved_duplicate) { + // Surface the conflict via the http-error callback with the local preset name injected. + // The raw server body omits the name for tombstone (-3) conflicts (server_profile is null), + // but the GUI needs it to regenerate the deterministic setting_id for a force push. + if (!err_body.is_object()) + err_body = nlohmann::json::object(); + err_body["name"] = name; + invoke_http_error_callback(409, err_body.dump()); + } result.error_message = response; return result; } diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.hpp b/src/slic3r/Utils/OrcaCloudServiceAgent.hpp index 458aa55fcd..d4a182db12 100644 --- a/src/slic3r/Utils/OrcaCloudServiceAgent.hpp +++ b/src/slic3r/Utils/OrcaCloudServiceAgent.hpp @@ -94,6 +94,7 @@ struct SyncPullResponse { struct SyncPushResult { bool success; int http_code; + int conflict_code; long long new_updated_time; ProfileUpsert server_version; bool server_deleted;