X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ppastats.git;a=blobdiff_plain;f=src%2Fhtml.c;h=ea013b68fbc2fe7767be634b07ec200a330d6ad8;hp=75a562f04db9d4627b146d7417d40864dd74fbfb;hb=3fdf52a7dba9c3bcbd6e4ef8b945c6d91fc1d807;hpb=2baa3ff01cb4db10a1a44fd0234ad3cfbe2a0e1b diff --git a/src/html.c b/src/html.c index 75a562f..ea013b6 100644 --- a/src/html.c +++ b/src/html.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 jeanfi@gmail.com + * Copyright (C) 2011-2014 jeanfi@gmail.com * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -27,61 +27,23 @@ #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 +#include +#include static char *footer; static char *ppa_body; static char *pkg_body; +static char *pkg_version_body; static char *header; -#define HTML_VERSION_TEMPLATE \ -"\n\ - \n\ - \n\ - \n\ - \n\ -\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ -

N/A

\n\ -

Version:

\n\ -

PPA: \n\ - \n\ - N/A/N/A\n\ -

\n\ -

\n\ - Distros:\n\ -

\n\ -

\n" - static char *path_new(const char *dir, const char *file, const char *suffixe) { char *path; @@ -100,19 +62,35 @@ static char *path_new(const char *dir, const char *file, const char *suffixe) return path; } -static const char *get_header() +static char *get_header(const char *title, const char *script) { const char *path; + char *res, *tmp; if (!header) { path = DEFAULT_WWW_DIR"/header.tpl"; header = file_get_content(path); - if (!header) + if (!header) { log_err("Failed to read header template: %s", path); + + return NULL; + } } - return header; + tmp = strdup(header); + res = strrep(tmp, "@SCRIPT@", script); + + if (res != tmp) + free(tmp); + + tmp = res; + res = strrep(tmp, "@TITLE@", title); + + if (res != tmp) + free(tmp); + + return res; } static const char *get_footer() @@ -130,6 +108,21 @@ static const char *get_footer() return footer; } +static const char *get_pkg_version_body() +{ + const char *path; + + if (!pkg_version_body) { + path = DEFAULT_WWW_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); + } + + return pkg_version_body; +} static const char *get_ppa_body() { const char *path; @@ -160,45 +153,10 @@ static const char *get_pkg_body() 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) @@ -377,40 +335,6 @@ static json_object *ppa_to_json(struct ppa_stats *ppa) } static void -version_to_html(struct ppa_stats *ppa, - struct package_stats *pkg, - struct version_stats *version, - const char *dir) -{ - char *f_name, *path; - FILE *f; - const char *footer; - - f_name = malloc(strlen(pkg->name)+1+strlen(version->version)+1); - sprintf(f_name, "%s_%s", pkg->name, version->version); - - path = path_new(dir, f_name, ".html"); - f = fopen(path, "w"); - - if (!f) { - log_err(_("failed to open: %s"), path); - return ; - } - - fprintf(f, HTML_VERSION_TEMPLATE, - version_to_json(ppa, pkg, version)); - - footer = get_footer(); - if (footer) - fputs(footer, f); - - fclose(f); - - free(path); - free(f_name); -} - -static void create_html(const char *path, const char *title, const char *body_template, @@ -418,29 +342,36 @@ create_html(const char *path, { FILE *f; const char *footer; - const char *header; + char *header; - header = get_header(); + f = NULL; + + header = get_header(title, script); if (!header) { log_err(_("Failed to get the header template")); - return ; + goto on_error; } f = fopen(path, "w"); if (!f) { log_err(_("Failed to open: %s"), path); - return ; + goto on_error; } - fprintf(f, header, title, script); + fputs(header, f); fputs(body_template, f); footer = get_footer(); if (footer) fputs(footer, f); - fclose(f); + on_error: + if (header) + free(header); + + if (f) + fclose(f); } static char *ppa_display_name(const struct ppa_stats *ppa) @@ -483,6 +414,46 @@ index_to_html(struct ppa_stats *ppa, const char *dir) } static void +version_to_html(struct ppa_stats *ppa, + struct package_stats *pkg, + struct version_stats *version, + const char *dir) +{ + char *f_name, *path; + const char *body; + const char *script_tpl; + char *script, *json; + + body = get_pkg_version_body(); + if (!body) { + log_err("Failed to create package version page"); + return ; + } + + json = version_to_json(ppa, pkg, version); + if (!json) { + log_err("Failed to create package version page"); + return ; + } + + f_name = malloc(strlen(pkg->name)+1+strlen(version->version)+1); + sprintf(f_name, "%s_%s", pkg->name, version->version); + + path = path_new(dir, f_name, ".html"); + + script_tpl = "var data = %s;\n ppastats_ver();"; + script = malloc(strlen(script_tpl) - 2 + strlen(json) + 1); + sprintf(script, script_tpl, json); + + create_html(path, f_name, body, script); + + free(script); + free(json); + free(path); + free(f_name); +} + +static void pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir) { char *path, *json_path, *script; @@ -543,7 +514,8 @@ ppa_to_html(const char *owner, const char *ppa, const char *package_status, const char *output_dir, - const int install_static_files) + const int install_static_files, + int ws_size) { struct ppa_stats *ppastats; char *path, *f_dst; @@ -558,6 +530,7 @@ ppa_to_html(const char *owner, "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" }; @@ -570,11 +543,11 @@ ppa_to_html(const char *owner, mkdir(css_dir, 0777); mkdir(js_dir, 0777); - for (i = 0; i < 7; i++) { + for (i = 0; i < 8; i++) { f_dst = path_append(output_dir, www_files[2*i+1]); log_debug(_("Copying %s %s"), www_files[2*i], f_dst); - fcopy(www_files[2*i], f_dst); + file_copy(www_files[2*i], f_dst); free(f_dst); } @@ -582,7 +555,7 @@ ppa_to_html(const char *owner, free(js_dir); } - ppastats = create_ppa_stats(owner, ppa, package_status); + ppastats = create_ppa_stats(owner, ppa, package_status, ws_size); path = path_new(output_dir, "ppa", ".html"); @@ -594,3 +567,12 @@ 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); +}