\n\

\n\ Distros:\n\ @@ -117,105 +101,58 @@ enum file_copy_error {

\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" - -#define FCOPY_BUF_SZ 4096 -static int file_copy(FILE * src, FILE * dst) -{ - 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; - } - } - - free(buf); - - return ret; -} - -int -fcopy(const char *src, const char *dst) -{ - FILE *fsrc, *fdst; - int ret = 0; + \n\ + \n\ +\n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n\ + \n" - if (debug) - printf("DEBUG: copy: %s to %s\n", src, dst); - - fsrc = fopen(src, "r"); - - if (fsrc) { - fdst = fopen(dst, "w+"); - - if (fdst) { - ret = file_copy(fsrc, fdst); - fclose(fdst); - } else { - ret = FILE_COPY_ERROR_OPEN_DST; - } - - fclose(fsrc); - } else { - ret = FILE_COPY_ERROR_OPEN_SRC; - } - - return ret; -} - -static char *get_path(const char *dir, const char *file) +#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) { char *path = malloc(strlen(dir)+1+ strlen(file)+ strlen(".html")+ + (suffixe ? strlen(suffixe) : 0) + 1); strcpy(path, dir); strcat(path, "/"); strcat(path, file); - strcat(path, ".html"); + strcat(path, suffixe); return path; } @@ -261,12 +198,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(); @@ -296,19 +252,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++; } @@ -316,11 +267,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, @@ -391,9 +338,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; @@ -424,122 +370,140 @@ static char *ppa_to_json(struct ppa_stats *ppa) pkgs++; } - ret = strdup(json_object_to_json_string(json)); - - json_object_put(json); - - return ret; + return json; } - static void -pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir) +version_to_html(struct ppa_stats *ppa, + struct package_stats *pkg, + struct version_stats *version, + const char *dir) { - char *path; + char *f_name, *path; FILE *f; - char *json; - path = get_path(dir, pkg->name); + 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) { - fprintf(stderr, "ERROR: failed to open: %s\n", path); + log_err(_("failed to open: %s"), path); return ; } - json = pkg_to_json(ppa, pkg); - - fprintf(f, HTML_PKG_TEMPLATE, json, HTML_FOOTER); + fprintf(f, HTML_VERSION_TEMPLATE, + version_to_json(ppa, pkg, version), + HTML_FOOTER); fclose(f); free(path); - free(json); + free(f_name); } static void -version_to_html(struct ppa_stats *ppa, - struct package_stats *pkg, - struct version_stats *version, - const char *dir) +create_html(const char *path, + const char *title, + const char *body_template, + const char *script) { - char *f_name, *path; FILE *f; - 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"); if (!f) { - fprintf(stderr, "ERROR: failed to open: %s\n", path); + log_err(_("failed to open: %s"), path); return ; } - fprintf(f, HTML_VERSION_TEMPLATE, - version_to_json(ppa, pkg, version), - HTML_FOOTER); + fprintf(f, HTML_HEADER, title, script); + fputs(body_template, f); + fputs(HTML_FOOTER, f); fclose(f); +} - free(path); - free(f_name); +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 -packages_to_html(struct ppa_stats *ppa, - struct package_stats **packages, - const char *dir) +index_to_html(struct ppa_stats *ppa, const char *dir) { - struct package_stats **cur; - struct version_stats **versions; - - cur = packages; - while (*cur) { - pkg_to_html(ppa, *cur, dir); + char *path, *json_path, *dname; + json_object *json; - versions = (*cur)->versions; - while (*versions) { - version_to_html(ppa, *cur, *versions, dir); + json = ppa_to_json(ppa); + json_path = path_new(dir, "index", ".json"); - versions++; - } + log_debug(_("generating %s"), json_path); + json_object_to_file(json_path, json); + json_object_put(json); + free(json_path); - cur++; - } + path = path_new(dir, "index", ".html"); + dname = ppa_display_name(ppa); + create_html(path, dname, HTML_INDEX_TEMPLATE, "ppastats_ppa();"); + free(path); + free(dname); } static void -index_to_html(struct ppa_stats *ppa, const char *dir) +pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir) { - char *path; - FILE *f; + char *path, *json_path, *script; + json_object *json; - path = get_path(dir, "index"); - f = fopen(path, "w"); + json_path = path_new(dir, pkg->name, ".json"); + json = pkg_to_json(ppa, pkg); + log_debug(_("generating %s"), json_path); - if (!f) { - fprintf(stderr, "ERROR: failed to open: %s\n", path); - return ; - } + 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); + log_debug(_("generating %s"), 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); - return dir; + versions++; + } + + pkgs++; + } } void @@ -550,7 +514,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; @@ -561,19 +524,24 @@ 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]); + + log_debug(_("copying %s %s"), www_files[2*i], f_dst); fcopy(www_files[2*i], f_dst); free(f_dst); @@ -583,11 +551,10 @@ ppa_to_html(const char *owner, } ppastats = create_ppa_stats(owner, ppa, package_status); - totals = ppastats->daily_download_totals; - 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);