Support submenus

[site] / src / main.c

diff --git a/src/main.c b/src/main.c
index 71f8b40254e9dfc4845772d90e5bf30a9a81a62d..3fad35719ead2eaa0c59b83ee9b7d12133df1f4d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -136,10 +136,15 @@ menu_t *get_menu_rec(char *prefix, char **parts)
                }
                char *pathval = g_key_file_get_string(conf, entries[i], "path", NULL);
                char *nameval = g_key_file_get_string(conf, entries[i], "name", NULL);
+               int   hideval = g_key_file_get_boolean(conf, entries[i], "hide", NULL);
                if (pathval) next->path = pathval;
                if (nameval) next->name = nameval;
                if (!next->path) next->path = g_strdup(entries[i]);
                if (!next->name) next->name = g_strdup(entries[i]);
+               if (hideval)
+                       next->show = SHOW_HIDDEN;
+               if (!parts[0] && !strcmp(next->base, "index"))
+                       next->show = SHOW_ACTIVE;
                cur = cur->next = next;
        }
        g_strfreev(entries);
@@ -153,6 +158,8 @@ menu_t *get_menu_rec(char *prefix, char **parts)
                        continue;
                if ((next = get_menu_entry(prefix, entries[i])))
                        cur = cur->next = next;
+               if (!strcmp(cur->base, "index"))
+                       cur->show = SHOW_HIDDEN;
        }
        g_strfreev(entries);
        g_key_file_free(conf);
@@ -165,8 +172,6 @@ menu_t *get_menu_rec(char *prefix, char **parts)
                        cur->kids = get_menu_rec(cur->path, parts+1);
                        cur->show = SHOW_ACTIVE;
                }
-               if (!strcmp(cur->base, "index"))
-                       cur->show = SHOW_HIDDEN;
        }
 
 error:
@@ -196,16 +201,32 @@ menu_t *get_menu(char *path)
 #endif
 }
 
+int get_slashes(char *path)
+{
+       int slashes = 0;
+       for (int i = 0; path[i]; i++) {
+               if (path[i] == '/')
+                       slashes +=  1;
+               if (path[i] != '/' && !path[i+1])
+                       slashes *= -1;
+       }
+       return slashes;
+}
+
 void print_menu(menu_t *menu, int first, int last)
 {
        for (menu_t *cur = menu; cur; cur = cur->next) {
-               if (cur->show == SHOW_HIDDEN)
-                       continue;
-               if (first <= 0)
+               if (first <= 0 && cur->show != SHOW_HIDDEN)
                        print_link(cur->path, cur->name,
-                               cur->show == SHOW_ACTIVE);
-               if (cur->kids && last != 0)
+                               cur->show == SHOW_ACTIVE,
+                               get_slashes(cur->path));
+               if (cur->kids && last != 0) {
+                       if (first == 0)
+                               print_menu_start();
                        print_menu(cur->kids, first-1, last-1);
+                       if (first == 0)
+                               print_menu_end();
+               }
        }
 }