Commit 6e2039ef authored by jan.koester's avatar jan.koester
Browse files

test

parent 4d6f4f55
Loading
Loading
Loading
Loading
+33 −17
Changes for src/theme.cpp: 33 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -632,20 +632,7 @@ static void normalizeColor(std::string &val){
    }
}

void blogi::Theme::injectThemeColors(const int tid, libhtmlpp::HtmlElement *index){
    libhtmlpp::HtmlElement *head = index->getElementbyTag("head");
    if(!head)
        return;

    std::string styleCss;
    for(const auto& file : _PublicFiles){
        if(file.Path == "/theme/public/style.css"){
            styleCss = file.Content;
            break;
        }
    }

    auto extractCssVar = [](const std::string &css, const std::string &varName) -> std::string {
static std::string extractCssVar(const std::string &css, const std::string &varName) {
    std::string search = varName;
    size_t pos = css.find(search);
    while (pos != std::string::npos) {
@@ -671,7 +658,20 @@ void blogi::Theme::injectThemeColors(const int tid, libhtmlpp::HtmlElement *inde
        pos = css.find(search, pos + search.length());
    }
    return "";
    };
}

void blogi::Theme::injectThemeColors(const int tid, libhtmlpp::HtmlElement *index){
    libhtmlpp::HtmlElement *head = index->getElementbyTag("head");
    if(!head)
        return;

    std::string styleCss;
    for(const auto& file : _PublicFiles){
        if(file.Path == "/theme/public/style.css"){
            styleCss = file.Content;
            break;
        }
    }

    struct ColorVar { const char *dbSuffix; const char *cssVar; const char *darkDefault; const char *lightDefault; };
    ColorVar vars[] = {
@@ -760,6 +760,14 @@ void blogi::Theme::injectThemeColors(const int tid, libhtmlpp::HtmlElement *inde
}

json_object* blogi::Theme::getThemeColors(const int tid){
    std::string styleCss;
    for(const auto& file : _PublicFiles){
        if(file.Path == "/theme/public/style.css"){
            styleCss = file.Content;
            break;
        }
    }

    struct ColorVar { const char *dbSuffix; const char *cssVar; const char *darkDefault; const char *lightDefault; };
    ColorVar vars[] = {
        {"BG",           "--blogi-bg",            "#232627",  "rgba(235,237,240,1)"},
@@ -786,16 +794,24 @@ json_object* blogi::Theme::getThemeColors(const int tid){
    json_object *light = json_object_new_object();

    for(auto &v : vars){
        std::string dynamicDef = extractCssVar(styleCss, v.cssVar);
        if(dynamicDef.empty() && std::string(v.cssVar).find("--blogi-") == 0) {
            std::string altVar = "--color-" + std::string(v.cssVar).substr(8);
            dynamicDef = extractCssVar(styleCss, altVar);
        }
        std::string ddef = dynamicDef.empty() ? v.darkDefault : dynamicDef;
        std::string ldef = dynamicDef.empty() ? v.lightDefault : dynamicDef;

        std::string dval;
        try { getConfig(*_Config.TDatabase[tid], std::string("THEME_DARK_") + v.dbSuffix, dval); } catch(...) {}
        normalizeColor(dval);
        if(dval.empty()) dval = v.darkDefault;
        if(dval.empty()) dval = ddef;
        json_object_object_add(dark, v.cssVar, json_object_new_string(dval.c_str()));

        std::string lval;
        try { getConfig(*_Config.TDatabase[tid], std::string("THEME_LIGHT_") + v.dbSuffix, lval); } catch(...) {}
        normalizeColor(lval);
        if(lval.empty()) lval = v.lightDefault;
        if(lval.empty()) lval = ldef;
        json_object_object_add(light, v.cssVar, json_object_new_string(lval.c_str()));
    }