X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fhtml.c;h=2fd1eef4407f5291cf2e6cc7845eb05822efa5eb;hb=50cb5b56107bbbdc5eb1565404015efaba66bed4;hp=9eb0bcf65f272a4588cdf4da8d301f064313486a;hpb=6b077ee78bd064474b576e076383503e682a1dd2;p=ppastats.git diff --git a/src/html.c b/src/html.c index 9eb0bcf..2fd1eef 100644 --- a/src/html.c +++ b/src/html.c @@ -39,40 +39,21 @@ " #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\ -

Versions:

\n\ -

Distros:

\n\ -

\n\ -%s" +"

N/A

\n\ +

\n\ + PPA: \n\ + \n\ + N/A/\n\ + N/A\n\ + \n\ +\n\ +

Distros:

\n\ +

Versions:

\n\ +

" #define HTML_VERSION_TEMPLATE \ "\n\ @@ -84,6 +65,10 @@ \n\ \n\ +\n\ \n\ \n\ @@ -112,38 +97,45 @@ \n\ %s" -#define HTML_INDEX_TEMPLATE \ +#define HTML_HEADER \ "\n\ - \n\ - \n\ + %s\n\ + \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ -

N/A

\n\ -

\n\ - Packages:\n\ -

\n\ -

\n\ -%s" + \n\ + \n\ +\n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n" + +#define HTML_INDEX_TEMPLATE \ +"

N/A

\n\ +

\n\ + Packages:\n\ +

\n\ +

