Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/helpers/fs/FsUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include "../../debug/log/Logger.hpp"

#include <cstdlib>
#include <filesystem>
#include <fstream>

#include <hyprutils/string/String.hpp>
Expand Down Expand Up @@ -57,17 +56,14 @@ std::optional<std::string> NFsUtils::getDataHome() {
return hyprlandDataDir.string();
}

std::optional<std::string> NFsUtils::readFileAsString(const std::string& path) {
std::error_code ec;

if (!std::filesystem::exists(path, ec) || ec)
return std::nullopt;

std::ifstream file(path);
if (!file.good())
std::optional<std::string> NFsUtils::readFileAsString(const std::filesystem::path& path) {
std::ifstream ifs(path);
if (!ifs.is_open()) {
return std::nullopt;
}

return trim(std::string((std::istreambuf_iterator<char>(file)), (std::istreambuf_iterator<char>())));
std::string data(std::istreambuf_iterator<char>{ifs}, std::istreambuf_iterator<char>{});
return trim(data);
}

bool NFsUtils::writeToFile(const std::string& path, const std::string& content) {
Expand Down
4 changes: 3 additions & 1 deletion src/helpers/fs/FsUtils.hpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#pragma once

#include <filesystem>
#include <optional>
#include <string>

namespace NFsUtils {
// Returns the path to the hyprland directory in data home.
std::optional<std::string> getDataHome();

std::optional<std::string> readFileAsString(const std::string& path);
std::optional<std::string> readFileAsString(const std::filesystem::path& path);

// overwrites the file if exists
bool writeToFile(const std::string& path, const std::string& content);
Expand Down
Loading