Express file sizes in human readable format

[stagit.git] / src / stagit.c

diff --git a/src/stagit.c b/src/stagit.c
index cd18b03fd48522bb8f435de1571d97662db37df8..d7597f90c2b33d747db2410abc1fd001dffc7378 100644 (file)
--- a/src/stagit.c
+++ b/src/stagit.c
@@ -8,11 +8,13 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 
 #include <git2.h>
+#include <cmark-gfm.h>
 
 #include "cp.h"
 #include "compat.h"
@@ -65,6 +67,8 @@ static char *readmefiles[] = { "HEAD:README", "HEAD:README.md" };
 static char *readme;
 static long long nlogcommits = -1; /* < 0 indicates not used */
 
+bool htmlized; /* true if markdoown converted to HTML */
+
 /* cache */
 static git_oid lastoid;
 static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */
@@ -398,38 +402,57 @@ writefooter(FILE *fp)
        fputs("</div>\n</body>\n</html>\n", fp);
 }
 
+const char *
+get_ext(const char *filename)
+{
+       const char *dot = strrchr(filename, '.');
+       if(!dot || dot == filename) return "";
+       return dot + 1;
+}
+
 int
 call_chroma(const char *filename, FILE *fp, const char *s, size_t len)
 {
+       htmlized = false;
        // Flush HTML-file
        fflush(fp);
-       // Copy STDOUT
-       int stdout_copy = dup(1);
-       // Redirect STDOUT
-       dup2(fileno(fp), 1);
-
-       char cmd[] = "chroma --html --html-only --html-lines --html-lines-table --filename ";
-       strcat(cmd, filename);
-
-       FILE *child = popen(cmd, "w");
-       if (child == NULL) {
-               printf("child is null: %s", strerror(errno));
-               exit(1);
-       }
-       // Give filename through STDIN:
-       fprintf(child, "%s\n", filename);
-       // Give code to highlight through STDIN:
+
+       char *html = cmark_markdown_to_html(s, len, CMARK_OPT_DEFAULT);
+       if (strcmp(get_ext(filename), "md") == 0) htmlized = true;
+
        int lc;
-       size_t i;
-       for (i = 0; *s && i < len; s++, i++) {
-               if (*s == '\n') lc++;
-               fprintf(child, "%c", *s);
+       if (!htmlized) {
+               // Copy STDOUT
+               int stdout_copy = dup(1);
+
+               // Redirect STDOUT
+               dup2(fileno(fp), 1);
+
+               char cmd[255] = "chroma --html --html-only --html-lines --html-lines-table --filename ";
+               strncat(cmd, filename, strlen(filename) + 1);
+               FILE *child = popen(cmd, "w");
+               if (child == NULL) {
+                       printf("child is null: %s", strerror(errno));
+                       exit(1);
+               }
+
+               // Give code to highlight through STDIN:
+               size_t i;
+               for (i = 0; *s && i < len; s++, i++) {
+                       if (*s == '\n') lc++;
+                       fprintf(child, "%c", *s);
+               }
+
+               pclose(child);
+               fflush(stdout);
+
+               // Give back STDOUT.
+               dup2(stdout_copy, 1);
+
+       } else {
+               fprintf(fp, "%s", html);
        }
 
-       pclose(child);
-       fflush(stdout);
-       // Give back STDOUT.
-       dup2(stdout_copy, 1);
        return lc;
 }
 
@@ -779,6 +802,24 @@ writeatom(FILE *fp)
        return 0;
 }
 
+float
+rounder(float var)
+{
+    float value = (int)(var * 10 + .5);
+    return (float)value / 10;
+}
+
+const char *
+convertbytes(int bytes)
+{
+       (float)bytes;
+       static char outp[255] = "hi";
+       if (bytes < 1024) sprintf(outp, "%u %s", bytes, "B");
+       else if (bytes < 1048576) sprintf(outp, "%0.1f %s", rounder(bytes/1024.0), "K");
+       else sprintf(outp, "%0.1f %s", rounder(bytes/1048576.0), "M");
+       return outp;
+}
+
 int
 writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t filesize)
 {
@@ -804,7 +845,8 @@ writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t fi
        writeheader(fp, filename);
        fputs("<p> ", fp);
        xmlencode(fp, filename, strlen(filename));
-       fprintf(fp, " (%juB)", (uintmax_t)filesize);
+       fprintf(fp, " (%s)", convertbytes((int)filesize));
+
        fputs("</p><hr/>", fp);
 
        if (git_blob_is_binary((git_blob *)obj)) {
@@ -814,6 +856,7 @@ writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t fi
                if (ferror(fp))
                        err(1, "fwrite");
        }
+
        writefooter(fp);
        fclose(fp);
 
@@ -918,7 +961,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
                        if (lc > 0)
                                fprintf(fp, "%dL", lc);
                        else
-                               fprintf(fp, "%juB", (uintmax_t)filesize);
+                               fprintf(fp, "%s", convertbytes((int)filesize));
                        fputs("</td></tr>\n", fp);
                        git_object_free(obj);
                } else if (!git_submodule_lookup(&module, repo, entryname)) {
@@ -1278,6 +1321,8 @@ main(int argc, char *argv[])
        writefooter(fp);
        fclose(fp);
 
+       cp("files.html", "index.html");
+
        /* summary page with branches and tags */
        fp = efopen("refs.html", "w");
        writeheader(fp, "Refs");