cgit_print_snapshot_links: use url to specify snapshot name

[cgit.git] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index f623f3590efa28eaff13fa10bb09cc025492f11d..f9879ed6a829bba87716374921ef3d6a6788d260 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -57,20 +57,28 @@ static const struct snapshot_archive_t {
        const char *suffix;
        const char *mimetype;
        write_archive_fn_t write_func;
        const char *suffix;
        const char *mimetype;
        write_archive_fn_t write_func;

+       int bit;

 }      snapshot_archives[] = {
 }      snapshot_archives[] = {

-       { ".zip", "application/x-zip", write_zip_archive },
-       { ".tar.gz", "application/x-tar", write_tar_gzip_archive },
-       { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }
+       { ".zip", "application/x-zip", write_zip_archive, 0x1 },
+       { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 },
+       { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 },
+       { ".tar", "application/x-tar", write_tar_archive, 0x8 }

 };
 
 };
 

-void cgit_print_snapshot(struct cacheitem *item, const char *hex, 
-                        const char *prefix, const char *filename)
+void cgit_print_snapshot(struct cacheitem *item, const char *head,
+                        const char *hex, const char *prefix,
+                        const char *filename, int snapshots)

 {
        int fnl = strlen(filename);
 {
        int fnl = strlen(filename);

-       int f;
-       for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
+       int f, n;
+
+       n = sizeof(snapshot_archives) / sizeof(*snapshot_archives);
+       for(f=0; f<n; f++) {

                const struct snapshot_archive_t* sat = &snapshot_archives[f];
                const struct snapshot_archive_t* sat = &snapshot_archives[f];

-               int sl = strlen(sat->suffix);
+               int sl;
+               if(!(snapshots & sat->bit))
+                       continue;
+               sl = strlen(sat->suffix);

                if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
                        continue;
 
                if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
                        continue;
 


@@ -78,6 +86,8 @@ void cgit_print_snapshot(struct cacheitem *item, const char *hex,
                struct commit *commit;
                unsigned char sha1[20];
 
                struct commit *commit;
                unsigned char sha1[20];
 

+               if (!hex)
+                       hex = head;

                if(get_sha1(hex, sha1)) {
                        cgit_print_error(fmt("Bad object id: %s", hex));
                        return;
                if(get_sha1(hex, sha1)) {
                        cgit_print_error(fmt("Bad object id: %s", hex));
                        return;


@@ -100,16 +110,46 @@ void cgit_print_snapshot(struct cacheitem *item, const char *hex,
        cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
 }
 
        cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
 }
 

-void cgit_print_snapshot_links(const char *repo,const char *hex)
+void cgit_print_snapshot_links(const char *repo, const char *head,
+                              const char *hex, int snapshots)

 {
        char *filename;
 {
        char *filename;

-       int f;
-       for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
+       int f, n;
+
+       n = sizeof(snapshot_archives) / sizeof(*snapshot_archives);
+       for(f=0; f<n ;f++) {

                const struct snapshot_archive_t* sat = &snapshot_archives[f];
                const struct snapshot_archive_t* sat = &snapshot_archives[f];

-               filename = fmt("%s-%s%s",repo,hex,sat->suffix);
-               htmlf("<a href='%s'>%s</a><br/>",
-                       cgit_pageurl(repo,"snapshot",
-                           fmt("id=%s&amp;name=%s",hex,filename)), filename);
+               if(!(snapshots & sat->bit))
+                       continue;
+               filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
+                              sat->suffix);
+               cgit_snapshot_link(filename, NULL, NULL, (char *)head,
+                                  (char *)hex, filename);
+               html("<br/>");

        }
 }
        }
 }

+
+int cgit_parse_snapshots_mask(const char *str)
+{
+       static const char *delim = " \t,:/|;";
+       int f, tl, rv = 0;
+       /* favor legacy setting */
+       if(atoi(str)) return 1;
+       for(;;) {
+               str += strspn(str,delim);
+               tl = strcspn(str,delim);
+               if(!tl)
+                       break;
+               for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
+                       const struct snapshot_archive_t* sat = &snapshot_archives[f];
+                       if(! ( strncmp(sat->suffix,str,tl) && strncmp(sat->suffix+1,str,tl-1) ) ) {
+                               rv |= sat->bit;
+                               break;
+                       }
+               }
+               str += tl;
+       }
+       return rv;
+}
+

 /* vim:set sw=8: */
 /* vim:set sw=8: */