X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ppastats.git;a=blobdiff_plain;f=src%2Fhtml.c;h=ea013b68fbc2fe7767be634b07ec200a330d6ad8;hp=6ae462d1f3400506c5484e350615cdd87d0f2f6d;hb=3fdf52a7dba9c3bcbd6e4ef8b945c6d91fc1d807;hpb=91119f38b1102166475467dc0cee470bac61f01c diff --git a/src/html.c b/src/html.c index 6ae462d..ea013b6 100644 --- a/src/html.c +++ b/src/html.c @@ -1,21 +1,24 @@ /* - Copyright (C) 2011 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 published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ + * 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 + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include +#define _(String) gettext(String) #include #include @@ -24,205 +27,163 @@ #include #include -#include +#include #include "html.h" #include "lp.h" +#include #include "lp_ws.h" #include "ppastats.h" +#include +#include +#include -enum file_copy_error { - FILE_COPY_ERROR_OPEN_SRC = 1, - FILE_COPY_ERROR_OPEN_DST, - FILE_COPY_ERROR_READ, - FILE_COPY_ERROR_WRITE, - FILE_COPY_ERROR_ALLOC_BUFFER -}; - -#define HTML_PKG_TEMPLATE \ -"\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ -

N/A

\n\ -

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

\n\ -
\n\ -
Versions:
\n\ - \n\ -" - -#define HTML_VERSION_TEMPLATE \ -"\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\ -
\n\ - Distros:\n\ -
    \n\ -
    \n\ - \n\ -" - -#define FCOPY_BUF_SZ 4096 -static int file_copy(FILE * src, FILE * dst) +static char *footer; +static char *ppa_body; +static char *pkg_body; +static char *pkg_version_body; +static char *header; + +static char *path_new(const char *dir, const char *file, const char *suffixe) { - int ret = 0; - char *buf = malloc(FCOPY_BUF_SZ); - int n; - - if (!buf) - return FILE_COPY_ERROR_ALLOC_BUFFER; - - while (!ret) { - n = fread(buf, 1, FCOPY_BUF_SZ, src); - if (n) { - if (fwrite(buf, 1, n, dst) != n) - ret = FILE_COPY_ERROR_WRITE; - } else { - if (!feof(src)) - ret = FILE_COPY_ERROR_READ; - else - break; + char *path; + + /* [dir]/[file][suffixe] */ + path = malloc(strlen(dir)+1+ + strlen(file)+ + (suffixe ? strlen(suffixe) : 0) + + 1); + + strcpy(path, dir); + strcat(path, "/"); + strcat(path, file); + strcat(path, suffixe); + + return path; +} + +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) { + log_err("Failed to read header template: %s", path); + + return NULL; } } - free(buf); + tmp = strdup(header); + res = strrep(tmp, "@SCRIPT@", script); - return ret; + if (res != tmp) + free(tmp); + + tmp = res; + res = strrep(tmp, "@TITLE@", title); + + if (res != tmp) + free(tmp); + + return res; } -int -fcopy(const char *src, const char *dst) +static const char *get_footer() { - FILE *fsrc, *fdst; - int ret = 0; + const char *path; - if (debug) - printf("DEBUG: copy: %s to %s\n", src, dst); + if (!footer) { + path = DEFAULT_WWW_DIR"/footer.tpl"; + footer = file_get_content(path); - fsrc = fopen(src, "r"); + if (!footer) + log_err("Failed to read footer template: %s", path); + } - if (fsrc) { - fdst = fopen(dst, "w+"); + return footer; +} - if (fdst) { - ret = file_copy(fsrc, fdst); - fclose(fdst); - } else { - ret = FILE_COPY_ERROR_OPEN_DST; - } +static const char *get_pkg_version_body() +{ + const char *path; - fclose(fsrc); - } else { - ret = FILE_COPY_ERROR_OPEN_SRC; + 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 ret; + return pkg_version_body; } - -static char *get_path(const char *dir, const char *file) +static const char *get_ppa_body() { - char *path = malloc(strlen(dir)+1+ - strlen(file)+ - strlen(".html")+ - 1); + const char *path; - strcpy(path, dir); - strcat(path, "/"); - strcat(path, file); - strcat(path, ".html"); + if (!ppa_body) { + path = DEFAULT_WWW_DIR"/ppa.tpl"; + ppa_body = file_get_content(path); - return path; + if (!ppa_body) + log_err("Failed to read PPA template: %s", path); + } + + return ppa_body; } -static struct json_object *date_to_json(struct tm *tm) +static const char *get_pkg_body() { - json_object *json; + const char *path; - 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)); + if (!pkg_body) { + path = DEFAULT_WWW_DIR"/pkg.tpl"; + pkg_body = file_get_content(path); - return json; + if (!pkg_body) + log_err("Failed to read package template: %s", path); + } + + return pkg_body; } 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_object_object_add(json, "ddts", ddts_to_json(ddts)); +} - json_ddts = json_object_new_array(); - json_object_object_add(json, "ddts", json_ddts); +static json_object *distro_to_json(struct distro_stats *d) +{ + json_object *json; - if (!ddts) - return ; + json = json_object_new_object(); - while (*ddts) { - ddt = *ddts; + json_object_object_add(json, + "name", + json_object_new_string(d->name)); - 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_object_add(json, + "count", + json_object_new_int(d->download_count)); - json_object_array_add(json_ddts, json_ddt); + json_add_ddts(json, d->ddts); - ddts++; - } + return json; } -static char *pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg) +static json_object * +pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg) { - json_object *json, *json_versions; - char *ret; + json_object *json, *json_versions, *json_distros, *json_distro; struct version_stats **versions; + struct distro_stats **distros, *d; json = json_object_new_object(); @@ -246,13 +207,28 @@ static char *pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg) versions++; } - json_add_ddts(json, pkg->daily_download_totals); + distros = pkg->distros; + if (distros) { + json_distros = json_object_new_array(); + json_object_object_add(json, "distros", json_distros); - ret = strdup(json_object_to_json_string(json)); + while (*distros) { + d = *distros; - json_object_put(json); + if (d->download_count) { + json_distro = distro_to_json(d); - return ret; + json_object_array_add(json_distros, + json_distro); + } + + distros++; + } + } + + json_add_ddts(json, pkg->daily_download_totals); + + return json; } static char *version_to_json(struct ppa_stats *ppa, @@ -323,29 +299,118 @@ static char *version_to_json(struct ppa_stats *ppa, return ret; } +static json_object *ppa_to_json(struct ppa_stats *ppa) +{ + json_object *json, *json_pkgs, *json_pkg; + struct package_stats **pkgs; + + json = json_object_new_object(); + + json_object_object_add(json, + "ppa_name", json_object_new_string(ppa->name)); + json_object_object_add(json, + "ppa_owner", + json_object_new_string(ppa->owner)); + + json_add_ddts(json, ppa->daily_download_totals); + + pkgs = ppa->packages; + json_pkgs = json_object_new_array(); + json_object_object_add(json, "packages", json_pkgs); + while (*pkgs) { + json_pkg = json_object_new_object(); + json_object_array_add(json_pkgs, json_pkg); + + json_object_object_add(json_pkg, "name", + json_object_new_string((*pkgs)->name)); + + json_object_object_add + (json_pkg, "count", + json_object_new_int((*pkgs)->download_count)); + + pkgs++; + } + + return json; +} + static void -pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir) +create_html(const char *path, + const char *title, + const char *body_template, + const char *script) { - char *path; FILE *f; - char *json; + const char *footer; + char *header; + + f = NULL; + + header = get_header(title, script); + if (!header) { + log_err(_("Failed to get the header template")); + goto on_error; + } - path = get_path(dir, pkg->name); f = fopen(path, "w"); if (!f) { - fprintf(stderr, "ERROR: failed to open: %s\n", path); - return ; + log_err(_("Failed to open: %s"), path); + goto on_error; } - json = pkg_to_json(ppa, pkg); + fputs(header, f); + fputs(body_template, f); + + footer = get_footer(); + if (footer) + fputs(footer, f); + + on_error: + if (header) + free(header); - fprintf(f, HTML_PKG_TEMPLATE, json); + if (f) + fclose(f); +} + +static char *ppa_display_name(const struct ppa_stats *ppa) +{ + char *ret; - fclose(f); + ret = malloc(4+strlen(ppa->name)+1+strlen(ppa->owner)+1); + sprintf(ret, "ppa:%s/%s", ppa->owner, ppa->name); + + return ret; +} + +static void +index_to_html(struct ppa_stats *ppa, const char *dir) +{ + char *path, *json_path, *dname; + json_object *json; + const char *body; + + body = get_ppa_body(); + if (!body) { + log_err("Failed to create PPA page"); + return ; + } + + json = ppa_to_json(ppa); + json_path = path_new(dir, "index", ".json"); + + log_debug(_("generating %s"), json_path); + json_object_to_file(json_path, json); + json_object_put(json); + free(json_path); + + path = path_new(dir, "index", ".html"); + dname = ppa_display_name(ppa); + create_html(path, dname, body, "ppastats_ppa();"); free(path); - free(json); + free(dname); } static void @@ -355,69 +420,104 @@ version_to_html(struct ppa_stats *ppa, const char *dir) { char *f_name, *path; - FILE *f; + 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 = get_path(dir, f_name); - f = fopen(path, "w"); + path = path_new(dir, f_name, ".html"); - if (!f) { - fprintf(stderr, "ERROR: failed to open: %s\n", path); + 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; + json_object *json; + const char *body; + + body = get_pkg_body(); + if (!body) { + log_err("Failed to create package page: %s", pkg->name); return ; } - fprintf(f, HTML_VERSION_TEMPLATE, version_to_json(ppa, pkg, version)); + json_path = path_new(dir, pkg->name, ".json"); + json = pkg_to_json(ppa, pkg); + log_debug(_("Generating %s"), json_path); + + json_object_to_file(json_path, json); + json_object_put(json); + free(json_path); - fclose(f); + path = path_new(dir, pkg->name, ".html"); + script = malloc(strlen("ppastats_pkg(\"\");")+ + strlen(pkg->name)+ + strlen(".json")+ + 1); + sprintf(script, "ppastats_pkg(\"%s%s\");", pkg->name, ".json"); + log_debug(_("Generating %s"), path); + + create_html(path, pkg->name, body, script); free(path); - free(f_name); + free(script); } static void -packages_to_html(struct ppa_stats *ppa, - struct package_stats **packages, - const char *dir) +pkgs_to_html(struct ppa_stats *ppa, + struct package_stats **pkgs, + const char *dir) { - struct package_stats **cur; struct version_stats **versions; - cur = packages; - while (*cur) { - pkg_to_html(ppa, *cur, dir); + while (*pkgs) { + pkg_to_html(ppa, *pkgs, dir); - versions = (*cur)->versions; + versions = (*pkgs)->versions; while (*versions) { - version_to_html(ppa, *cur, *versions, dir); + version_to_html(ppa, *pkgs, *versions, dir); versions++; } - cur++; + pkgs++; } } -static char *append_path(const char *odir, const char *name) -{ - char *dir; - - dir = malloc(strlen(odir)+1+strlen(name)+1); - - sprintf(dir, "%s/%s", odir, name); - - return dir; -} - void ppa_to_html(const char *owner, const char *ppa, const char *package_status, - const char *output_dir) + const char *output_dir, + const int install_static_files, + int ws_size) { struct ppa_stats *ppastats; - struct daily_download_total **totals; char *path, *f_dst; char *css_dir, *js_dir; int i; @@ -428,33 +528,51 @@ ppa_to_html(const char *owner, "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" }; - css_dir = append_path(output_dir, "css"); - js_dir = append_path(output_dir, "js"); + 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); + mkdir(css_dir, 0777); + mkdir(js_dir, 0777); - for (i = 0; i < 6; i++) { - f_dst = append_path(output_dir, www_files[2*i+1]); - fcopy(www_files[2*i], f_dst); + for (i = 0; i < 8; i++) { + f_dst = path_append(output_dir, www_files[2*i+1]); - free(f_dst); + log_debug(_("Copying %s %s"), www_files[2*i], f_dst); + file_copy(www_files[2*i], f_dst); + + free(f_dst); + } + free(css_dir); + free(js_dir); } - ppastats = create_ppa_stats(owner, ppa, package_status); - totals = ppastats->daily_download_totals; + ppastats = create_ppa_stats(owner, ppa, package_status, ws_size); - path = get_path(output_dir, "ppa"); + path = path_new(output_dir, "ppa", ".html"); - packages_to_html(ppastats, ppastats->packages, output_dir); + pkgs_to_html(ppastats, ppastats->packages, output_dir); + + index_to_html(ppastats, output_dir); ppa_stats_free(ppastats); free(path); - free(css_dir); - free(js_dir); +} + +void html_cleanup() +{ + free(header); + free(footer); + free(ppa_body); + free(pkg_body); + free(pkg_version_body); }