aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorC. McEnroe <june@causal.agency>2021-06-08 17:06:54 -0400
committerChristian Hesse <mail@eworm.de>2021-07-05 09:15:01 +0200
commitf8d6f5b197e966e8d5269491c2e4e28d7c1f5328 (patch)
treebf9389a2c2a13f5ab0333d14a748a73d610a781e
parentgit: update to v2.32.0 (diff)
downloadcgit-ch/atom.tar.xz
cgit-ch/atom.zip
ui-atom: generate valid Atom feedsch/atom
Fixes several RFC 4287 violations: > 4.1.1. The "atom:feed" Element > o atom:feed elements MUST contain exactly one atom:id element. > o atom:feed elements SHOULD contain one atom:link element with a rel > attribute value of "self". This is the preferred URI for > retrieving Atom Feed Documents representing this Atom feed. > o atom:feed elements MUST contain exactly one atom:updated element. An atom:id element is generated from cgit_currentfullurl(), and an atom:link element with a rel attribute of "self" is generated with the same URL. An atom:updated element is generated from the date of the first commit in the revision walk. > 4.1.2. The "atom:entry" Element > o atom:entry elements MUST NOT contain more than one atom:content > element. The second atom:content element with the type of "xhtml" is removed. > 4.2.6. The "atom:id" Element > Its content MUST be an IRI, as defined by [RFC3987]. Note that the > definition of "IRI" excludes relative references. Though the IRI > might use a dereferencable scheme, Atom Processors MUST NOT assume it > can be dereferenced. The atom:id elements for commits now use URNs in the "sha1" or "sha256" namespaces. Although these are not registered URN namespaces, they see use in the wild, for instance as part of magnet URIs. Signed-off-by: C. McEnroe <june@causal.agency>
-rw-r--r--ui-atom.c31
1 files changed, 20 insertions, 11 deletions
diff --git a/ui-atom.c b/ui-atom.c
index 1056f36..8329e01 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -67,17 +67,12 @@ static void add_entry(struct commit *commit, const char *host)
html("'/>\n");
free(pageurl);
}
- htmlf("<id>%s</id>\n", hex);
+ html("<id>");
+ html_txtf("urn:%s:%s", the_hash_algo->name, hex);
+ html("</id>\n");
html("<content type='text'>\n");
html_txt(info->msg);
html("</content>\n");
- html("<content type='xhtml'>\n");
- html("<div xmlns='http://www.w3.org/1999/xhtml'>\n");
- html("<pre>\n");
- html_txt(info->msg);
- html("</pre>\n");
- html("</div>\n");
- html("</content>\n");
html("</entry>\n");
cgit_free_commitinfo(info);
}
@@ -90,6 +85,7 @@ void cgit_print_atom(char *tip, const char *path, int max_count)
struct commit *commit;
struct rev_info rev;
int argc = 2;
+ int first = 1;
if (ctx.qry.show_all)
argv[1] = "--all";
@@ -130,15 +126,28 @@ void cgit_print_atom(char *tip, const char *path, int max_count)
html_txt(ctx.repo->desc);
html("</subtitle>\n");
if (host) {
+ char *fullurl = cgit_currentfullurl();
char *repourl = cgit_repourl(ctx.repo->url);
+ html("<id>");
+ html_txtf("%s%s%s", cgit_httpscheme(), host, fullurl);
+ html("</id>\n");
+ html("<link rel='self' href='");
+ html_attrf("%s%s%s", cgit_httpscheme(), host, fullurl);
+ html("'/>\n");
html("<link rel='alternate' type='text/html' href='");
- html(cgit_httpscheme());
- html_attr(host);
- html_attr(repourl);
+ html_attrf("%s%s%s", cgit_httpscheme(), host, repourl);
html("'/>\n");
+ free(fullurl);
free(repourl);
}
while ((commit = get_revision(&rev)) != NULL) {
+ if (first) {
+ html("<updated>");
+ html_txt(show_date(commit->date, 0,
+ date_mode_from_type(DATE_ISO8601_STRICT)));
+ html("</updated>\n");
+ first = 0;
+ }
add_entry(commit, host);
free_commit_buffer(the_repository->parsed_objects, commit);
free_commit_list(commit->parents);