X-Git-Url: http://wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fhtml.c;h=83c6fb639a936f203d3c45730965fb003d645c3d;hb=677d2bfc3beae998b73f48a4be3036f09d6848ff;hp=f24d93effae11c6c1e6044b4b93a559400d759f7;hpb=87f9e3fc5960cb9abfd918d7214c848bb988c91d;p=ppastats.git

diff --git a/src/html.c b/src/html.c
index f24d93e..83c6fb6 100644
--- a/src/html.c
+++ b/src/html.c
@@ -38,12 +38,23 @@
 #include <plog.h>
 #include <pstr.h>
 
+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)
 {
 	char *path;
@@ -64,45 +75,49 @@ 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;
@@ -110,29 +125,33 @@ static const char *get_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;
@@ -140,14 +159,16 @@ static const char *get_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;
@@ -521,41 +542,20 @@ ppa_to_html(const char *owner,
 	    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);
-			file_copy(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);
@@ -578,4 +578,7 @@ void html_cleanup()
 	free(ppa_body);
 	free(pkg_body);
 	free(pkg_version_body);
+	free(js_dir);
+	free(css_dir);
+	free(tpl_dir);
 }