mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-09-14 05:46:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ Added checks for directories and ensuring specified wallpaper folder exists before initialization, fixes #70

Browse Source 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2022-02-11 15:50:14 +01:00
parent 20c4ad3652
commit d5586b168b
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
main.cpp
View File

@ -4,7 +4,7 @@
#include <SDL_mixer.h>
#include <SDL.h>
#include <FreeImage.h>
#include <sys/stat.h>
#include <GL/glew.h>
#include <GL/glx.h>
#include <filesystem>
@ -124,6 +124,27 @@ int main (int argc, char* argv[])
}
}
char* finalPath = realpath(path.c_str (), nullptr);
if (finalPath == nullptr)
{
if (errno == ENAMETOOLONG)
throw std::runtime_error ("Cannot get wallpaper's folder, path is too long");
else
throw std::runtime_error ("Cannot find the specified folder");
}
// ensure the path points to a folder
struct stat pathinfo;
if (stat (finalPath, &pathinfo) != 0)
throw std::runtime_error ("Cannot find the specified wallpaper folder");
if (!S_ISDIR (pathinfo.st_mode))
throw std::runtime_error ("The specified path is not a folder");
// ensure the path has a trailing slash
// first of all, initialize the window
if (glfwInit () == GLFW_FALSE)
{
@ -139,15 +160,16 @@ int main (int argc, char* argv[])
glfwWindowHint (GLFW_CONTEXT_VERSION_MAJOR, 2);
glfwWindowHint (GLFW_CONTEXT_VERSION_MINOR, 1);
std::string project_path = path + "project.json";
auto containers = new WallpaperEngine::Assets::CCombinedContainer ();
// make sure the project.json exists and is present
// the background's path is required to load project.json regardless of the type of background we're using
containers->add (new WallpaperEngine::Assets::CDirectory (path));
// check if scene.pkg exists and add it to the list
try
{
std::string scene_path = path + "scene.pkg";
std::string scene_path = path + "/scene.pkg";
// add the package to the list
containers->add (new WallpaperEngine::Assets::CPackage (scene_path));
@ -294,6 +316,8 @@ int main (int argc, char* argv[])
SDL_Quit ();
// terminate free image
FreeImage_DeInitialise ();
// free paths
free(finalPath);
return 0;
}