mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-02 08:49:20 -05:00
Feature/filesystem cleanup (#1587)
* Adapting to the changes in Ghoul * First step of moving filesystem functions to std * Remove persistence flag from cachemanager
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
#include <ghoul/logging/logmanager.h>
|
||||
#include <ghoul/misc/assert.h>
|
||||
#include <ghoul/misc/profiling.h>
|
||||
#include <filesystem>
|
||||
|
||||
namespace {
|
||||
constexpr const char* _loggerCat = "CEF BrowserInstance";
|
||||
@@ -96,7 +97,7 @@ void BrowserInstance::loadUrl(std::string url) {
|
||||
}
|
||||
|
||||
bool BrowserInstance::loadLocalPath(std::string path) {
|
||||
if (!FileSys.fileExists(path)) {
|
||||
if (!std::filesystem::is_regular_file(path)) {
|
||||
LDEBUG(fmt::format("Could not find path `{}`, verify that it is correct.", path));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <ghoul/logging/logmanager.h>
|
||||
#include <ghoul/misc/dictionary.h>
|
||||
#include <ghoul/misc/profiling.h>
|
||||
#include <filesystem>
|
||||
|
||||
namespace {
|
||||
constexpr const char* _loggerCat = "WebBrowser";
|
||||
@@ -117,7 +118,7 @@ void WebBrowserModule::internalDeinitialize() {
|
||||
|
||||
std::string WebBrowserModule::findHelperExecutable() {
|
||||
std::string execLocation = absPath("${BIN}/" + std::string(SubprocessPath));
|
||||
if (!FileSys.fileExists(execLocation)) {
|
||||
if (!std::filesystem::is_regular_file(execLocation)) {
|
||||
LERROR(fmt::format(
|
||||
"Could not find web helper executable at location: {}" , execLocation
|
||||
));
|
||||
|
||||
Reference in New Issue
Block a user