mirror of
https://github.com/Almamu/linux-wallpaperengine.git
synced 2025-07-16 22:32:25 +08:00
+ fix path argument
This commit is contained in:
parent
bdf37b1952
commit
47fc550357
15
main.cpp
15
main.cpp
@ -87,6 +87,19 @@ void print_help (const char* route)
|
|||||||
<< " --win <WindowID>\tX Window ID to attach to" << std::endl;
|
<< " --win <WindowID>\tX Window ID to attach to" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string stringPathFixes(const std::string& s){
|
||||||
|
std::string str(s);
|
||||||
|
if(str.empty())
|
||||||
|
return s;
|
||||||
|
if(str[0] == '\'' && str[str.size() - 1] == '\''){
|
||||||
|
str.erase(str.size() - 1, 1);
|
||||||
|
str.erase(0,1);
|
||||||
|
}
|
||||||
|
if(str[str.size() - 1] != '/')
|
||||||
|
str += '/';
|
||||||
|
return std::move(str);
|
||||||
|
}
|
||||||
|
|
||||||
int main (int argc, char* argv[])
|
int main (int argc, char* argv[])
|
||||||
{
|
{
|
||||||
int mode = 0;
|
int mode = 0;
|
||||||
@ -162,6 +175,7 @@ int main (int argc, char* argv[])
|
|||||||
|
|
||||||
// pkg mode
|
// pkg mode
|
||||||
case 1:
|
case 1:
|
||||||
|
path = stringPathFixes(path);
|
||||||
wallpaper_path = wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path.c_str ());
|
wallpaper_path = wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path.c_str ());
|
||||||
project_path = wallpaper_path + "project.json";
|
project_path = wallpaper_path + "project.json";
|
||||||
scene_path = wallpaper_path + "scene.pkg";
|
scene_path = wallpaper_path + "scene.pkg";
|
||||||
@ -171,6 +185,7 @@ int main (int argc, char* argv[])
|
|||||||
|
|
||||||
// folder mode
|
// folder mode
|
||||||
case 2:
|
case 2:
|
||||||
|
path = stringPathFixes(path);
|
||||||
wallpaper_path = wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path.c_str ());
|
wallpaper_path = wp::irrlicht::device->getFileSystem ()->getAbsolutePath (path.c_str ());
|
||||||
project_path = wallpaper_path + "project.json";
|
project_path = wallpaper_path + "project.json";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user