]> git.armaanb.net Git - stagit.git/blobdiff - src/stagit.c
Generate raw file if htmlized
[stagit.git] / src / stagit.c
index 217021ee896c6a2124693b829175f65c69315ea1..b71eeda0db64c440eceda86eb7940ded010f574f 100644 (file)
 #include <unistd.h>
 
 #include <git2.h>
+
+#ifdef HAS_CMARK
 #include <cmark-gfm.h>
+#endif
 
 #include "cp.h"
 #include "compat.h"
@@ -347,7 +350,7 @@ void
 writeheader(FILE *fp, const char *title)
 {
        fputs("<!DOCTYPE html>\n"
-               "<html>\n<head>\n"
+               "<html lang=\"en\">\n<head>\n"
                "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
                "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" />\n"
                "<title>", fp);
@@ -364,7 +367,7 @@ writeheader(FILE *fp, const char *title)
        fprintf(fp, "<link rel=\"stylesheet\" type=\"text/css\" href=\"%sstyle.css\" />\n", relpath);
        fprintf(fp, "<link rel=\"stylesheet\" type=\"text/css\" href=\"%ssyntax.css\" />\n", relpath);
        fputs("</head>\n<body>\n<table><tr><td>", fp);
-       fprintf(fp, "<a href=\"../%s\"><img src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></a>",
+       fprintf(fp, "<a href=\"../%s\"><img alt=\"Home\" src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></a>",
                relpath, relpath);
        fputs("</td><td><h1>", fp);
        xmlencode(fp, strippedname, strlen(strippedname));
@@ -410,17 +413,21 @@ get_ext(const char *filename)
        return dot + 1;
 }
 
-int
+void
 call_chroma(const char *filename, FILE *fp, const char *s, size_t len)
 {
        htmlized = false;
+       char *html = "";
        // Flush HTML-file
        fflush(fp);
 
-       char *html = cmark_markdown_to_html(s, len, CMARK_OPT_DEFAULT);
+#ifdef HAS_CMARK
+       html = cmark_markdown_to_html(s, len, CMARK_OPT_DEFAULT);
        if (strcmp(get_ext(filename), "md") == 0) htmlized = true;
+#endif
+
 
-       int lc;
+#ifdef HAS_CHROMA
        if (!htmlized) {
                // Copy STDOUT
                int stdout_copy = dup(1);
@@ -439,7 +446,6 @@ call_chroma(const char *filename, FILE *fp, const char *s, size_t len)
                // 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);
                }
 
@@ -452,22 +458,20 @@ call_chroma(const char *filename, FILE *fp, const char *s, size_t len)
        } else {
                fprintf(fp, "%s", html);
        }
-
-       return lc;
+#else
+               fprintf(fp, "<pre>%s</pre>", s);
+#endif
 }
 
-int
+void
 writeblobhtml(const char *filename, FILE *fp, const git_blob *blob)
 {
-       int lc = 0;
        const char *s = git_blob_rawcontent(blob);
        git_off_t len = git_blob_rawsize(blob);
 
        if (len > 0) {
-               lc = call_chroma(filename, fp, s, len);
+               call_chroma(filename, fp, s, len);
        }
-
-       return lc;
 }
 
 void
@@ -802,20 +806,36 @@ writeatom(FILE *fp)
        return 0;
 }
 
-int
+float
+rounder(float var)
+{
+    int value = var * 10 + .5;
+    return value / 10.0;
+}
+
+const char *
+convertbytes(int bytes)
+{
+       bytes = (float)bytes;
+       static char outp[25];
+       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;
+}
+
+void
 writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t filesize)
 {
        char tmp[PATH_MAX] = "", *d;
        const char *p;
-       int lc = 0;
        FILE *fp;
 
        if (strlcpy(tmp, fpath, sizeof(tmp)) >= sizeof(tmp))
                errx(1, "path truncated: '%s'", fpath);
        if (!(d = dirname(tmp)))
                err(1, "dirname");
-       if (mkdirp(d))
-               return -1;
+       mkdirp(d);
 
        for (p = fpath, tmp[0] = '\0'; *p; p++) {
                if (*p == '/' && strlcat(tmp, "../", sizeof(tmp)) >= sizeof(tmp))
@@ -827,24 +847,30 @@ 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)) {
                fputs("<p>Binary file.</p>\n", fp);
        } else {
-               lc = writeblobhtml(filename, fp, (git_blob *)obj);
+               writeblobhtml(filename, fp, (git_blob *)obj);
                if (ferror(fp))
                        err(1, "fwrite");
+               else if (htmlized) {
+                       /* NOTE: recurses */
+                       char newfpath[PATH_MAX];
+                       strcat(newfpath, fpath);
+                       char newfilename[PATH_MAX];
+                       strcat(newfilename, filename);
+                       writeblob(obj, strcat(newfpath, "-raw"), strcat(newfilename, "-raw"), filesize);
+                       // TODO: Add view-raw button
+               }
        }
 
        writefooter(fp);
        fclose(fp);
 
        relpath = "";
-
-       return lc;
 }
 
 const char *
@@ -899,7 +925,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
        const char *entryname;
        char filepath[PATH_MAX], entrypath[PATH_MAX];
        size_t count, i;
-       int lc, r, ret;
+       int r, ret;
 
        count = git_tree_entrycount(tree);
        for (i = 0; i < count; i++) {
@@ -931,7 +957,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
                        }
 
                        filesize = git_blob_rawsize((git_blob *)obj);
-                       lc = writeblob(obj, filepath, entryname, filesize);
+                       writeblob(obj, filepath, entryname, filesize);
 
                        fputs("<tr><td>", fp);
                        fputs(filemode(git_tree_entry_filemode(entry)), fp);
@@ -940,10 +966,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
                        fputs("\">", fp);
                        xmlencode(fp, entrypath, strlen(entrypath));
                        fputs("</a></td><td class=\"num\" align=\"right\">", fp);
-                       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)) {