King_DuckZ/kamokan
1
0
Fork 0
mirror of https://github.com/KingDuckZ/kamokan.git synced 2025-06-07 00:51:41 +00:00
Code Issues Releases Wiki Activity

Set the html root from the config file.

Browse source
This commit is contained in:
King_DuckZ 2017-04-18 20:10:36 +01:00
parent e92866251b
commit 00aa06282d
5 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/tawashi.ini
View file

@ -3,3 +3,4 @@ redis_server = 127.0.0.1
redis_port = 6379 redis_port = 6379
redis_mode = inet redis_mode = inet
base_uri = http://127.0.0.1:8080 base_uri = http://127.0.0.1:8080
website_root = /home/michele/dev/code/cpp/tawashi/html

1
src/pastie_response.cpp
View file

@ -56,6 +56,7 @@ namespace tawashi {
auto& redis = this->redis(); auto& redis = this->redis();
opt_string pastie = redis.get(token); opt_string pastie = redis.get(token);
if (not pastie) { if (not pastie) {
assert(false);
} }
if (m_plain_text) { if (m_plain_text) {

15
src/response.cpp
View file

@ -20,6 +20,7 @@
#include "ini_file.hpp" #include "ini_file.hpp"
#include "tawashiConfig.h" #include "tawashiConfig.h"
#include "duckhandy/stringize.h" #include "duckhandy/stringize.h"
#include "pathname/pathname.hpp"
#include <utility> #include <utility>
#include <cassert> #include <cassert>
#include <fstream> #include <fstream>
@ -39,6 +40,17 @@ namespace tawashi {
// return path.substr(start_index, substr_len); // return path.substr(start_index, substr_len);
//} //}
std::string make_root_path (const IniFile::KeyValueMapType& parSettings) {
const auto it_found = parSettings.find("website_root");
if (parSettings.end() == it_found) {
return "";
}
else {
mchlib::PathName retval(it_found->second);
return retval.path() + '/';
}
}
redis::IncRedis make_incredis (const tawashi::IniFile::KeyValueMapType& parSettings) { redis::IncRedis make_incredis (const tawashi::IniFile::KeyValueMapType& parSettings) {
using redis::IncRedis; using redis::IncRedis;
@ -61,6 +73,7 @@ namespace tawashi {
m_resp_value(std::move(parValue)), m_resp_value(std::move(parValue)),
m_base_uri(parIni.parsed().at("tawashi").at("base_uri")), m_base_uri(parIni.parsed().at("tawashi").at("base_uri")),
//m_page_basename(fetch_page_basename(m_cgi_env)), //m_page_basename(fetch_page_basename(m_cgi_env)),
m_website_root(make_root_path(parIni.parsed().at("tawashi"))),
m_page_basename(std::move(parPageBaseName)), m_page_basename(std::move(parPageBaseName)),
m_resp_type(parRespType), m_resp_type(parRespType),
m_header_sent(false) m_header_sent(false)
@ -133,7 +146,7 @@ namespace tawashi {
std::string Response::load_mustache() const { std::string Response::load_mustache() const {
std::ostringstream oss; std::ostringstream oss;
oss << "html/" << page_basename() << ".html.mstch"; oss << m_website_root << page_basename() << ".html.mstch";
std::cerr << "Trying to load \"" << oss.str() << "\"\n"; std::cerr << "Trying to load \"" << oss.str() << "\"\n";
std::ifstream if_mstch(oss.str(), std::ios::binary | std::ios::in); std::ifstream if_mstch(oss.str(), std::ios::binary | std::ios::in);

1
src/response.hpp
View file

@ -59,6 +59,7 @@ namespace tawashi {
cgi::Env m_cgi_env; cgi::Env m_cgi_env;
std::string m_resp_value; std::string m_resp_value;
boost::string_ref m_base_uri; boost::string_ref m_base_uri;
std::string m_website_root;
std::string m_page_basename; std::string m_page_basename;
Types m_resp_type; Types m_resp_type;
std::unique_ptr<redis::IncRedis> m_redis; std::unique_ptr<redis::IncRedis> m_redis;

2
src/submit_paste_response.cpp
View file

@ -50,7 +50,7 @@ namespace tawashi {
void SubmitPasteResponse::on_send (std::ostream& parStream) { void SubmitPasteResponse::on_send (std::ostream& parStream) {
assert(not m_error_message.empty()); assert(not m_error_message.empty());
parStream << "something happened? :/<br>\n" << parStream << "something happened? :/\n" <<
m_error_message << '\n'; m_error_message << '\n';
} }