#include <sys/stat.h>
#include <sys/types.h>
-#include <json/json.h>
+#include <json.h>
#include "html.h"
-#include "io.h"
-#include "log.h"
#include "lp.h"
+#include <lp_json.h>
#include "lp_ws.h"
#include "ppastats.h"
-#include "str.h"
+#include <pio.h>
+#include <plog.h>
+#include <pstr.h>
-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)
{
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;
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;
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)
return json;
}
+static int version_cmp(const void *o1, const void *o2)
+{
+ struct version_stats **v1, **v2;
+
+ v1 = (struct version_stats **)o1;
+ v2 = (struct version_stats **)o2;
+
+ return (*v1)->date_created <= (*v2)->date_created;
+}
+
+static struct version_stats **sort_versions(struct version_stats **vers)
+{
+ size_t n;
+ struct version_stats **tmp, **result;
+
+ tmp = vers;
+ n = 0;
+ while (*tmp) {
+ n++;
+ tmp++;
+ }
+
+ result = malloc((n + 1) * sizeof(struct version_stats *));
+ memcpy(result, vers, n * sizeof(struct version_stats *));
+ result[n] = NULL;
+
+ qsort(result, n, sizeof(struct version_stats *), version_cmp);
+
+ return result;
+}
+
static json_object *
pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg)
{
json_object *json, *json_versions, *json_distros, *json_distro;
- struct version_stats **versions;
+ struct version_stats **versions, **tmp;
struct distro_stats **distros, *d;
json = json_object_new_object();
json_versions = json_object_new_array();
json_object_object_add(json, "versions", json_versions);
- versions = pkg->versions;
- while (*versions) {
+ versions = sort_versions(pkg->versions);
+ tmp = versions;
+ while (*tmp) {
json_object_array_add
(json_versions,
- json_object_new_string((*versions)->version));
+ json_object_new_string((*tmp)->version));
- versions++;
+ tmp++;
}
+ free(versions);
distros = pkg->distros;
if (distros) {
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;
create_html(path, f_name, body, script);
+ free(script);
free(json);
free(path);
free(f_name);
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);
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);
+}