From fc9181ff3d3ebbe0159871f6a49438e60bb17f58 Mon Sep 17 00:00:00 2001
From: Jason A. Donenfeld
Date: Wed, 11 Jul 2012 05:32:45 +0200
Subject: scan-tree: Support gitweb.category.

Use gitweb.category from git config to determine repo's section, if
option is enabled.
---
 cgit.c       | 1 +
 cgit.h       | 1 +
 cgitrc.5.txt | 6 ++++++
 scan-tree.c  | 6 ++++++
 4 files changed, 14 insertions(+)

diff --git a/cgit.c b/cgit.c
index ec5bbce..4656ed6 100644
--- a/cgit.c
+++ b/cgit.c
@@ -340,6 +340,7 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.local_time = 0;
 	ctx->cfg.enable_gitweb_desc = 1;
 	ctx->cfg.enable_gitweb_owner = 1;
+	ctx->cfg.enable_gitweb_section = 1;
 	ctx->cfg.enable_http_clone = 1;
 	ctx->cfg.enable_tree_linenumbers = 1;
 	ctx->cfg.max_repo_count = 50;
diff --git a/cgit.h b/cgit.h
index f4d0e52..91b4d72 100644
--- a/cgit.h
+++ b/cgit.h
@@ -200,6 +200,7 @@ struct cgit_config {
 	int enable_filter_overrides;
 	int enable_gitweb_owner;
 	int enable_gitweb_desc;
+	int enable_gitweb_section;
 	int enable_http_clone;
 	int enable_index_links;
 	int enable_commit_graph;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 86a19a9..d1a90c5 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -118,6 +118,12 @@ enable-gitweb-owner::
 	for the git config value "gitweb.owner" to determine the owner.
 	Default value: "1". See also: scan-path.
 
+enable-gitweb-section::
+	If set to "1" and scan-path is enabled, we first check each repository
+	for the git config value "gitweb.category" to determine the repository's
+	section. This value is overridden if section-from-path is enabled.
+	Default value: "1". See also: scan-path section-from-path.
+
 enable-http-clone::
 	If set to "1", cgit will act as an dumb HTTP endpoint for git clones.
 	If you use an alternate way of serving git repositories, you may wish
diff --git a/scan-tree.c b/scan-tree.c
index 3d4e417..50eedea 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -49,6 +49,7 @@ 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)
 {
@@ -61,6 +62,8 @@ static int gitweb_config(const char *key, const char *value, void *cb)
 		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;
 }
 
@@ -95,6 +98,7 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 
 	owner = NULL;
 	desc = NULL;
+	section = NULL;
 	git_config_from_file(gitweb_config, fmt("%s/config", path), NULL);
 	
 	if (base == path)
@@ -137,6 +141,8 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 		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) {
-- 
cgit v1.2.3-70-g09d2