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

[ps-cgit] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index a0e09ceac4212c1f8a07ca391d6bc67d6b0cb438..6d1941e2f38a58c60160520d760ceb2431b1542b 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,7 +1,7 @@
 /* scan-tree.c
  * 
  * Copyright (C) 2008-2009 Lars Hjemli
 /* 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)
  *
  * 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;
 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 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);
                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;
 }
 
        return 0;
 }
 

+
+

 static char *xstrrchr(char *s, char *from, int c)
 {
        while (from >= s && *from != c)
 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;
                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
        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;
 
        }
        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 (!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) {
        if (ctx.cfg.section_from_path) {
                n  = ctx.cfg.section_from_path;
                if (n > 0) {


@@ -155,28 +171,29 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                config_fn = fn;
                parse_configfile(xstrdup(p), &repo_config);
        }
                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)
 {
 }
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {

-       DIR *dir;
+       DIR *dir = opendir(path);

        struct dirent *ent;
        char *buf;
        struct stat st;
 
        struct dirent *ent;
        char *buf;
        struct stat st;
 

+       if (!dir) {
+               fprintf(stderr, "Error opening directory %s: %s (%d)\n",
+                       path, strerror(errno), errno);
+               return;
+       }

        if (is_git_dir(path)) {
                add_repo(base, path, fn);
        if (is_git_dir(path)) {
                add_repo(base, path, fn);

-               return;
+               goto end;

        }
        if (is_git_dir(fmt("%s/.git", path))) {
                add_repo(base, fmt("%s/.git", path), fn);
        }
        if (is_git_dir(fmt("%s/.git", path))) {
                add_repo(base, fmt("%s/.git", path), fn);

-               return;
-       }
-       dir = opendir(path);
-       if (!dir) {
-               fprintf(stderr, "Error opening directory %s: %s (%d)\n",
-                       path, strerror(errno), errno);
-               return;
+               goto end;

        }
        while((ent = readdir(dir)) != NULL) {
                if (ent->d_name[0] == '.') {
        }
        while((ent = readdir(dir)) != NULL) {
                if (ent->d_name[0] == '.') {


@@ -184,6 +201,8 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                                continue;
                        if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
                                continue;
                                continue;
                        if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
                                continue;

+                       if (!ctx.cfg.scan_hidden_path)
+                               continue;

                }
                buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
                if (!buf) {
                }
                buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
                if (!buf) {


@@ -202,6 +221,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                        scan_path(base, buf, fn);
                free(buf);
        }
                        scan_path(base, buf, fn);
                free(buf);
        }

+end:

        closedir(dir);
 }
 
        closedir(dir);
 }
 


@@ -217,6 +237,7 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
        if (!projects) {
                fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n",
                        projectsfile, strerror(errno), errno);
        if (!projects) {
                fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n",
                        projectsfile, strerror(errno), errno);

+               return;

        }
        while (fgets(line, sizeof(line), projects) != NULL) {
                for (z = &lastc(line);
        }
        while (fgets(line, sizeof(line), projects) != NULL) {
                for (z = &lastc(line);