Commit e46f587ca8c2affae88104d037a368b3802c7492
2020-01-29T16:48:01
add gw_blob to increase the usefulness of gw_tree
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473
diff --git a/gotweb/files/cgi-bin/gw_tmpl/blob.tmpl b/gotweb/files/cgi-bin/gw_tmpl/blob.tmpl
new file mode 100644
index 0000000..1281926
--- /dev/null
+++ b/gotweb/files/cgi-bin/gw_tmpl/blob.tmpl
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>@@title@@</title>
+ @@head@@
+ </head>
+ <body>
+ <div id="gw_body">
+ <div id="header">
+ @@header@@
+ </div>
+ <div id="site_path">
+ @@sitepath@@
+ @@search@@
+ </div>
+ <div id="content">
+ @@content@@
+ </div>
+ @@siteowner@@
+ </div>
+ </body>
+</html>
diff --git a/gotweb/files/htdocs/gotweb/gotweb.css b/gotweb/files/htdocs/gotweb/gotweb.css
index 1464010..353aeae 100644
--- a/gotweb/files/htdocs/gotweb/gotweb.css
+++ b/gotweb/files/htdocs/gotweb/gotweb.css
@@ -591,6 +591,78 @@ body {
overflow: visible;
}
+/* blob.tmpl */
+
+#blob_title_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+ background-color: LightSlateGray;
+ color: #ffffff;
+}
+#blob_title {
+ padding-left: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+#blob_content {
+ clear: left;
+ float: left;
+ width: 100%;
+}
+#blob_header_wrapper {
+ float: left;
+ background-color: #f5fcfb;
+ width: 100%;
+}
+#blob_header {
+ float: left;
+ padding-left: 10px;
+ padding-top: 5px;
+ padding-bottom: 2px;
+ width: 80%;
+}
+#blob {
+ clear: left;
+ float: left;
+ margin-left: 20px;
+ margin-top: 20px;
+ margin-bottom: 20px;
+ font-family: monospace;
+ white-space: pre;
+ overflow: auto;
+}
+#blob_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+}
+#blob_number {
+ float: left;
+ width: 3em;
+ overflow: hidden;
+}
+#blob_hash {
+ float: left;
+ width: 6em;
+ overflow: auto;
+}
+#blob_date {
+ float: left;
+ width: 7em;
+ overflow: auto;
+}
+#blob_author {
+ float: left;
+ width: 6em;
+ overflow: hidden;
+}
+#blob_code {
+ float:left;
+ width: 50%;
+ overflow: visible;
+}
+
/* tree.tmpl */
#tree_title_wrapper {
@@ -640,6 +712,18 @@ body {
clear: left;
float: left;
width: 20em;
+ padding: 1px;
+}
+#tree_line_blank {
+ float: left;
+ padding: 1px;
+ width: 8em;
+}
+#tree_line_navs {
+ float: left;
+ text-align: right;
+ padding: 1px;
+ width: 8em;
}
/* tag.tmpl */
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index 6c89bc7..f1c85a7 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -164,7 +164,7 @@ static char *gw_get_repo_owner(struct gw_trans *,
static char *gw_get_time_str(time_t, int);
static const struct got_error *gw_get_repo_age(char **, struct gw_trans *,
char *, char *, int);
-static char *gw_get_file_blame(struct gw_trans *);
+static char *gw_get_file_blame_blob(struct gw_trans *);
static char *gw_get_repo_tree(struct gw_trans *);
static char *gw_get_diff(struct gw_trans *,
struct gw_header *);
@@ -209,6 +209,7 @@ static const struct got_error* gw_load_got_path(struct gw_trans *,
static const struct got_error* gw_parse_querystring(struct gw_trans *);
static const struct got_error* gw_blame(struct gw_trans *);
+static const struct got_error* gw_blob(struct gw_trans *);
static const struct got_error* gw_diff(struct gw_trans *);
static const struct got_error* gw_index(struct gw_trans *);
static const struct got_error* gw_commits(struct gw_trans *);
@@ -226,6 +227,7 @@ struct gw_query_action {
enum gw_query_actions {
GW_BLAME,
+ GW_BLOB,
GW_BRIEFS,
GW_COMMITS,
GW_DIFF,
@@ -238,6 +240,7 @@ enum gw_query_actions {
static struct gw_query_action gw_query_funcs[] = {
{ GW_BLAME, "blame", gw_blame, "gw_tmpl/blame.tmpl" },
+ { GW_BLOB, "blob", gw_blob, "gw_tmpl/blob.tmpl" },
{ GW_BRIEFS, "briefs", gw_briefs, "gw_tmpl/briefs.tmpl" },
{ GW_COMMITS, "commits", gw_commits, "gw_tmpl/commit.tmpl" },
{ GW_DIFF, "diff", gw_diff, "gw_tmpl/diff.tmpl" },
@@ -324,7 +327,7 @@ gw_blame(struct gw_trans *gw_trans)
if (error)
goto done;
- blame_html = gw_get_file_blame(gw_trans);
+ blame_html = gw_get_file_blame_blob(gw_trans);
if (blame_html == NULL) {
blame_html = strdup("");
@@ -360,6 +363,64 @@ done:
}
static const struct got_error *
+gw_blob(struct gw_trans *gw_trans)
+{
+ const struct got_error *error = NULL;
+ struct gw_header *header = NULL;
+ char *blob = NULL, *blob_html = NULL, *blob_html_disp = NULL;
+ enum kcgi_err kerr;
+
+ if (pledge("stdio rpath wpath cpath proc exec sendfd unveil",
+ NULL) == -1)
+ return got_error_from_errno("pledge");
+
+ if ((header = gw_init_header()) == NULL)
+ return got_error_from_errno("malloc");
+
+ error = gw_apply_unveil(gw_trans->gw_dir->path, NULL);
+ if (error)
+ goto done;
+
+ error = gw_get_header(gw_trans, header, 1);
+ if (error)
+ goto done;
+
+ blob_html = gw_get_file_blame_blob(gw_trans);
+
+ if (blob_html == NULL) {
+ blob_html = strdup("");
+ if (blob_html == NULL) {
+ error = got_error_from_errno("strdup");
+ goto done;
+ }
+ }
+
+ if (asprintf(&blob_html_disp, blob_header,
+ gw_gen_age_header(gw_get_time_str(header->committer_time, TM_LONG)),
+ gw_gen_commit_msg_header(gw_html_escape(header->commit_msg)),
+ blob_html) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if (asprintf(&blob, blob_wrapper, blob_html_disp) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ kerr = khttp_puts(gw_trans->gw_req, blob);
+ if (kerr != KCGI_OK)
+ error = gw_kcgi_error(kerr);
+done:
+ got_ref_list_free(&header->refs);
+ gw_free_headers(header);
+ free(blob_html_disp);
+ free(blob_html);
+ free(blob);
+ return error;
+}
+
+static const struct got_error *
gw_diff(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
@@ -593,10 +654,10 @@ gw_commits(struct gw_trans *gw_trans)
}
if (asprintf(&commits_html, commits_line,
- gw_gen_commit_header(n_header->commit_id,
+ gw_gen_commit_header(n_header->commit_id,
n_header->refs_str),
- gw_gen_author_header(n_header->author),
- gw_gen_committer_header(n_header->committer),
+ gw_gen_author_header(n_header->author),
+ gw_gen_committer_header(n_header->committer),
gw_gen_age_header(gw_get_time_str(n_header->committer_time,
TM_LONG)), gw_html_escape(n_header->commit_msg),
commits_navs_html) == -1) {
@@ -1551,8 +1612,8 @@ gw_get_diff(struct gw_trans *gw_trans, struct gw_header *header)
FILE *f = NULL;
struct got_object_id *id1 = NULL, *id2 = NULL;
struct buf *diffbuf = NULL;
- char *label1 = NULL, *label2 = NULL, *diff_html = NULL, *buf = NULL,
- *buf_color = NULL, *n_buf = NULL, *newline = NULL;
+ char *label1 = NULL, *label2 = NULL, *diff_html = NULL, *buf = NULL;
+ char *buf_color = NULL, *n_buf = NULL, *newline = NULL;
int obj_type;
size_t newsize;
@@ -1736,9 +1797,8 @@ gw_get_repo_tags(struct gw_trans *gw_trans, struct gw_header *header, int limit,
struct got_repository *repo = NULL;
struct got_reflist_head refs;
struct got_reflist_entry *re;
- char *tags = NULL, *tag_row = NULL, *tags_navs_disp = NULL,
- *age = NULL;
- char *newline;
+ char *tags = NULL, *tag_row = NULL, *tags_navs_disp = NULL;
+ char *age = NULL, *newline;
struct buf *diffbuf = NULL;
size_t newsize;
@@ -1978,8 +2038,7 @@ gw_get_commit(struct gw_trans *gw_trans, struct gw_header *header)
struct got_reflist_entry *re;
struct got_object_id *id2 = NULL;
struct got_object_qid *parent_id;
- char *refs_str = NULL,
- *commit_msg = NULL, *commit_msg0;
+ char *refs_str = NULL, *commit_msg = NULL, *commit_msg0;
/*print commit*/
SIMPLEQ_FOREACH(re, &header->refs, entry) {
@@ -2315,15 +2374,15 @@ done:
}
static char*
-gw_get_file_blame(struct gw_trans *gw_trans)
+gw_get_file_blame_blob(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
struct got_repository *repo = NULL;
struct got_object_id *obj_id = NULL;
struct got_object_id *commit_id = NULL;
struct got_blob_object *blob = NULL;
- char *blame_html = NULL, *path = NULL, *in_repo_path = NULL,
- *folder = NULL;
+ char *blame_html = NULL, *path = NULL, *in_repo_path = NULL;
+ char *folder = NULL;
struct gw_blame_cb_args bca;
int i, obj_type;
size_t filesize;
@@ -2391,6 +2450,17 @@ gw_get_file_blame(struct gw_trans *gw_trans)
if (error || bca.nlines == 0)
goto done;
+ if (gw_trans->action == GW_BLOB) {
+ int len;
+ fseek(bca.f, 0, SEEK_END);
+ len = ftell(bca.f) + 1;
+ fseek(bca.f, 0, SEEK_SET);
+ if ((blame_html = calloc(len, sizeof(char *))) == NULL)
+ goto done;
+ fread(blame_html, 1, len, bca.f);
+ goto done;
+ }
+
/* Don't include \n at EOF in the blame line count. */
if (bca.line_offsets[bca.nlines - 1] == filesize)
bca.nlines--;
@@ -2412,24 +2482,21 @@ gw_get_file_blame(struct gw_trans *gw_trans)
error = got_blame(in_repo_path, commit_id, repo, gw_blame_cb, &bca,
NULL, NULL);
+ if (error)
+ goto done;
if (buf_len(bca.blamebuf) > 0) {
error = buf_putc(bca.blamebuf, '\0');
blame_html = strdup(buf_get(bca.blamebuf));
}
done:
+ free(bca.line_offsets);
free(bca.blamebuf);
free(in_repo_path);
free(commit_id);
free(obj_id);
free(path);
- if (blob)
- error = got_object_blob_close(blob);
- if (repo)
- error = got_repo_close(repo);
- if (error)
- return NULL;
- if (bca.lines) {
+ if (gw_trans->action != GW_BLOB && bca.lines) {
for (i = 0; i < bca.nlines; i++) {
struct blame_line *bline = &bca.lines[i];
free(bline->id_str);
@@ -2437,9 +2504,16 @@ done:
}
free(bca.lines);
}
- free(bca.line_offsets);
+ if (error)
+ return NULL;
if (bca.f && fclose(bca.f) == EOF && error == NULL)
- error = got_error_from_errno("fclose");
+ return NULL;
+ if (blob)
+ error = got_object_blob_close(blob);
+ if (error)
+ return NULL;
+ if (repo)
+ error = got_repo_close(repo);
if (error)
return NULL;
else
@@ -2566,6 +2640,12 @@ gw_get_repo_tree(struct gw_trans *gw_trans)
error = got_error_from_errno("asprintf");
goto done;
}
+ if (asprintf(&tree_row, tree_line, class, url_html,
+ class) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
} else {
if (gw_trans->repo_folder != NULL) {
if (asprintf(&build_folder, "%s",
@@ -2578,22 +2658,29 @@ gw_get_repo_tree(struct gw_trans *gw_trans)
build_folder = strdup("");
if (asprintf(&url_html, file_html, gw_trans->repo_name,
- "blame", gw_trans->commit,
+ "blob", gw_trans->commit,
got_tree_entry_get_name(te), build_folder,
got_tree_entry_get_name(te), modestr) == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
+
+ if (asprintf(&tree_row, tree_line_with_navs, class,
+ url_html, class, gw_trans->repo_name, "blob",
+ gw_trans->commit, got_tree_entry_get_name(te),
+ build_folder, "blob", gw_trans->repo_name,
+ "blame", gw_trans->commit,
+ got_tree_entry_get_name(te), build_folder,
+ "blame") == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
}
free(build_folder);
if (error)
goto done;
- if ((asprintf(&tree_row, tree_line, class, url_html)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
error = buf_puts(&newsize, diffbuf, tree_row);
if (error)
goto done;
diff --git a/gotweb/gotweb_ui.h b/gotweb/gotweb_ui.h
index 683c22a..47c732d 100644
--- a/gotweb/gotweb_ui.h
+++ b/gotweb/gotweb_ui.h
@@ -208,6 +208,30 @@ char *briefs_navs =
"<a href='?path=%s&action=tree&commit=%s'>tree</a><!--/* | " \
"<a href='?path=%s&action=snapshot&commit=%s'>snapshot</a> */-->";
+/* blob.tmpl */
+
+char *blob_wrapper =
+ "<div id='blob_title_wrapper'>" \
+ "<div id='blob_title'>Blob</div></div>" \
+ "<div id='blob_content'>%s</div>";
+
+char *blob_header =
+ "<div id='blob_header_wrapper'>" \
+ "<div id='blob_header'>%s%s</div>" \
+ "</div>" \
+ "<div id='dotted_line'></div>" \
+ "<div id='blob'>%s</div>" \
+ "</div>";
+
+char *blob_line =
+ "<div id='blob_wrapper'>" \
+ "<div id='blob_number'>%.*d</div>" \
+ "<div id='blob_hash'>%.8s</div>" \
+ "<div id='blob_date'>%s</div>" \
+ "<div id='blob_author'>%-8s</div>" \
+ "<div id='blob_code'>%s</div>" \
+ "</div>";
+
/* blame.tmpl */
char *blame_wrapper =
@@ -250,6 +274,16 @@ char *tree_header =
char *tree_line =
"<div id='tree_wrapper'>" \
"<div id='tree_line' class='%s'>%s</div>" \
+ "<div id='tree_line_blank' class='%s'> </div>" \
+ "</div>";
+
+char *tree_line_with_navs =
+ "<div id='tree_wrapper'>" \
+ "<div id='tree_line' class='%s'>%s</div>" \
+ "<div id='tree_line_navs' class='%s'>" \
+ "<a href='?path=%s&action=%s&commit=%s&file=%s&folder=/%s'>%s</a> | " \
+ "<a href='?path=%s&action=%s&commit=%s&file=%s&folder=/%s'>%s</a>" \
+ "</div>" \
"</div>";
/* tag.tmpl */