X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fhtml.c;h=f2d39bb39dc4782329485d44cd6758bb0622428f;hb=904cc6ab0bff6e4b31d5782839c07aeef0d95b6c;hp=07945f6caba7947d98c6895cb4289aa2fe2975fa;hpb=2f35163b296d5a733157e36a8c8910fa041766a7;p=ppastats.git
diff --git a/src/html.c b/src/html.c
index 07945f6..f2d39bb 100644
--- a/src/html.c
+++ b/src/html.c
@@ -36,105 +36,11 @@
#include "lp_ws.h"
#include "ppastats.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 +60,20 @@ static char *path_new(const char *dir, const char *file, const char *suffixe)
return path;
}
+static const char *get_header()
+{
+ const char *path;
+
+ 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 header;
+}
static const char *get_footer()
{
@@ -171,6 +90,51 @@ static const char *get_footer()
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;
@@ -396,6 +360,13 @@ version_to_html(struct ppa_stats *ppa,
char *f_name, *path;
FILE *f;
const char *footer;
+ const char *pkg_ver;
+
+ pkg_ver = get_pkg_version_body();
+ if (!pkg_ver) {
+ log_err("Failed to get package version template");
+ return ;
+ }
f_name = malloc(strlen(pkg->name)+1+strlen(version->version)+1);
sprintf(f_name, "%s_%s", pkg->name, version->version);
@@ -408,8 +379,7 @@ version_to_html(struct ppa_stats *ppa,
return ;
}
- fprintf(f, HTML_VERSION_TEMPLATE,
- version_to_json(ppa, pkg, version));
+ fprintf(f, pkg_ver, version_to_json(ppa, pkg, version));
footer = get_footer();
if (footer)
@@ -429,15 +399,22 @@ create_html(const char *path,
{
FILE *f;
const char *footer;
+ const char *header;
+
+ header = get_header();
+ if (!header) {
+ log_err(_("Failed to get the header template"));
+ return ;
+ }
f = fopen(path, "w");
if (!f) {
- log_err(_("failed to open: %s"), path);
+ log_err(_("Failed to open: %s"), path);
return ;
}
- fprintf(f, HTML_HEADER, title, script);
+ fprintf(f, header, title, script);
fputs(body_template, f);
footer = get_footer();
@@ -463,6 +440,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");
@@ -474,7 +458,7 @@ 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);
}
@@ -484,10 +468,17 @@ 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);
@@ -500,9 +491,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);
}
@@ -563,7 +554,7 @@ ppa_to_html(const char *owner,
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);
+ log_debug(_("Copying %s %s"), www_files[2*i], f_dst);
fcopy(www_files[2*i], f_dst);
free(f_dst);