\n" static char *path_new(const char *dir, const char *file, const char *suffixe) { @@ -156,7 +148,7 @@ static char *path_new(const char *dir, const char *file, const char *suffixe) strcpy(path, dir); strcat(path, "/"); strcat(path, file); - strcat(path, ".html"); + strcat(path, suffixe); return path; } @@ -202,12 +194,31 @@ static void json_add_ddts(json_object *json, } } -static char *pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg) +static json_object *distro_to_json(struct distro_stats *d) +{ + json_object *json; + + json = json_object_new_object(); + + json_object_object_add(json, + "name", + json_object_new_string(d->name)); + + json_object_object_add(json, + "count", + json_object_new_int(d->download_count)); + + json_add_ddts(json, d->ddts); + + return json; +} + +static json_object * +pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg) { json_object *json, *json_versions, *json_distros, *json_distro; - char *ret; struct version_stats **versions; - struct distro_stats **distros, *distro; + struct distro_stats **distros, *d; json = json_object_new_object(); @@ -237,19 +248,14 @@ static char *pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg) json_object_object_add(json, "distros", json_distros); while (*distros) { - distro = *distros; + d = *distros; - json_distro = json_object_new_object(); - json_object_array_add(json_distros, json_distro); - json_object_object_add - (json_distro, - "name", json_object_new_string(distro->name)); - json_object_object_add - (json_distro, - "count", - json_object_new_int(distro->download_count)); + if (d->download_count) { + json_distro = distro_to_json(d); - json_add_ddts(json_distro, distro->ddts); + json_object_array_add(json_distros, + json_distro); + } distros++; } @@ -257,11 +263,7 @@ static char *pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg) json_add_ddts(json, pkg->daily_download_totals); - ret = strdup(json_object_to_json_string(json)); - - json_object_put(json); - - return ret; + return json; } static char *version_to_json(struct ppa_stats *ppa, @@ -332,9 +334,8 @@ static char *version_to_json(struct ppa_stats *ppa, return ret; } -static char *ppa_to_json(struct ppa_stats *ppa) +static json_object *ppa_to_json(struct ppa_stats *ppa) { - char *ret; json_object *json, *json_pkgs, *json_pkg; struct package_stats **pkgs; @@ -365,37 +366,7 @@ static char *ppa_to_json(struct ppa_stats *ppa) pkgs++; } - ret = strdup(json_object_to_json_string(json)); - - json_object_put(json); - - return ret; -} - - -static void -pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir) -{ - char *path; - FILE *f; - char *json; - - path = path_new(dir, pkg->name, ".html"); - f = fopen(path, "w"); - - if (!f) { - fprintf(stderr, "ERROR: failed to open: %s\n", path); - return ; - } - - json = pkg_to_json(ppa, pkg); - - fprintf(f, HTML_PKG_TEMPLATE, json, HTML_FOOTER); - - fclose(f); - - free(path); - free(json); + return json; } static void @@ -429,58 +400,107 @@ version_to_html(struct ppa_stats *ppa, } static void -packages_to_html(struct ppa_stats *ppa, - struct package_stats **packages, - const char *dir) +create_html(const char *path, + const char *title, + const char *body_template, + const char *script) { - struct package_stats **cur; - struct version_stats **versions; + FILE *f; - cur = packages; - while (*cur) { - pkg_to_html(ppa, *cur, dir); + f = fopen(path, "w"); - versions = (*cur)->versions; - while (*versions) { - version_to_html(ppa, *cur, *versions, dir); + if (!f) { + fprintf(stderr, "ERROR: failed to open: %s\n", path); + return ; + } - versions++; - } + fprintf(f, HTML_HEADER, title, script); + fputs(body_template, f); + fputs(HTML_FOOTER, f); - cur++; - } + fclose(f); +} + +static char *ppa_display_name(const struct ppa_stats *ppa) +{ + char *ret; + + 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; - FILE *f; + char *path, *json_path, *dname; + json_object *json; + + json = ppa_to_json(ppa); + json_path = path_new(dir, "index", ".json"); + if (debug) + printf("DEBUG: generating %s\n", json_path); + json_object_to_file(json_path, json); + json_object_put(json); + free(json_path); path = path_new(dir, "index", ".html"); - f = fopen(path, "w"); + dname = ppa_display_name(ppa); + create_html(path, dname, HTML_INDEX_TEMPLATE, "ppastats_ppa();"); + free(path); + free(dname); +} - if (!f) { - fprintf(stderr, "ERROR: failed to open: %s\n", path); - return ; - } +static void +pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir) +{ + char *path, *json_path, *script; + json_object *json; + + json_path = path_new(dir, pkg->name, ".json"); + json = pkg_to_json(ppa, pkg); + if (debug) + printf("DEBUG: generating %s\n", json_path); + json_object_to_file(json_path, json); + json_object_put(json); + free(json_path); - fprintf(f, HTML_INDEX_TEMPLATE, ppa_to_json(ppa), HTML_FOOTER); + 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"); - fclose(f); + if (debug) + printf("DEBUG: generating %s\n", path); + create_html(path, pkg->name, HTML_PKG_TEMPLATE, script); free(path); + free(script); } -static char *append_path(const char *odir, const char *name) +static void +pkgs_to_html(struct ppa_stats *ppa, + struct package_stats **pkgs, + const char *dir) { - char *dir; + struct version_stats **versions; - dir = malloc(strlen(odir)+1+strlen(name)+1); + while (*pkgs) { + pkg_to_html(ppa, *pkgs, dir); - sprintf(dir, "%s/%s", odir, name); + versions = (*pkgs)->versions; + while (*versions) { + version_to_html(ppa, *pkgs, *versions, dir); + + versions++; + } - return dir; + pkgs++; + } } void @@ -491,7 +511,6 @@ ppa_to_html(const char *owner, const int install_static_files) { struct ppa_stats *ppastats; - struct daily_download_total **totals; char *path, *f_dst; char *css_dir, *js_dir; int i; @@ -502,19 +521,26 @@ 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"/jquery.jqplot.min.css", "css/jquery.jqplot.min.css" }; + mkdirs(output_dir, 0777); + if (install_static_files) { - css_dir = append_path(output_dir, "css"); - js_dir = append_path(output_dir, "js"); + css_dir = path_append(output_dir, "css"); + js_dir = path_append(output_dir, "js"); 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]); + for (i = 0; i < 7; i++) { + f_dst = path_append(output_dir, www_files[2*i+1]); + + if (debug) + printf("DEBUG: copying %s %s\n", + www_files[2*i], f_dst); fcopy(www_files[2*i], f_dst); free(f_dst); @@ -524,11 +550,10 @@ ppa_to_html(const char *owner, } ppastats = create_ppa_stats(owner, ppa, package_status); - totals = ppastats->daily_download_totals; 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);