", fp); @@ -360,11 +367,11 @@ 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)); - fputs("</h1><span class=\"desc\">", fp); + fputs("</h1></td></tr><tr><td></td><td><span class=\"desc\">", fp); xmlencode(fp, description, strlen(description)); fputs("</span></td></tr>", fp); if (cloneurl[0]) { @@ -387,6 +394,8 @@ writeheader(FILE *fp, const char *title) if (license) fprintf(fp, " | <a href=\"%sfile/%s.html\">LICENSE</a>", relpath, license); + fprintf(fp, " | <a href=\"%s%s.tar.gz\">Download</a>", + relpath, strippedname); fputs("</td></tr></table>\n<hr/>\n<div id=\"content\">\n", fp); } @@ -396,56 +405,76 @@ writefooter(FILE *fp) fputs("</div>\n</body>\n</html>\n", fp); } -int +const char * +get_ext(const char *filename) +{ + const char *dot = strrchr(filename, '.'); + if(!dot || dot == filename) return ""; + return dot + 1; +} + +void call_chroma(const char *filename, FILE *fp, const char *s, size_t len) { + htmlized = false; + char *html = ""; // 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: - int lc; - 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); - return lc; +#ifdef HAS_CMARK + html = cmark_markdown_to_html(s, len, CMARK_OPT_DEFAULT); + if (strcmp(get_ext(filename), "md") == 0) htmlized = true; +#endif + + +#ifdef HAS_CHROMA + 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++) { + fprintf(child, "%c", *s); + } + + pclose(child); + fflush(stdout); + + // Give back STDOUT. + dup2(stdout_copy, 1); + + } else { + fprintf(fp, "%s", html); + } +#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 +void printcommit(FILE *fp, struct commitinfo *ci) { fprintf(fp, "<b>commit</b> <a href=\"%scommit/%s.html\">%s</a>\n", @@ -473,7 +502,7 @@ printcommit(FILE *fp, struct commitinfo *ci) } } - void +void printshowfile(FILE *fp, struct commitinfo *ci) { const git_diff_delta *delta; @@ -777,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)) @@ -802,22 +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 * @@ -872,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++) { @@ -904,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); @@ -913,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)) { @@ -1209,6 +1259,12 @@ main(int argc, char *argv[]) submodules = ".gitmodules"; git_object_free(obj); + /* Generate tarball */ + char tarball[255]; + sprintf(tarball, "tar -zcf %s.tar.gz --ignore-failed-read --exclude='.git' %s", + strippedname, repodir); + system(tarball); + /* log for HEAD */ fp = efopen("log.html", "w"); relpath = ""; @@ -1270,6 +1326,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");

X-Git-Url: https://git.armaanb.net/?p=stagit.git;a=blobdiff_plain;f=src%2Fstagit.c;h=b71eeda0db64c440eceda86eb7940ded010f574f;hp=6e20754ed9fe82f23f4ba30789bc13d31aef08d1;hb=ad2d1ad6ad71921d029c3fbba22a3d1b6f35cf5a;hpb=14794fb8e99c0dcf8f6bdde7f612bd13cf1d513c diff --git a/src/stagit.c b/src/stagit.c index 6e20754..b71eeda 100644 --- a/src/stagit.c +++ b/src/stagit.c @@ -8,12 +8,17 @@ #include #include #include +#include #include #include #include #include +#ifdef HAS_CMARK +#include +#endif + #include "cp.h" #include "compat.h" @@ -65,6 +70,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 */ @@ -343,7 +350,7 @@ void writeheader(FILE *fp, const char *title) { fputs("\n" - "\n\n" + "\n\n" "\n" "\n" "", fp); @@ -360,11 +367,11 @@ 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)); - fputs("</h1><span class=\"desc\">", fp); + fputs("</h1></td></tr><tr><td></td><td><span class=\"desc\">", fp); xmlencode(fp, description, strlen(description)); fputs("</span></td></tr>", fp); if (cloneurl[0]) { @@ -387,6 +394,8 @@ writeheader(FILE *fp, const char *title) if (license) fprintf(fp, " | <a href=\"%sfile/%s.html\">LICENSE</a>", relpath, license); + fprintf(fp, " | <a href=\"%s%s.tar.gz\">Download</a>", + relpath, strippedname); fputs("</td></tr></table>\n<hr/>\n<div id=\"content\">\n", fp); } @@ -396,56 +405,76 @@ writefooter(FILE *fp) fputs("</div>\n</body>\n</html>\n", fp); } -int +const char * +get_ext(const char *filename) +{ + const char *dot = strrchr(filename, '.'); + if(!dot || dot == filename) return ""; + return dot + 1; +} + +void call_chroma(const char *filename, FILE *fp, const char *s, size_t len) { + htmlized = false; + char *html = ""; // 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: - int lc; - 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); - return lc; +#ifdef HAS_CMARK + html = cmark_markdown_to_html(s, len, CMARK_OPT_DEFAULT); + if (strcmp(get_ext(filename), "md") == 0) htmlized = true; +#endif + + +#ifdef HAS_CHROMA + 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++) { + fprintf(child, "%c", *s); + } + + pclose(child); + fflush(stdout); + + // Give back STDOUT. + dup2(stdout_copy, 1); + + } else { + fprintf(fp, "%s", html); + } +#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 +void printcommit(FILE *fp, struct commitinfo *ci) { fprintf(fp, "<b>commit</b> <a href=\"%scommit/%s.html\">%s</a>\n", @@ -473,7 +502,7 @@ printcommit(FILE *fp, struct commitinfo *ci) } } - void +void printshowfile(FILE *fp, struct commitinfo *ci) { const git_diff_delta *delta; @@ -777,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)) @@ -802,22 +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 * @@ -872,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++) { @@ -904,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); @@ -913,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)) { @@ -1209,6 +1259,12 @@ main(int argc, char *argv[]) submodules = ".gitmodules"; git_object_free(obj); + /* Generate tarball */ + char tarball[255]; + sprintf(tarball, "tar -zcf %s.tar.gz --ignore-failed-read --exclude='.git' %s", + strippedname, repodir); + system(tarball); + /* log for HEAD */ fp = efopen("log.html", "w"); relpath = ""; @@ -1270,6 +1326,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");