summaryrefslogtreecommitdiff
path: root/scan-tree.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--scan-tree.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/scan-tree.c b/scan-tree.c
index 378d795..3d4e417 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -48,19 +48,24 @@ static int is_git_dir(const char *path)
struct cgit_repo *repo;
repo_config_fn config_fn;
char *owner;
+char *desc;
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);
return 0;
}
+
+
static char *xstrrchr(char *s, char *from, int c)
{
while (from >= s && *from != c)
@@ -89,8 +94,9 @@ 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;
+ git_config_from_file(gitweb_config, fmt("%s/config", path), NULL);
+
if (base == path)
rel = xstrdup(fmt("%s", path));
else
@@ -118,9 +124,13 @@ 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);
8&follow=1'>Upgrade html2textRené 'Necoro' Neumann2-5/+3 2020-05-10Switch to our own html2text fork for the time beingRené 'Necoro' Neumann3-5/+5 2020-05-10Text part in emailsRené 'Necoro' Neumann7-33/+115 2020-05-10Allow options on group level.René 'Necoro' Neumann3-5/+11 2020-05-10Renamed feed template to html templateRené 'Necoro' Neumann2-2/+2 2020-05-10Release v0.2.0v0.2.0René 'Necoro' Neumann2-2/+6 2020-05-10Fix building cacheRené 'Necoro' Neumann1-1/+3 2020-05-10Update READMERené 'Necoro' Neumann1-5/+44 2020-05-10Ignore 'dist' folder and build productsRené 'Necoro' Neumann1-0/+2 2020-05-08Print item hashes in debug modeRené 'Necoro' Neumann1-1/+7 2020-05-07Improve html renderingRené 'Necoro' Neumann2-53/+32 2020-05-07Do not assume items to be new when their published date is newer than the las...René 'Necoro' Neumann2-7/+1 2020-05-07Updating some depsRené 'Necoro' Neumann2-2/+7 2020-05-07Better detection if a text starts with html or notRené 'Necoro' Neumann2-4/+13 2020-05-07go fmtRené 'Necoro' Neumann1-3/+2 2020-05-07Add header X-Feed2Imap-GUIDRené 'Necoro' Neumann3-1/+7 2020-05-07update changelogRené 'Necoro' Neumann1-0/+1 2020-05-07FixRené 'Necoro' Neumann1-1/+1 2020-05-07Unified publishedDate and updatedDate into one (just as the old feed2imap...)René 'Necoro' Neumann5-21/+32 2020-05-06Print version during startupRené 'Necoro' Neumann1-1/+1 2020-05-06Improve templateRené 'Necoro' Neumann3-20/+28 2020-05-05Fix pipelineRené 'Necoro' Neumann1-2/+5 2020-05-05Make changelog a part of the release pipeline (untested)René 'Necoro' Neumann2-0/+12