X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fhtml.c;h=83c6fb639a936f203d3c45730965fb003d645c3d;hb=677d2bfc3beae998b73f48a4be3036f09d6848ff;hp=a6acc2f314d730a2feac9f389f8df649e494340f;hpb=1378a843b2e5ce3fbc4429b07844cc37d42e0d8e;p=ppastats.git diff --git a/src/html.c b/src/html.c index a6acc2f..83c6fb6 100644 --- a/src/html.c +++ b/src/html.c @@ -27,21 +27,33 @@ #include #include -#include +#include #include "html.h" -#include "io.h" -#include "log.h" #include "lp.h" +#include #include "lp_ws.h" #include "ppastats.h" -#include "str.h" +#include +#include +#include -static const char *footer; -static const char *ppa_body; -static const char *pkg_body; -static const char *pkg_version_body; -static const char *header; +static char *css_dir; +static char *js_dir; +static char *tpl_dir; + +static char *footer; +static char *ppa_body; +static char *pkg_body; +static char *pkg_version_body; +static char *header; + +void html_set_theme_dir(const char *theme_dir) +{ + css_dir = path_append(theme_dir, "css"); + js_dir = path_append(theme_dir, "js"); + tpl_dir = path_append(theme_dir, "templates"); +} static char *path_new(const char *dir, const char *file, const char *suffixe) { @@ -63,45 +75,49 @@ static char *path_new(const char *dir, const char *file, const char *suffixe) static char *get_header(const char *title, const char *script) { - const char *path; - char *res, *tmp; + char *res, *tmp, *path; if (!header) { - path = DEFAULT_WWW_DIR"/header.tpl"; + path = path_append(tpl_dir, "header.tpl"); header = file_get_content(path); - - if (!header) { - log_err("Failed to read header template: %s", path); - - return NULL; - } + } else { + path = NULL; } - tmp = strdup(header); - res = strrep(tmp, "@SCRIPT@", script); + if (header) { + tmp = strdup(header); + res = strrep(tmp, "@SCRIPT@", script); - if (res != tmp) - free(tmp); + if (res != tmp) + free(tmp); - tmp = res; - res = strrep(tmp, "@TITLE@", title); + tmp = res; + res = strrep(tmp, "@TITLE@", title); - if (res != tmp) - free(tmp); + if (res != tmp) + free(tmp); + } else { + log_err("Failed to read header template: %s", path); + res = NULL; + } + + free(path); return res; } static const char *get_footer() { - const char *path; + char *path; if (!footer) { - path = DEFAULT_WWW_DIR"/footer.tpl"; + path = path_append(tpl_dir, "footer.tpl"); footer = file_get_content(path); if (!footer) log_err("Failed to read footer template: %s", path); + + free(path); } return footer; @@ -109,29 +125,33 @@ static const char *get_footer() static const char *get_pkg_version_body() { - const char *path; + char *path; if (!pkg_version_body) { - path = DEFAULT_WWW_DIR"/pkg_version.tpl"; + path = path_append(tpl_dir, "pkg_version.tpl"); pkg_version_body = file_get_content(path); if (!pkg_version_body) log_err("Failed to read package version template: %s", path); + + free(path); } return pkg_version_body; } static const char *get_ppa_body() { - const char *path; + char *path; if (!ppa_body) { - path = DEFAULT_WWW_DIR"/ppa.tpl"; + path = path_append(tpl_dir, "ppa.tpl"); ppa_body = file_get_content(path); if (!ppa_body) log_err("Failed to read PPA template: %s", path); + + free(path); } return ppa_body; @@ -139,58 +159,25 @@ static const char *get_ppa_body() static const char *get_pkg_body() { - const char *path; + char *path; if (!pkg_body) { - path = DEFAULT_WWW_DIR"/pkg.tpl"; + path = path_append(tpl_dir, "pkg.tpl"); pkg_body = file_get_content(path); if (!pkg_body) log_err("Failed to read package template: %s", path); + + free(path); } return pkg_body; } -static struct json_object *date_to_json(struct tm *tm) -{ - json_object *json; - - json = json_object_new_array(); - json_object_array_add(json, json_object_new_int(tm->tm_year+1900)); - json_object_array_add(json, json_object_new_int(tm->tm_mon+1)); - json_object_array_add(json, json_object_new_int(tm->tm_mday)); - - return json; -} - static void json_add_ddts(json_object *json, struct daily_download_total **ddts) { - json_object *json_ddt, *json_ddts; - struct daily_download_total *ddt; - - json_ddts = json_object_new_array(); - json_object_object_add(json, "ddts", json_ddts); - - if (!ddts) - return ; - - while (*ddts) { - ddt = *ddts; - - json_ddt = json_object_new_object(); - json_object_object_add(json_ddt, - "value", - json_object_new_int(ddt->count)); - json_object_object_add(json_ddt, - "time", - date_to_json(&ddt->date)); - - json_object_array_add(json_ddts, json_ddt); - - ddts++; - } + json_object_object_add(json, "ddts", ddts_to_json(ddts)); } static json_object *distro_to_json(struct distro_stats *d) @@ -288,6 +275,9 @@ static char *version_to_json(struct ppa_stats *ppa, json_object_object_add(json, "name", json_object_new_string(ver->version)); + json_object_object_add(json, + "date_created", time_to_json(ver->date_created)); + json_add_ddts(json, ver->daily_download_totals); distros = ver->distros; @@ -481,6 +471,7 @@ version_to_html(struct ppa_stats *ppa, create_html(path, f_name, body, script); + free(script); free(json); free(path); free(f_name); @@ -551,41 +542,20 @@ ppa_to_html(const char *owner, int ws_size) { struct ppa_stats *ppastats; - char *path, *f_dst; - char *css_dir, *js_dir; - int i; - static char *www_files[] - = { DEFAULT_WWW_DIR"/jquery.min.js", "js/jquery.min.js", - DEFAULT_WWW_DIR"/ppastats.js", "js/ppastats.js", - DEFAULT_WWW_DIR"/jqplot.dateAxisRenderer.min.js", - "js/jqplot.dateAxisRenderer.min.js", - DEFAULT_WWW_DIR"/jquery.jqplot.min.js", - "js/jquery.jqplot.min.js", - DEFAULT_WWW_DIR"/excanvas.js", "js/excanvas.js", - DEFAULT_WWW_DIR"/ppastats.css", "css/ppastats.css", - DEFAULT_WWW_DIR"/wpitchoune.css", "css/wpitchoune.css", - DEFAULT_WWW_DIR"/jquery.jqplot.min.css", - "css/jquery.jqplot.min.css" }; + char *path; + char *css_odir, *js_odir; mkdirs(output_dir, 0777); if (install_static_files) { - css_dir = path_append(output_dir, "css"); - js_dir = path_append(output_dir, "js"); - - mkdir(css_dir, 0777); - mkdir(js_dir, 0777); + css_odir = path_append(output_dir, "css"); + js_odir = path_append(output_dir, "js"); - for (i = 0; i < 8; i++) { - f_dst = path_append(output_dir, www_files[2*i+1]); + dir_rcopy(css_dir, css_odir); + dir_rcopy(js_dir, js_odir); - log_debug(_("Copying %s %s"), www_files[2*i], f_dst); - fcopy(www_files[2*i], f_dst); - - free(f_dst); - } - free(css_dir); - free(js_dir); + free(css_odir); + free(js_odir); } ppastats = create_ppa_stats(owner, ppa, package_status, ws_size); @@ -600,3 +570,15 @@ ppa_to_html(const char *owner, free(path); } + +void html_cleanup() +{ + free(header); + free(footer); + free(ppa_body); + free(pkg_body); + free(pkg_version_body); + free(js_dir); + free(css_dir); + free(tpl_dir); +}