projects / ppastats.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
moved copy fcts to separate file
[ppastats.git] / src / html.c
diff --git a/src/html.c b/src/html.c
index 29f9e37..9eb0bcf 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -27,18 +27,11 @@
 #include <json/json.h>
 
 #include "html.h"
+#include "io.h"
 #include "lp.h"
 #include "lp_ws.h"
 #include "ppastats.h"
 
-enum file_copy_error {
-       FILE_COPY_ERROR_OPEN_SRC = 1,
-       FILE_COPY_ERROR_OPEN_DST,
-       FILE_COPY_ERROR_READ,
-       FILE_COPY_ERROR_WRITE,
-       FILE_COPY_ERROR_ALLOC_BUFFER
-};
-
 #define HTML_FOOTER \
 " <div id=\"footer\">Generated by \
 <a href='http://wpitchoune.net/ppastats'>ppastats</a></div>\n\
@@ -71,8 +64,14 @@ enum file_copy_error {
        <a href=\"index.html\">\n\
           <span id=\"ppa_owner\">N/A</span>/<span id=\"ppa_name\">N/A</span>\n\
        </a></p>\n\
-    <div id=\"chart\"></div>\n\
-    <div id=\"versions\"><em>Versions:</em></div>\n\
+    <div id=\"charts\">\n\
+       <div id=\"chart\"></div>\n\
+       <div id=\"chart_distro\"></div>\n\
+    </div>\n\
+    <div id=\"details\">\n\
+      <div id=\"versions\"><em>Versions:</em></div>\n\
+      <div id=\"distros\"><em>Distros:</em></div>\n\
+    </div>\n\
 %s"
 
 #define HTML_VERSION_TEMPLATE \
