Skip to content

Commit

Permalink
wip: bambu-studio
Browse files Browse the repository at this point in the history
  • Loading branch information
@emilazy
emilazy committed Nov 24, 2024
1 parent 476ac06 commit d3e3e76
Show file tree
Hide file tree
Showing 5 changed files with 439 additions and 2 deletions.
271 changes: 271 additions & 0 deletions pkgs/applications/misc/bambu-studio/boost-update-1.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
From c7630f8b52c8220e1f2620a78f267e2e945e0e23 Mon Sep 17 00:00:00 2001
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <[email protected]>
Date: Fri, 26 Apr 2024 09:56:49 -0700
Subject: [PATCH] Replace deprecated boost/filesystem/string_file.hpp header

---
src/libslic3r/Format/bbs_3mf.cpp | 48 ++++++++++++++++++-------
src/libslic3r/Model.cpp | 6 ++--
src/slic3r/GUI/MediaPlayCtrl.cpp | 9 +++--
src/slic3r/Utils/PresetUpdater.cpp | 56 +++++++++++++++++++++++++-----
4 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp
index aaa4c900a..3da5f3f91 100644
--- a/src/libslic3r/Format/bbs_3mf.cpp
+++ b/src/libslic3r/Format/bbs_3mf.cpp
@@ -23,7 +23,6 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/string_file.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/nowide/fstream.hpp>
#include <boost/nowide/cstdio.hpp>
@@ -1237,12 +1236,19 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
m_backup_path = filename.substr(0, filename.size() - 5);
model.set_backup_path(m_backup_path);
try {
- if (boost::filesystem::exists(model.get_backup_path() + "/origin.txt"))
- boost::filesystem::load_string_file(model.get_backup_path() + "/origin.txt", m_origin_file);
+ std::string filepath = model.get_backup_path() + "/origin.txt";
+ if (boost::filesystem::exists(filepath)) {
+ boost::filesystem::ifstream originfile(filepath);
+ m_origin_file.assign(
+ (std::istreambuf_iterator<char>(originfile)),
+ (std::istreambuf_iterator<char>())
+ );
+ originfile.close();
+ }
} catch (...) {}
- boost::filesystem::save_string_file(
- model.get_backup_path() + "/lock.txt",
- boost::lexical_cast<std::string>(get_current_pid()));
+ boost::filesystem::ofstream lockfile(model.get_backup_path() + "/lock.txt");
+ lockfile << boost::lexical_cast<std::string>(get_current_pid());
+ lockfile.close();
}
else {
m_backup_path = model.get_backup_path();
@@ -1253,7 +1259,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
file_version = *m_bambuslicer_generator_version;
// save for restore
if (result && m_load_aux && !m_load_restore) {
- boost::filesystem::save_string_file(model.get_backup_path() + "/origin.txt", filename);
+ boost::filesystem::ofstream originfile(model.get_backup_path() + "/origin.txt");
+ originfile << filename;
+ originfile.close();
}
if (m_load_restore && !result) // not clear failed backup data for later analyze
model.set_backup_path("detach");
@@ -5355,6 +5363,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
boost::system::error_code ec;
std::string filename = std::string(store_params.path);
boost::filesystem::remove(filename + ".tmp", ec);
+ boost::filesystem::ofstream outputfile;

bool result = _save_model_to_file(filename + ".tmp", *store_params.model, store_params.plate_data_list, store_params.project_presets, store_params.config,
store_params.thumbnail_data, store_params.top_thumbnail_data, store_params.pick_thumbnail_data, store_params.proFn,
@@ -5367,7 +5376,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
return false;
}
if (!(store_params.strategy & SaveStrategy::Silence))
- boost::filesystem::save_string_file(store_params.model->get_backup_path() + "/origin.txt", filename);
+ outputfile.open(store_params.model->get_backup_path() + "/origin.txt");
+ outputfile << filename;
+ outputfile.close();
}
return result;
}
@@ -8164,9 +8175,14 @@ bool has_restore_data(std::string & path, std::string& origin)
origin = "<lock>";
return false;
}
- if (boost::filesystem::exists(path + "/lock.txt")) {
- std::string pid;
- boost::filesystem::load_string_file(path + "/lock.txt", pid);
+ const std::string lockfile_path = path + "/lock.txt";
+ if (boost::filesystem::exists(lockfile_path)) {
+ boost::filesystem::ifstream lockfile(lockfile_path);
+ std::string pid(
+ (std::istreambuf_iterator<char>(lockfile)),
+ (std::istreambuf_iterator<char>())
+ );
+ lockfile.close();
try {
if (get_process_name(boost::lexical_cast<int>(pid)) ==
get_process_name(0)) {
@@ -8182,8 +8198,14 @@ bool has_restore_data(std::string & path, std::string& origin)
if (!boost::filesystem::exists(file3mf))
return false;
try {
- if (boost::filesystem::exists(path + "/origin.txt"))
- boost::filesystem::load_string_file(path + "/origin.txt", origin);
+ if (boost::filesystem::exists(path + "/origin.txt")) {
+ boost::filesystem::ifstream originfile(path + "/origin.txt");
+ origin.assign(
+ (std::istreambuf_iterator<char>(originfile)),
+ (std::istreambuf_iterator<char>())
+ );
+ originfile.close();
+ }
}
catch (...) {
}
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index 1b771de1c..2178b77f3 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -23,7 +23,6 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/filesystem.hpp>
-#include <boost/filesystem/string_file.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/iostream.hpp>
@@ -906,8 +905,9 @@ std::string Model::get_backup_path()
BOOST_LOG_TRIVIAL(info) << "create /Metadata in " << temp_path;
boost::filesystem::create_directories(backup_path + "/Metadata");
BOOST_LOG_TRIVIAL(info) << "create /lock.txt in " << temp_path;
- boost::filesystem::save_string_file(backup_path + "/lock.txt",
- boost::lexical_cast<std::string>(get_current_pid()));
+ boost::filesystem::ofstream lockfile(backup_path + "/lock.txt");
+ lockfile << boost::lexical_cast<std::string>(get_current_pid());
+ lockfile.close();
}
} catch (std::exception &ex) {
BOOST_LOG_TRIVIAL(error) << "Failed to create backup path" << temp_path << ": " << ex.what();
diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp
index 0db5d6d23..4ff21c6fc 100644
--- a/src/slic3r/GUI/MediaPlayCtrl.cpp
+++ b/src/slic3r/GUI/MediaPlayCtrl.cpp
@@ -8,7 +8,6 @@
#include "MsgDialog.hpp"
#include "DownloadProgressDialog.hpp"

-#include <boost/filesystem/string_file.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/cstdio.hpp>
@@ -777,8 +776,12 @@ bool MediaPlayCtrl::start_stream_service(bool *need_install)
file_url2.Replace("\\", "/");
file_url2 = wxURI(file_url2).BuildURI();
try {
- std::string configs;
- boost::filesystem::load_string_file(file_ff_cfg, configs);
+ boost::filesystem::ifstream configfile(file_ff_cfg);
+ std::string configs(
+ (std::istreambuf_iterator<char>(configfile)),
+ (std::istreambuf_iterator<char>())
+ );
+ configfile.close();
std::vector<std::string> configss;
boost::algorithm::split(configss, configs, boost::algorithm::is_any_of("\r\n"));
configss.erase(std::remove(configss.begin(), configss.end(), std::string()), configss.end());
diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp
index 17b635ca8..39c2bbb36 100644
--- a/src/slic3r/Utils/PresetUpdater.cpp
+++ b/src/slic3r/Utils/PresetUpdater.cpp
@@ -9,7 +9,6 @@
#include <boost/format.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp>
-#include <boost/filesystem/string_file.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
@@ -877,10 +876,24 @@ void PresetUpdater::priv::sync_tooltip(std::string http_url, std::string languag
std::string language_version = "00.00.00.00";
fs::path cache_root = fs::path(data_dir()) / "resources/tooltip";
try {
- auto vf = cache_root / "common" / "version";
- if (fs::exists(vf)) fs::load_string_file(vf, common_version);
+ fs::path vf = cache_root / "common" / "version";
+ if (fs::exists(vf)) {
+ boost::filesystem::ifstream versionfile(vf);
+ common_version.assign(
+ (std::istreambuf_iterator<char>(versionfile)),
+ (std::istreambuf_iterator<char>())
+ );
+ versionfile.close();
+ }
vf = cache_root / language / "version";
- if (fs::exists(vf)) fs::load_string_file(vf, language_version);
+ if (fs::exists(vf)) {
+ boost::filesystem::ifstream versionfile(vf);
+ language_version.assign(
+ (std::istreambuf_iterator<char>(versionfile)),
+ (std::istreambuf_iterator<char>())
+ );
+ versionfile.close();
+ }
} catch (...) {}
std::map<std::string, Resource> resources
{
@@ -1086,13 +1099,23 @@ void PresetUpdater::priv::sync_printer_config(std::string http_url)

try {
if (fs::exists(config_folder / "version.txt")) {
- fs::load_string_file(config_folder / "version.txt", curr_version);
+ boost::filesystem::ifstream filedata(config_folder / "version.txt");
+ curr_version.assign(
+ (std::istreambuf_iterator<char>(filedata)),
+ (std::istreambuf_iterator<char>())
+ );
+ filedata.close();
boost::algorithm::trim(curr_version);
}
} catch (...) {}
try {
if (fs::exists(cache_folder / "version.txt")) {
- fs::load_string_file(cache_folder / "version.txt", cached_version);
+ boost::filesystem::ifstream filedata(cache_folder / "version.txt");
+ cached_version.assign(
+ (std::istreambuf_iterator<char>(filedata)),
+ (std::istreambuf_iterator<char>())
+ );
+ filedata.close();
boost::algorithm::trim(cached_version);
}
} catch (...) {}
@@ -1128,7 +1151,12 @@ void PresetUpdater::priv::sync_printer_config(std::string http_url)
bool result = false;
try {
if (fs::exists(cache_folder / "version.txt")) {
- fs::load_string_file(cache_folder / "version.txt", cached_version);
+ boost::filesystem::ifstream filedata(cache_folder / "version.txt");
+ cached_version.assign(
+ (std::istreambuf_iterator<char>(filedata)),
+ (std::istreambuf_iterator<char>())
+ );
+ filedata.close();
boost::algorithm::trim(cached_version);
result = true;
}
@@ -1233,13 +1261,23 @@ Updates PresetUpdater::priv::get_printer_config_updates(bool update) const
std::string resc_version;
try {
if (fs::exists(resc_folder / "version.txt")) {
- fs::load_string_file(resc_folder / "version.txt", resc_version);
+ boost::filesystem::ifstream filedata(resc_folder / "version.txt");
+ resc_version.assign(
+ (std::istreambuf_iterator<char>(filedata)),
+ (std::istreambuf_iterator<char>())
+ );
+ filedata.close();
boost::algorithm::trim(resc_version);
}
} catch (...) {}
try {
if (fs::exists(config_folder / "version.txt")) {
- fs::load_string_file(config_folder / "version.txt", curr_version);
+ boost::filesystem::ifstream filedata(config_folder / "version.txt");
+ curr_version.assign(
+ (std::istreambuf_iterator<char>(filedata)),
+ (std::istreambuf_iterator<char>())
+ );
+ filedata.close();
boost::algorithm::trim(curr_version);
}
} catch (...) {}
81 changes: 81 additions & 0 deletions pkgs/applications/misc/bambu-studio/boost-update-2.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
From eafdf7708cb398e082479bb6fd58bc04020331d7 Mon Sep 17 00:00:00 2001
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <[email protected]>
Date: Fri, 26 Apr 2024 10:03:43 -0700
Subject: [PATCH] Replace deprecated Boost methods/options

---
src/libslic3r/PrintBase.cpp | 2 +-
src/libslic3r/utils.cpp | 2 +-
src/slic3r/GUI/Auxiliary.cpp | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
index 00c1b01bd1..6921edc588 100644
--- a/src/libslic3r/PrintBase.cpp
+++ b/src/libslic3r/PrintBase.cpp
@@ -80,7 +80,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
cfg.opt_string("input_filename_base") + default_ext :
this->placeholder_parser().process(format, 0, &cfg);
if (filename.extension().empty())
- filename = boost::filesystem::change_extension(filename, default_ext);
+ filename.replace_extension(default_ext);
return filename.string();
} catch (std::runtime_error &err) {
throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what());
diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
index 2fd34b6436..a2946ba849 100644
--- a/src/libslic3r/utils.cpp
+++ b/src/libslic3r/utils.cpp
@@ -830,7 +830,7 @@ CopyFileResult copy_file_inner(const std::string& from, const std::string& to, s
// That may happen when copying on some exotic file system, for example Linux on Chrome.
copy_file_linux(source, target, ec);
#else // __linux__
- boost::filesystem::copy_file(source, target, boost::filesystem::copy_option::overwrite_if_exists, ec);
+ boost::filesystem::copy_file(source, target, boost::filesystem::copy_options::overwrite_existing, ec);
#endif // __linux__
if (ec) {
error_message = ec.message();
diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp
index 7ee2a44282..91cc01fb5e 100644
--- a/src/slic3r/GUI/Auxiliary.cpp
+++ b/src/slic3r/GUI/Auxiliary.cpp
@@ -346,7 +346,7 @@ void AuFile::on_input_enter(wxCommandEvent &evt)
}

auto existing = false;
- auto dir = m_file_path.branch_path();
+ auto dir = m_file_path.parent_path();
auto new_fullname = new_file_name + m_file_path.extension().string();


@@ -462,8 +462,8 @@ void AuFile::on_set_cover()
wxGetApp().plater()->model().model_info->cover_file = path.string();
//wxGetApp().plater()->model().model_info->cover_file = m_file_name.ToStdString();

- auto full_path = m_file_path.branch_path();
- auto full_root_path = full_path.branch_path();
+ auto full_path = m_file_path.parent_path();
+ auto full_root_path = full_path.parent_path();
auto full_root_path_str = encode_path(full_root_path.string().c_str());
auto dir = wxString::Format("%s/.thumbnails", full_root_path_str);

@@ -507,8 +507,8 @@ void AuFile::on_set_delete()
auto is_fine = fs::remove(bfs_path);

if (m_cover) {
- auto full_path = m_file_path.branch_path();
- auto full_root_path = full_path.branch_path();
+ auto full_path = m_file_path.parent_path();
+ auto full_root_path = full_path.parent_path();
auto full_root_path_str = encode_path(full_root_path.string().c_str());
auto dir = wxString::Format("%s/.thumbnails", full_root_path_str);
fs::path dir_path(dir.c_str());
@@ -949,7 +949,7 @@ void AuxiliaryPanel::on_import_file(wxCommandEvent &event)


boost::system::error_code ec;
- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec)) continue;
+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec)) continue;
Slic3r::put_other_changes();

// add in file list
44 changes: 44 additions & 0 deletions pkgs/applications/misc/bambu-studio/boost-update-3.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 8ed04c78637531b33b6fae0e1765873236013e4f Mon Sep 17 00:00:00 2001
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <[email protected]>
Date: Sat, 27 Apr 2024 19:35:08 -0700
Subject: [PATCH] Bump Boost to v1.85.0

---
CMakeLists.txt | 3 +++
deps/Boost/Boost.cmake | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7633676ef7..6d3a4d0f7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,6 +338,9 @@ if(SLIC3R_STATIC)
set(Boost_USE_STATIC_LIBS ON)
# Use boost libraries linked statically to the C++ runtime.
# set(Boost_USE_STATIC_RUNTIME ON)
+
+ # Enable deprecated timer header (XXX replace header)
+ add_definitions(-DBOOST_TIMER_ENABLE_DEPRECATED)
endif()
#set(Boost_DEBUG ON)
# set(Boost_COMPILER "-mgw81")
diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake
index bdf775daf6..72601f0722 100644
--- a/deps/Boost/Boost.cmake
+++ b/deps/Boost/Boost.cmake
@@ -128,12 +128,11 @@ list(APPEND _patch_command COMMAND git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST

ExternalProject_Add(
dep_Boost
- #URL "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.zip"
- URL "https://github.com/bambulab/boost/releases/download/1.78.0/boost_1_78_0.zip"
- URL_HASH SHA256=f22143b5528e081123c3c5ed437e92f648fe69748e95fa6e2bd41484e2986cc3
+ URL "https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.zip"
+ URL_HASH SHA256=e712fe7eb1b9ec37ac25102525412fb4d74e638996443944025791f48f29408a
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
CONFIGURE_COMMAND "${_bootstrap_cmd}"
- PATCH_COMMAND ${_patch_command}
+ # PATCH_COMMAND ${_patch_command}
BUILD_COMMAND "${_build_cmd}"
BUILD_IN_SOURCE ON
INSTALL_COMMAND "${_install_cmd}"
Loading

0 comments on commit d3e3e76

Please sign in to comment.