author | Lars Hjemli <hjemli@gmail.com> | 2008-05-21 06:17:54 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-08-01 20:12:34 (UTC) |
commit | b2a3d31e8839b53a623b4c99124c2c637d0e3cbb (patch) (unidiff) | |
tree | 7335ff15fdbe92aa0afb31e4a54e2f863760c217 | |
parent | 0f0ab148c6d444316af10e6b4c7a60630fed45d3 (diff) | |
download | cgit-b2a3d31e8839b53a623b4c99124c2c637d0e3cbb.zip cgit-b2a3d31e8839b53a623b4c99124c2c637d0e3cbb.tar.gz cgit-b2a3d31e8839b53a623b4c99124c2c637d0e3cbb.tar.bz2 |
Add atom-support
This enables a page which generates atom feeds for the current branch and
path, heavily inspired by the atom-support in gitweb.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cmd.c | 7 | ||||
-rw-r--r-- | ui-atom.c | 129 | ||||
-rw-r--r-- | ui-atom.h | 6 | ||||
-rw-r--r-- | ui-shared.c | 23 | ||||
-rw-r--r-- | ui-shared.h | 1 |
7 files changed, 168 insertions, 0 deletions
@@ -56,4 +56,5 @@ OBJECTS += html.o | |||
56 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
57 | OBJECTS += shared.o | 57 | OBJECTS += shared.o |
58 | OBJECTS += ui-atom.o | ||
58 | OBJECTS += ui-blob.o | 59 | OBJECTS += ui-blob.o |
59 | OBJECTS += ui-commit.o | 60 | OBJECTS += ui-commit.o |
@@ -25,4 +25,5 @@ | |||
25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
26 | #define FMT_SHORTDATE "%Y-%m-%d" | 26 | #define FMT_SHORTDATE "%Y-%m-%d" |
27 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | ||
27 | 28 | ||
28 | 29 | ||
@@ -11,4 +11,5 @@ | |||
11 | #include "cache.h" | 11 | #include "cache.h" |
12 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
13 | #include "ui-atom.h" | ||
13 | #include "ui-blob.h" | 14 | #include "ui-blob.h" |
14 | #include "ui-commit.h" | 15 | #include "ui-commit.h" |
@@ -23,4 +24,9 @@ | |||
23 | #include "ui-tree.h" | 24 | #include "ui-tree.h" |
24 | 25 | ||
26 | static void atom_fn(struct cgit_context *ctx) | ||
27 | { | ||
28 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); | ||
29 | } | ||
30 | |||
25 | static void about_fn(struct cgit_context *ctx) | 31 | static void about_fn(struct cgit_context *ctx) |
26 | { | 32 | { |
@@ -103,4 +109,5 @@ struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | |||
103 | { | 109 | { |
104 | static struct cgit_cmd cmds[] = { | 110 | static struct cgit_cmd cmds[] = { |
111 | def_cmd(atom, 1, 0), | ||
105 | def_cmd(about, 0, 1), | 112 | def_cmd(about, 0, 1), |
106 | def_cmd(blob, 1, 0), | 113 | def_cmd(blob, 1, 0), |
diff --git a/ui-atom.c b/ui-atom.c new file mode 100644 index 0000000..a6ea3ee --- a/dev/null +++ b/ui-atom.c | |||
@@ -0,0 +1,129 @@ | |||
1 | /* ui-atom.c: functions for atom feeds | ||
2 | * | ||
3 | * Copyright (C) 2008 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
9 | #include "cgit.h" | ||
10 | #include "html.h" | ||
11 | #include "ui-shared.h" | ||
12 | |||
13 | void add_entry(struct commit *commit, char *host) | ||
14 | { | ||
15 | char delim = '&'; | ||
16 | char *hex; | ||
17 | char *mail, *t, *t2; | ||
18 | struct commitinfo *info; | ||
19 | |||
20 | info = cgit_parse_commit(commit); | ||
21 | hex = sha1_to_hex(commit->object.sha1); | ||
22 | html("<entry>\n"); | ||
23 | html("<title>"); | ||
24 | html_txt(info->subject); | ||
25 | html("</title>\n"); | ||
26 | html("<updated>"); | ||
27 | cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time); | ||
28 | html("</updated>\n"); | ||
29 | html("<author>\n"); | ||
30 | if (info->author) { | ||
31 | html("<name>"); | ||
32 | html_txt(info->author); | ||
33 | html("</name>\n"); | ||
34 | } | ||
35 | if (info->author_email) { | ||
36 | mail = xstrdup(info->author_email); | ||
37 | t = strchr(mail, '<'); | ||
38 | if (t) | ||
39 | t++; | ||
40 | else | ||
41 | t = mail; | ||
42 | t2 = strchr(t, '>'); | ||
43 | if (t2) | ||
44 | *t2 = '\0'; | ||
45 | html("<email>"); | ||
46 | html_txt(t); | ||
47 | html("</email>\n"); | ||
48 | free(mail); | ||
49 | } | ||
50 | html("</author>\n"); | ||
51 | html("<published>"); | ||
52 | cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time); | ||
53 | html("</published>\n"); | ||
54 | if (host) { | ||
55 | html("<link rel='alternate' type='text/html' href='http://"); | ||
56 | html_attr(host); | ||
57 | html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); | ||
58 | if (ctx.cfg.virtual_root) | ||
59 | delim = '?'; | ||
60 | htmlf("%cid=%s", delim, hex); | ||
61 | html("'/>\n"); | ||
62 | } | ||
63 | htmlf("<id>%s</id>\n", hex); | ||
64 | html("<content type='text'>\n"); | ||
65 | html_txt(info->msg); | ||
66 | html("</content>\n"); | ||
67 | html("<content type='xhtml'>\n"); | ||
68 | html("<div xmlns='http://www.w3.org/1999/xhtml'>\n"); | ||
69 | html("<pre>\n"); | ||
70 | html_txt(info->msg); | ||
71 | html("</pre>\n"); | ||
72 | html("</div>\n"); | ||
73 | html("</content>\n"); | ||
74 | html("</entry>\n"); | ||
75 | cgit_free_commitinfo(info); | ||
76 | } | ||
77 | |||
78 | |||
79 | void cgit_print_atom(char *tip, char *path, int max_count) | ||
80 | { | ||
81 | char *host; | ||
82 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; | ||
83 | struct commit *commit; | ||
84 | struct rev_info rev; | ||
85 | int argc = 2; | ||
86 | |||
87 | if (!tip) | ||
88 | argv[1] = ctx.qry.head; | ||
89 | |||
90 | if (path) { | ||
91 | argv[argc++] = "--"; | ||
92 | argv[argc++] = path; | ||
93 | } | ||
94 | |||
95 | init_revisions(&rev, NULL); | ||
96 | rev.abbrev = DEFAULT_ABBREV; | ||
97 | rev.commit_format = CMIT_FMT_DEFAULT; | ||
98 | rev.verbose_header = 1; | ||
99 | rev.show_root_diff = 0; | ||
100 | rev.max_count = max_count; | ||
101 | setup_revisions(argc, argv, &rev, NULL); | ||
102 | prepare_revision_walk(&rev); | ||
103 | |||
104 | host = cgit_hosturl(); | ||
105 | ctx.page.mimetype = "text/xml"; | ||
106 | ctx.page.charset = "utf-8"; | ||
107 | cgit_print_http_headers(&ctx); | ||
108 | html("<feed xmlns='http://www.w3.org/2005/Atom'>\n"); | ||
109 | html("<title>"); | ||
110 | html_txt(ctx.repo->name); | ||
111 | html("</title>\n"); | ||
112 | html("<subtitle>"); | ||
113 | html_txt(ctx.repo->desc); | ||
114 | html("</subtitle>\n"); | ||
115 | if (host) { | ||
116 | html("<link rel='alternate' type='text/html' href='http://"); | ||
117 | html_attr(host); | ||
118 | html_attr(cgit_repourl(ctx.repo->url)); | ||
119 | html("'/>\n"); | ||
120 | } | ||
121 | while ((commit = get_revision(&rev)) != NULL) { | ||
122 | add_entry(commit, host); | ||
123 | free(commit->buffer); | ||
124 | commit->buffer = NULL; | ||
125 | free_commit_list(commit->parents); | ||
126 | commit->parents = NULL; | ||
127 | } | ||
128 | html("</feed>\n"); | ||
129 | } | ||
diff --git a/ui-atom.h b/ui-atom.h new file mode 100644 index 0000000..749ffd3 --- a/dev/null +++ b/ui-atom.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef UI_ATOM_H | ||
2 | #define UI_ATOM_H | ||
3 | |||
4 | extern void cgit_print_atom(char *tip, char *path, int max_count); | ||
5 | |||
6 | #endif | ||
diff --git a/ui-shared.c b/ui-shared.c index 197ee37..37c60b2 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -35,4 +35,19 @@ void cgit_print_error(char *msg) | |||
35 | } | 35 | } |
36 | 36 | ||
37 | char *cgit_hosturl() | ||
38 | { | ||
39 | char *host, *port; | ||
40 | |||
41 | host = getenv("SERVER_NAME"); | ||
42 | if (!host) | ||
43 | return NULL; | ||
44 | port = getenv("SERVER_PORT"); | ||
45 | if (port && atoi(port) != 80) | ||
46 | host = xstrdup(fmt("%s:%d", host, atoi(port))); | ||
47 | else | ||
48 | host = xstrdup(host); | ||
49 | return host; | ||
50 | } | ||
51 | |||
37 | char *cgit_rooturl() | 52 | char *cgit_rooturl() |
38 | { | 53 | { |
@@ -429,4 +444,5 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
429 | void cgit_print_docstart(struct cgit_context *ctx) | 444 | void cgit_print_docstart(struct cgit_context *ctx) |
430 | { | 445 | { |
446 | char *host = cgit_hosturl(); | ||
431 | html(cgit_doctype); | 447 | html(cgit_doctype); |
432 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 448 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
@@ -446,4 +462,11 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
446 | html("'/>\n"); | 462 | html("'/>\n"); |
447 | } | 463 | } |
464 | if (host && ctx->repo) { | ||
465 | html("<link rel='alternate' title='Atom feed' href='http://"); | ||
466 | html_attr(cgit_hosturl()); | ||
467 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | ||
468 | fmt("h=%s", ctx->qry.head))); | ||
469 | html("' type='application/atom+xml'/>"); | ||
470 | } | ||
448 | html("</head>\n"); | 471 | html("</head>\n"); |
449 | html("<body>\n"); | 472 | html("<body>\n"); |
diff --git a/ui-shared.h b/ui-shared.h index 07da4b4..f4123d3 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -2,4 +2,5 @@ | |||
2 | #define UI_SHARED_H | 2 | #define UI_SHARED_H |
3 | 3 | ||
4 | extern char *cgit_hosturl(); | ||
4 | extern char *cgit_repourl(const char *reponame); | 5 | extern char *cgit_repourl(const char *reponame); |
5 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | 6 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |