GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-29 00:43:13 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: use different web app data directory for different process of bambu studio

Browse Source 
jira: [STUDIO-11027]
Change-Id: Idbf115507e24369b7d044c83f9da8313042c49e3
(cherry picked from commit 3fe0d6218cccd4acf13b04f0c7babab07c30f085)
This commit is contained in:
xin.zhang 2025-03-31 14:18:05 +08:00 committed by lane.wei
parent e58682fcdf
commit 70d1a22974
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/slic3r/GUI/Widgets/WebView.cpp
View File

@ -183,6 +183,41 @@ public:
wxWebView *m_webView; wxWebView *m_webView;
}; };
#define BAMBU_LOCK_FILE_NAME "bambu_lockfile"
wxString WebView::BuildEdgeUserDataPath()
{
#ifdef __WIN32__
static wxString data_dir;
if (!data_dir.empty()) { return data_dir; }
data_dir = wxStandardPaths::Get().GetUserLocalDataDir();
data_dir.append("\\WebView2Cache\\");
// find a path
for (int bambu_id = 0; bambu_id < std::numeric_limits<int>::max(); bambu_id++) {
wxString bambu_dir = data_dir + wxString::Format("%d", bambu_id);
if (!wxDir::Exists(bambu_dir) && !wxDir::Make(bambu_dir, 511, wxPATH_MKDIR_FULL)) { break; } /*maybe don't have access rights to create dir, break*/
wxString bambu_lock_file = bambu_dir + "\\" BAMBU_LOCK_FILE_NAME;
static wxFile lockFile;
if (lockFile.Exists(bambu_lock_file)) { DeleteFileW(bambu_lock_file.wc_str()); }/*try delete previous file so that we could lock it by wxFile::write_excl*/
if (lockFile.Open(bambu_lock_file, wxFile::write_excl)) {
data_dir = bambu_dir;
break;
}
if (!lockFile.Exists(bambu_lock_file)) { break; } /*maybe don't have access rights to create file, break*/
}
return data_dir;
#else
return wxEmptyString;
#endif
}
wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url) wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
{ {
#if wxUSE_WEBVIEW_EDGE #if wxUSE_WEBVIEW_EDGE
@ -205,6 +240,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
#ifdef __WIN32__ #ifdef __WIN32__
wxWebView* webView = new WebViewEdge; wxWebView* webView = new WebViewEdge;
webView->SetUserDataPathOption(BuildEdgeUserDataPath());
#elif defined(__WXOSX__) #elif defined(__WXOSX__)
wxWebView *webView = new WebViewWebKit; wxWebView *webView = new WebViewWebKit;
#else #else

3
src/slic3r/GUI/Widgets/WebView.hpp
View File

@ -13,6 +13,9 @@ public:
static bool RunScript(wxWebView * webView, wxString const & msg); static bool RunScript(wxWebView * webView, wxString const & msg);
static void RecreateAll(); static void RecreateAll();
/*Find a user data path*/
static wxString BuildEdgeUserDataPath();
}; };
#endif // !slic3r_GUI_WebView_hpp_ #endif // !slic3r_GUI_WebView_hpp_