From: Andrea Zagli Date: Sat, 23 Sep 2017 08:33:38 +0000 (+0200) Subject: First page rendered (added template-glib). X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=8444729cf2a3927e6a789c805c60d309c0b1e305;p=zakjukebox First page rendered (added template-glib). --- diff --git a/configure.ac b/configure.ac index 1eed798..0b7f53d 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,8 @@ AM_GLIB_GNU_GETTEXT # Checks for libraries. PKG_CHECK_MODULES(ZAKJUKEBOX, [libzakcgi - libzakconfi]) + libzakconfi + template-glib-1.0]) AC_SUBST(ZAKJUKEBOX_CFLAGS) AC_SUBST(ZAKJUKEBOX_LIBS) diff --git a/data/zakjukebox/ctpl/Makefile.am b/data/zakjukebox/ctpl/Makefile.am index de858fc..d2ceb64 100644 --- a/data/zakjukebox/ctpl/Makefile.am +++ b/data/zakjukebox/ctpl/Makefile.am @@ -1,5 +1,6 @@ ctpldir = $(datadir)/$(PACKAGE)/ctpl -ctpl_DATA = +ctpl_DATA = \ + template.ctpl EXTRA_DIST = diff --git a/data/zakjukebox/ctpl/template.ctpl b/data/zakjukebox/ctpl/template.ctpl new file mode 100644 index 0000000..d3343ac --- /dev/null +++ b/data/zakjukebox/ctpl/template.ctpl @@ -0,0 +1,31 @@ + + + + + + + + ZakJukeBox + + + + + + + + + + + + + {{head}} + + + + +
+ {{body}} +
+ + + diff --git a/src/commons.h b/src/commons.h index fe20ba0..76e9e4d 100644 --- a/src/commons.h +++ b/src/commons.h @@ -25,7 +25,6 @@ #endif #include -#include typedef struct { @@ -34,8 +33,6 @@ typedef struct gchar *formdir; gchar *imagesdir; - ZakConfi *confi; - ZakCgiMain *zcgi_main; ZakCgiSession *zcgi_session; diff --git a/src/index.c b/src/index.c index b28df34..a69d944 100644 --- a/src/index.c +++ b/src/index.c @@ -20,33 +20,49 @@ #include #endif +#include + #include "index.h" void index_index (GMatchInfo *minfo, gpointer user_data) { - /* CtplEnviron *env; */ + g_autoptr(GFile) file = NULL; + g_autoptr(TmplScope) scope = NULL; + g_autoptr(TmplTemplate) tmpl = NULL; + g_autoptr(GError) error = NULL; + TmplSymbol *symbol = NULL; + gchar *str; + g_warning ("INDEX INDEX"); + Commons *commons = (Commons *)user_data; - gchar *filename; - gchar *content; + file = g_file_new_for_path (CTPLDIR "/template.ctpl"); + tmpl = tmpl_template_new (NULL); - Commons *commons = (Commons *)user_data; + if (!tmpl_template_parse_file (tmpl, file, NULL, &error)) + { + g_warning ("Unable to parse template file «%s»: %s", CTPLDIR "/template.ctpl", error->message); + return; + } + + scope = tmpl_scope_new (); + + symbol = tmpl_scope_get (scope, "head"); + tmpl_symbol_assign_string (symbol, ""); - /* env = ctpl_environ_new (); */ + symbol = tmpl_scope_get (scope, "body"); + tmpl_symbol_assign_string (symbol, commons->root); - filename = g_build_filename (commons->ctpldir, "index_index.ctpl", NULL); - /* content = solipa_ctpl_get_filled (commons->solipa_ctpl, filename, env); */ - g_free (filename); + symbol = tmpl_scope_get (scope, "body_tag"); + tmpl_symbol_assign_string (symbol, ""); - /* env = ctpl_environ_new (); */ - /* ctpl_environ_push_string (env, "head", ""); */ - /* ctpl_environ_push_string (env, "body_tag", ""); */ - /* ctpl_environ_push_string (env, "body", content); */ + if (!(str = tmpl_template_expand_string (tmpl, scope, &error))) + { + g_warning ("Error on rendering page: %s", error->message); + return; + } - filename = g_build_filename (commons->ctpldir, "template.ctpl", NULL); - /* g_string_printf (commons->out, "%s", */ - /* solipa_ctpl_get_filled (commons->solipa_ctpl, filename, env)); */ - g_free (filename); + g_string_printf (commons->out, "%s", str); - g_free (content); + g_free (str); } diff --git a/src/main.c b/src/main.c index 31b8ec3..fc98002 100644 --- a/src/main.c +++ b/src/main.c @@ -37,6 +37,8 @@ main (int argc, char *argv[]) gchar *filename; + ZakConfi *confi; + gchar *str; /* inizializzazione commons */ @@ -49,8 +51,8 @@ main (int argc, char *argv[]) /* reading configuration file */ filename = g_build_filename (commons->configdir, "zakjukebox.conf", NULL); - commons->confi = zak_confi_new (g_strdup_printf ("file://%s", filename)); - if (commons->confi == NULL) + confi = zak_confi_new (g_strdup_printf ("file://%s", filename)); + if (confi == NULL) { g_error ("Unable to load the configuration file: %s", filename); g_free (filename); @@ -65,6 +67,8 @@ main (int argc, char *argv[]) commons->zcgi_session = zak_cgi_session_new (commons->zcgi_main, "/zakjukebox", NULL); + commons->root = zak_confi_path_get_value (confi, "DIR/root"); + /* Routing */ zcgi_url = zak_cgi_url_new (commons->zcgi_main);