jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(main): move file operation functions to new source (#2124)

Browse source
This commit is contained in:
ReenigneArcher 2024-02-10 07:37:27 -05:00 • committed by GitHub
commit cd2153f340
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 113 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/confighttp.cpp
View file

@ -29,6 +29,7 @@
#include "config.h"
#include "confighttp.h"
#include "crypto.h"
#include "file_handler.h"
#include "httpcommon.h"
#include "logging.h"
#include "main.h"
@ -162,7 +163,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(WEB_DIR "index.html");
std::string content = file_handler::read_file(WEB_DIR "index.html");
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/html; charset=utf-8");
response->write(content, headers);
@ -174,7 +175,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(WEB_DIR "pin.html");
std::string content = file_handler::read_file(WEB_DIR "pin.html");
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/html; charset=utf-8");
response->write(content, headers);
@ -186,7 +187,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(WEB_DIR "apps.html");
std::string content = file_handler::read_file(WEB_DIR "apps.html");
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/html; charset=utf-8");
headers.emplace("Access-Control-Allow-Origin", "https://images.igdb.com/");
@ -199,7 +200,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(WEB_DIR "clients.html");
std::string content = file_handler::read_file(WEB_DIR "clients.html");
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/html; charset=utf-8");
response->write(content, headers);
@ -211,7 +212,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(WEB_DIR "config.html");
std::string content = file_handler::read_file(WEB_DIR "config.html");
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/html; charset=utf-8");
response->write(content, headers);
@ -223,7 +224,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(WEB_DIR "password.html");
std::string content = file_handler::read_file(WEB_DIR "password.html");
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/html; charset=utf-8");
response->write(content, headers);
@ -236,7 +237,7 @@ namespace confighttp {
send_redirect(response, request, "/");
return;
}
std::string content = read_file(WEB_DIR "welcome.html");
std::string content = file_handler::read_file(WEB_DIR "welcome.html");
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/html; charset=utf-8");
response->write(content, headers);
@ -248,7 +249,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(WEB_DIR "troubleshooting.html");
std::string content = file_handler::read_file(WEB_DIR "troubleshooting.html");
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/html; charset=utf-8");
response->write(content, headers);
@ -324,7 +325,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(config::stream.file_apps.c_str());
std::string content = file_handler::read_file(config::stream.file_apps.c_str());
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "application/json");
response->write(content, headers);
@ -336,7 +337,7 @@ namespace confighttp {
print_req(request);
std::string content = read_file(config::sunshine.log_file.c_str());
std::string content = file_handler::read_file(config::sunshine.log_file.c_str());
SimpleWeb::CaseInsensitiveMultimap headers;
headers.emplace("Content-Type", "text/plain");
response->write(SimpleWeb::StatusCode::success_ok, content, headers);
@ -542,7 +543,7 @@ namespace confighttp {
outputTree.put("platform", SUNSHINE_PLATFORM);
outputTree.put("version", PROJECT_VER);
auto vars = config::parse_config(read_file(config::sunshine.config_file.c_str()));
auto vars = config::parse_config(file_handler::read_file(config::sunshine.config_file.c_str()));
for (auto &[name, value] : vars) {
outputTree.put(std::move(name), std::move(value));
@ -575,7 +576,7 @@ namespace confighttp {
configStream << kv.first << " = " << value << std::endl;
}
write_file(config::sunshine.config_file.c_str(), configStream.str());
file_handler::write_file(config::sunshine.config_file.c_str(), configStream.str());
}
catch (std::exception &e) {
BOOST_LOG(warning) << "SaveConfig: "sv << e.what();