moved path_append to io.c

[ppastats.git] / src / html.c

diff --git a/src/html.c b/src/html.c
index e1c9e9f..c0dd767 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\
@@ -108,7 +101,9 @@ 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=\"charts\">\n\
+       <div id=\"chart\"></div>\n\
+    </div>\n\
     <div id=\"details\">\n\
       <div class=\"distros\">\n\
        <em>Distros</em>:\n\
@@ -145,71 +140,17 @@ enum file_copy_error {
        <ul id=\"pkgs\"></ul>\n\
       </div>\n\
     </div>\n\
-    <div id=\"chart\"></div>\n\
+    <div  id=\"charts\">\n\
+       <div id=\"chart\"></div>\n\
+    </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);
@@ -439,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) {
@@ -469,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) {
@@ -516,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) {
@@ -531,17 +472,6 @@ index_to_html(struct ppa_stats *ppa, const char *dir)
        free(path);
 }
 
-static char *append_path(const char *odir, const char *name)
-{
-       char *dir;
-
-       dir = malloc(strlen(odir)+1+strlen(name)+1);
-
-       sprintf(dir, "%s/%s", odir, name);
-
-       return dir;
-}
-
 void
 ppa_to_html(const char *owner,
            const char *ppa,
@@ -566,14 +496,14 @@ ppa_to_html(const char *owner,
                    "css/jquery.jqplot.min.css" };
 
        if (install_static_files) {
-               css_dir = append_path(output_dir, "css");
-               js_dir = append_path(output_dir, "js");
+               css_dir = path_append(output_dir, "css");
+               js_dir = path_append(output_dir, "js");
 
                mkdir(css_dir, 0777);
                mkdir(js_dir, 0777);
 
                for (i = 0; i < 6; i++) {
-                       f_dst = append_path(output_dir, www_files[2*i+1]);
+                       f_dst = path_append(output_dir, www_files[2*i+1]);
                        fcopy(www_files[2*i], f_dst);
 
                        free(f_dst);
@@ -585,7 +515,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);