ui-repolist: Rename section-sort to repository-sort.

[ps-cgit] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index e5a4baf556e0525f8493c6b2857ef913972c85c2..6d1941e2f38a58c60160520d760ceb2431b1542b 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,7 +1,7 @@
 /* scan-tree.c
  * 
  * Copyright (C) 2008-2009 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2010, 2012 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -48,19 +48,27 @@ static int is_git_dir(const char *path)
 struct cgit_repo *repo;
 repo_config_fn config_fn;
 char *owner;
+char *desc;
+char *section;
 
 static void repo_config(const char *name, const char *value)
 {
        config_fn(repo, name, value);
 }
 
-static int git_owner_config(const char *key, const char *value, void *cb)
+static int gitweb_config(const char *key, const char *value, void *cb)
 {
-       if (!strcmp(key, "gitweb.owner"))
+       if (ctx.cfg.enable_gitweb_owner && !strcmp(key, "gitweb.owner"))
                owner = xstrdup(value);
+       else if (ctx.cfg.enable_gitweb_desc && !strcmp(key, "gitweb.description"))
+               desc = xstrdup(value);
+       else if (ctx.cfg.enable_gitweb_section && !strcmp(key, "gitweb.category"))
+               section = xstrdup(value);
        return 0;
 }
 
+
+
 static char *xstrrchr(char *s, char *from, int c)
 {
        while (from >= s && *from != c)
@@ -89,8 +97,10 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                return;
 
        owner = NULL;
-       if (ctx.cfg.enable_gitweb_owner)
-               git_config_from_file(git_owner_config, fmt("%s/config", path), NULL);
+       desc = NULL;
+       section = NULL;
+       git_config_from_file(gitweb_config, fmt("%s/config", path), NULL);
+       
        if (base == path)
                rel = xstrdup(fmt("%s", path));
        else
@@ -118,15 +128,21 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
        }
        repo->owner = owner;
 
-       p = fmt("%s/description", path);
-       if (!stat(p, &st))
-               readfile(p, &repo->desc, &size);
+       if (desc)
+               repo->desc = desc;
+       else {
+               p = fmt("%s/description", path);
+               if (!stat(p, &st))
+                       readfile(p, &repo->desc, &size);
+       }
 
        if (!repo->readme) {
                p = fmt("%s/README.html", path);
                if (!stat(p, &st))
                        repo->readme = "README.html";
        }
+       if (section)
+               repo->section = section;
        if (ctx.cfg.section_from_path) {
                n  = ctx.cfg.section_from_path;
                if (n > 0) {
@@ -155,6 +171,8 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                config_fn = fn;
                parse_configfile(xstrdup(p), &repo_config);
        }
+
+       free(rel);
 }
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)