3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices

Browse Source
This commit is contained in:
YuSanka 2019-12-10 17:31:58 +01:00
commit 5872598679
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/RemovableDriveManager.cpp
View File

@ -231,9 +231,10 @@ void RemovableDriveManager::search_for_drives()
//search /media/* folder //search /media/* folder
search_path("/media/*", "/media"); search_path("/media/*", "/media");
/*
//search /Volumes/* folder (OSX) //search /Volumes/* folder (OSX)
search_path("/Volumes/*", "/Volumes"); search_path("/Volumes/*", "/Volumes");
*/
std::string path(std::getenv("USER")); std::string path(std::getenv("USER"));
std::string pp(path); std::string pp(path);
//std::cout << "user: "<< path << "\n"; //std::cout << "user: "<< path << "\n";
@ -286,7 +287,7 @@ void RemovableDriveManager::search_path(const std::string &path,const std::strin
{ {
for(size_t i = 0; i < globbuf.gl_pathc; i++) for(size_t i = 0; i < globbuf.gl_pathc; i++)
{ {
inspect_file(globbuf.gl_pathv[i], parent_path);
} }
}else }else
{ {
@ -299,11 +300,11 @@ void RemovableDriveManager::search_path(const std::string &path,const std::strin
void RemovableDriveManager::inspect_file(const std::string &path, const std::string &parent_path) void RemovableDriveManager::inspect_file(const std::string &path, const std::string &parent_path)
{ {
//if not same file system - could be removable drive //if not same file system - could be removable drive
if(!compare_filesystem_id(globbuf.gl_pathv[i], parent_path)) if(!compare_filesystem_id(path, parent_path))
{ {
//user id //user id
struct stat buf; struct stat buf;
stat(globbuf.gl_pathv[i],&buf); stat(path.c_str(), &buf);
uid_t uid = buf.st_uid; uid_t uid = buf.st_uid;
std::string username(std::getenv("USER")); std::string username(std::getenv("USER"));
struct passwd *pw = getpwuid(uid); struct passwd *pw = getpwuid(uid);
@ -311,8 +312,8 @@ void RemovableDriveManager::inspect_file(const std::string &path, const std::str
{ {
if(pw->pw_name == username) if(pw->pw_name == username)
{ {
std::string name = basename(globbuf.gl_pathv[i]); std::string name = basename(const_cast<char*>(path.c_str()));
m_current_drives.push_back(DriveData(name,globbuf.gl_pathv[i])); m_current_drives.push_back(DriveData(name,path));
} }
} }
} }