@@ -102,10 +101,14 @@ enum file_copy_error {
        <a href=\"index.html\">\n\
           <span id=\"ppa_owner\">N/A</span>/<span id=\"ppa_name\">N/A</span>\n\
        </a></p>\n\
-    <div id=\"chart\"></div>\n\
-    <div class=\"distros\">\n\
-       <em>Distros</em>:\n\
-       <ul id=\"distros\"></ul>\n\
+    <div id=\"charts\">\n\
+       <div id=\"chart\"></div>\n\
+    </div>\n\
+    <div id=\"details\">\n\
+      <div class=\"distros\">\n\
+       <em>Distros</em>:\n\
+       <ul id=\"distros\"></ul>\n\
+      </div>\n\
     </div>\n\
 %s"
 
@@ -131,75 +134,23 @@ enum file_copy_error {
   </head>\n\
   <body>\n\
     <h1><span id=\"ppa_name\">N/A</span></h1>\n\
-    <div class=\"pkgs\">\n\
-       <em>Packages</em>:\n\
-       <ul id=\"pkgs\"></ul>\n\
+    <div id=\"details\">\n\
+      <div class=\"pkgs\">\n\
+       <em>Packages</em>:\n\
+       <ul id=\"pkgs\"></ul>\n\
+      </div>\n\
+    </div>\n\
+    <div  id=\"charts\">\n\
+       <div id=\"chart\"></div>\n\
     </div>\n\
-    <div id=\"chart\"></div>\n\
 %s"
 
-#define FCOPY_BUF_SZ 4096
-static int file_copy(FILE * src, FILE * dst)
-{
-       int ret = 0;
-       char *buf = malloc(FCOPY_BUF_SZ);
-       int n;
-
-       if (!buf)
-               return FILE_COPY_ERROR_ALLOC_BUFFER;
-
-       while (!ret) {
-               n = fread(buf, 1, FCOPY_BUF_SZ, src);
-               if (n) {
-                       if (fwrite(buf, 1, n, dst) != n)
-                               ret = FILE_COPY_ERROR_WRITE;
-               } else {
-                       if (!feof(src))
-                               ret = FILE_COPY_ERROR_READ;
-                       else
-                               break;
-               }
-       }
-
-       free(buf);
-
-       return ret;
-}
-
-int
-fcopy(const char *src, const char *dst)
-{
-       FILE *fsrc, *fdst;
-       int ret = 0;
-
-       if (debug)
-               printf("DEBUG: copy: %s to %s\n", src, dst);
-
-       fsrc = fopen(src, "r");
-
-       if (fsrc) {
-               fdst = fopen(dst, "w+");
-
-               if (fdst) {
-                       ret = file_copy(fsrc, fdst);
-                       fclose(fdst);
-               } else {
-                       ret = FILE_COPY_ERROR_OPEN_DST;
-               }
-
-               fclose(fsrc);
-       } else {
-               ret = FILE_COPY_ERROR_OPEN_SRC;
-       }
-
-       return ret;
-}
-
-static char *get_path(const char *dir, const char *file)
+static char *path_new(const char *dir, const char *file, const char *suffixe)
 {
        char *path = malloc(strlen(dir)+1+
                            strlen(file)+
                            strlen(".html")+
+                           (suffixe ? strlen(suffixe) : 0) +
                            1);
 
        strcpy(path, dir);
@@ -253,9 +204,10 @@ static void json_add_ddts(json_object *json,
 
 static char *pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg)
 {
-       json_object *json, *json_versions;
+       json_object *json, *json_versions, *json_distros, *json_distro;
        char *ret;
        struct version_stats **versions;
+       struct distro_stats **distros, *distro;
 
        json = json_object_new_object();
 
@@ -279,6 +231,30 @@ static char *pkg_to_json(struct ppa_stats *ppa, struct package_stats *pkg)
                versions++;
        }
 
+       distros = pkg->distros;
+       if (distros) {
+               json_distros = json_object_new_array();
+               json_object_object_add(json, "distros", json_distros);
+
+               while (*distros) {
+                       distro = *distros;
+
+                       json_distro = json_object_new_object();
+                       json_object_array_add(json_distros, json_distro);
+                       json_object_object_add
+                               (json_distro,
+                                "name", json_object_new_string(distro->name));
+                       json_object_object_add
+                               (json_distro,
+                                "count",
+                                json_object_new_int(distro->download_count));
+
+                       json_add_ddts(json_distro, distro->ddts);
+
+                       distros++;
+               }
+       }
+
        json_add_ddts(json, pkg->daily_download_totals);
 
        ret = strdup(json_object_to_json_string(json));
@@ -404,7 +380,7 @@ pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir)
        FILE *f;
        char *json;
 
-       path = get_path(dir, pkg->name);
+       path = path_new(dir, pkg->name, ".html");
        f = fopen(path, "w");
 
        if (!f) {
@@ -434,7 +410,7 @@ version_to_html(struct ppa_stats *ppa,
        f_name = malloc(strlen(pkg->name)+1+strlen(version->version)+1);
        sprintf(f_name, "%s_%s", pkg->name, version->version);
 
-       path = get_path(dir, f_name);
+       path = path_new(dir, f_name, ".html");
        f = fopen(path, "w");
 
        if (!f) {
@@ -481,7 +457,7 @@ index_to_html(struct ppa_stats *ppa, const char *dir)
        char *path;
        FILE *f;
 
-       path = get_path(dir, "index");
+       path = path_new(dir, "index", ".html");
        f = fopen(path, "w");
 
        if (!f) {
@@ -550,7 +526,7 @@ ppa_to_html(const char *owner,
        ppastats = create_ppa_stats(owner, ppa, package_status);
        totals = ppastats->daily_download_totals;
 
-       path = get_path(output_dir, "ppa");
+       path = path_new(output_dir, "ppa", ".html");
 
        packages_to_html(ppastats, ppastats->packages, output_dir);
 
ppastats is a command line tool which produces HTML report for viewing download statistics of an Ubuntu PPA.