X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fhtml.c;h=a6acc2f314d730a2feac9f389f8df649e494340f;hb=1378a843b2e5ce3fbc4429b07844cc37d42e0d8e;hp=797b128ee9c10b0a3dabadecf9953e44430e525b;hpb=301be453975067183367ea8c29069476bf1b45ff;p=ppastats.git
diff --git a/src/html.c b/src/html.c
index 797b128..a6acc2f 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
@@ -35,106 +35,13 @@
#include "lp.h"
#include "lp_ws.h"
#include "ppastats.h"
+#include "str.h"
-static char *footer;
-
-#define HTML_PKG_TEMPLATE \
-"
N/A \n\
- \n\
- "
-
-#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\
- \n\
-
\n\
-
Distros :\n\
-
\n\
-
\n\
-
\n"
-
-#define HTML_HEADER \
-"\n\
- \n\
- %s \n\
- \n\
- \n\
- \n\
-\n\
- \n\
- \n\
- \n\
- \n\
- \n\
- \n\
- \n"
-
-#define HTML_INDEX_TEMPLATE \
-" N/A \n\
- \n\
-
\n\
-
Packages :\n\
-
\n\
-
\n\
-
\n\
- \n"
+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 *path_new(const char *dir, const char *file, const char *suffixe)
{
@@ -154,7 +61,36 @@ static char *path_new(const char *dir, const char *file, const char *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;
+ }
+ }
+ 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()
{
@@ -165,13 +101,57 @@ static const char *get_footer()
footer = file_get_content(path);
if (!footer)
- log_err("Failed to get footer template: %s", path);
+ log_err("Failed to read footer template: %s", path);
}
-
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;
+
+ if (!ppa_body) {
+ path = DEFAULT_WWW_DIR"/ppa.tpl";
+ ppa_body = file_get_content(path);
+
+ if (!ppa_body)
+ log_err("Failed to read PPA template: %s", path);
+ }
+
+ return ppa_body;
+}
+
+static const char *get_pkg_body()
+{
+ const char *path;
+
+ if (!pkg_body) {
+ path = DEFAULT_WWW_DIR"/pkg.tpl";
+ pkg_body = file_get_content(path);
+
+ if (!pkg_body)
+ log_err("Failed to read package template: %s", path);
+ }
+
+ return pkg_body;
+}
+
static struct json_object *date_to_json(struct tm *tm)
{
json_object *json;
@@ -389,40 +369,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,
@@ -430,22 +376,36 @@ create_html(const char *path,
{
FILE *f;
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;
+ }
f = fopen(path, "w");
if (!f) {
- log_err(_("failed to open: %s"), path);
- return ;
+ log_err(_("Failed to open: %s"), path);
+ goto on_error;
}
- fprintf(f, HTML_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)
@@ -464,6 +424,13 @@ 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");
@@ -475,20 +442,66 @@ index_to_html(struct ppa_stats *ppa, const char *dir)
path = path_new(dir, "index", ".html");
dname = ppa_display_name(ppa);
- create_html(path, dname, HTML_INDEX_TEMPLATE, "ppastats_ppa();");
+ create_html(path, dname, body, "ppastats_ppa();");
free(path);
free(dname);
}
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(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 ;
+ }
json_path = path_new(dir, pkg->name, ".json");
json = pkg_to_json(ppa, pkg);
- log_debug(_("generating %s"), json_path);
+ log_debug(_("Generating %s"), json_path);
json_object_to_file(json_path, json);
json_object_put(json);
@@ -501,9 +514,9 @@ pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir)
1);
sprintf(script, "ppastats_pkg(\"%s%s\");", pkg->name, ".json");
- log_debug(_("generating %s"), path);
+ log_debug(_("Generating %s"), path);
- create_html(path, pkg->name, HTML_PKG_TEMPLATE, script);
+ create_html(path, pkg->name, body, script);
free(path);
free(script);
}
@@ -534,7 +547,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;
@@ -549,6 +563,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" };
@@ -561,10 +576,10 @@ 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);
+ log_debug(_("Copying %s %s"), www_files[2*i], f_dst);
fcopy(www_files[2*i], f_dst);
free(f_dst);
@@ -573,7 +588,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");