X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fhtml.c;h=248cf827b8acc95bbbfae864ca2560e6ec06612b;hb=a2844e3fbd45dfe98e7fc923dd59ce38f2598f81;hp=6dc0c764e9ff78bce1125bfa32c3aa85f86575aa;hpb=b59ec44bffce28192c6408fed838c4d593a17c82;p=ppastats.git

diff --git a/src/html.c b/src/html.c
index 6dc0c76..248cf82 100644
--- a/src/html.c
+++ b/src/html.c
@@ -27,21 +27,22 @@
 #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 *footer;
+static char *ppa_body;
+static char *pkg_body;
+static char *pkg_version_body;
+static char *header;
 
 static char *path_new(const char *dir, const char *file, const char *suffixe)
 {
@@ -152,45 +153,10 @@ static const char *get_pkg_body()
 	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)
@@ -563,6 +529,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" };
 
@@ -575,11 +542,11 @@ 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);
-			fcopy(www_files[2*i], f_dst);
+			file_copy(www_files[2*i], f_dst);
 
 			free(f_dst);
 		}
@@ -599,3 +566,11 @@ ppa_to_html(const char *owner,
 
 	free(path);
 }
+
+void html_cleanup() {
+	free(header);
+	free(footer);
+	free(ppa_body);
+	free(pkg_body);
+	free(pkg_version_body);
+}