summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorMichael Krelin <hacker@klever.net>2007-07-21 13:29:55 (UTC)
committer Michael Krelin <hacker@klever.net>2007-07-21 13:29:55 (UTC)
commit97c025ae8ecf9764fd6996c81c51c3de4adb837c (patch) (unidiff)
tree83395f8230a8589b5d167ab796055133f739090d /cgit.c
parent1cb8bedf1e0a4aa73bb8ad3f96bfa7eda50919b3 (diff)
downloadcgit-97c025ae8ecf9764fd6996c81c51c3de4adb837c.zip
cgit-97c025ae8ecf9764fd6996c81c51c3de4adb837c.tar.gz
cgit-97c025ae8ecf9764fd6996c81c51c3de4adb837c.tar.bz2
shorten snapshot names to repo basename
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index a0f88ad..7b55b7b 100644
--- a/cgit.c
+++ b/cgit.c
@@ -24,97 +24,98 @@ static int cgit_prepare_cache(struct cacheitem *item)
24 item->ttl = cgit_cache_root_ttl; 24 item->ttl = cgit_cache_root_ttl;
25 return 1; 25 return 1;
26 } 26 }
27 27
28 if (!cgit_cmd) { 28 if (!cgit_cmd) {
29 item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, 29 item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
30 cache_safe_filename(cgit_repo->url), 30 cache_safe_filename(cgit_repo->url),
31 cache_safe_filename(cgit_querystring))); 31 cache_safe_filename(cgit_querystring)));
32 item->ttl = cgit_cache_repo_ttl; 32 item->ttl = cgit_cache_repo_ttl;
33 } else { 33 } else {
34 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 34 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
35 cache_safe_filename(cgit_repo->url), 35 cache_safe_filename(cgit_repo->url),
36 cgit_query_page, 36 cgit_query_page,
37 cache_safe_filename(cgit_querystring))); 37 cache_safe_filename(cgit_querystring)));
38 if (cgit_query_has_symref) 38 if (cgit_query_has_symref)
39 item->ttl = cgit_cache_dynamic_ttl; 39 item->ttl = cgit_cache_dynamic_ttl;
40 else if (cgit_query_has_sha1) 40 else if (cgit_query_has_sha1)
41 item->ttl = cgit_cache_static_ttl; 41 item->ttl = cgit_cache_static_ttl;
42 else 42 else
43 item->ttl = cgit_cache_repo_ttl; 43 item->ttl = cgit_cache_repo_ttl;
44 } 44 }
45 return 1; 45 return 1;
46} 46}
47 47
48static void cgit_print_repo_page(struct cacheitem *item) 48static void cgit_print_repo_page(struct cacheitem *item)
49{ 49{
50 char *title; 50 char *title;
51 int show_search; 51 int show_search;
52 52
53 if (!cgit_query_head) 53 if (!cgit_query_head)
54 cgit_query_head = cgit_repo->defbranch; 54 cgit_query_head = cgit_repo->defbranch;
55 55
56 if (chdir(cgit_repo->path)) { 56 if (chdir(cgit_repo->path)) {
57 title = fmt("%s - %s", cgit_root_title, "Bad request"); 57 title = fmt("%s - %s", cgit_root_title, "Bad request");
58 cgit_print_docstart(title, item); 58 cgit_print_docstart(title, item);
59 cgit_print_pageheader(title, 0); 59 cgit_print_pageheader(title, 0);
60 cgit_print_error(fmt("Unable to scan repository: %s", 60 cgit_print_error(fmt("Unable to scan repository: %s",
61 strerror(errno))); 61 strerror(errno)));
62 cgit_print_docend(); 62 cgit_print_docend();
63 return; 63 return;
64 } 64 }
65 65
66 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); 66 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
67 show_search = 0; 67 show_search = 0;
68 setenv("GIT_DIR", cgit_repo->path, 1); 68 setenv("GIT_DIR", cgit_repo->path, 1);
69 69
70 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { 70 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
71 cgit_print_snapshot(item, cgit_query_sha1, 71 cgit_print_snapshot(item, cgit_query_sha1,
72 cgit_repo->url, cgit_query_name); 72 cgit_repobasename(cgit_repo->url),
73 cgit_query_name);
73 return; 74 return;
74 } 75 }
75 76
76 if (cgit_cmd == CMD_BLOB) { 77 if (cgit_cmd == CMD_BLOB) {
77 cgit_print_blob(item, cgit_query_sha1, cgit_query_path); 78 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
78 return; 79 return;
79 } 80 }
80 81
81 show_search = (cgit_cmd == CMD_LOG); 82 show_search = (cgit_cmd == CMD_LOG);
82 cgit_print_docstart(title, item); 83 cgit_print_docstart(title, item);
83 if (!cgit_cmd) { 84 if (!cgit_cmd) {
84 cgit_print_pageheader("summary", show_search); 85 cgit_print_pageheader("summary", show_search);
85 cgit_print_summary(); 86 cgit_print_summary();
86 cgit_print_docend(); 87 cgit_print_docend();
87 return; 88 return;
88 } 89 }
89 90
90 cgit_print_pageheader(cgit_query_page, show_search); 91 cgit_print_pageheader(cgit_query_page, show_search);
91 92
92 switch(cgit_cmd) { 93 switch(cgit_cmd) {
93 case CMD_LOG: 94 case CMD_LOG:
94 cgit_print_log(cgit_query_sha1, cgit_query_ofs, 95 cgit_print_log(cgit_query_sha1, cgit_query_ofs,
95 cgit_max_commit_count, cgit_query_search, 96 cgit_max_commit_count, cgit_query_search,
96 cgit_query_path, 1); 97 cgit_query_path, 1);
97 break; 98 break;
98 case CMD_TREE: 99 case CMD_TREE:
99 cgit_print_tree(cgit_query_sha1, cgit_query_path); 100 cgit_print_tree(cgit_query_sha1, cgit_query_path);
100 break; 101 break;
101 case CMD_COMMIT: 102 case CMD_COMMIT:
102 cgit_print_commit(cgit_query_sha1); 103 cgit_print_commit(cgit_query_sha1);
103 break; 104 break;
104 case CMD_DIFF: 105 case CMD_DIFF:
105 cgit_print_diff(cgit_query_sha1, cgit_query_sha2); 106 cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
106 break; 107 break;
107 default: 108 default:
108 cgit_print_error("Invalid request"); 109 cgit_print_error("Invalid request");
109 } 110 }
110 cgit_print_docend(); 111 cgit_print_docend();
111} 112}
112 113
113static void cgit_fill_cache(struct cacheitem *item, int use_cache) 114static void cgit_fill_cache(struct cacheitem *item, int use_cache)
114{ 115{
115 static char buf[PATH_MAX]; 116 static char buf[PATH_MAX];
116 int stdout2; 117 int stdout2;
117 118
118 getcwd(buf, sizeof(buf)); 119 getcwd(buf, sizeof(buf));
119 item->st.st_mtime = time(NULL); 120 item->st.st_mtime = time(NULL);
120 121