From f33956dc7d8a0d9c2bcdbc705143231eb885cd89 Mon Sep 17 00:00:00 2001
From: Antti Ajanki <antti.ajanki@iki.fi>
Date: Sat, 26 Mar 2011 18:20:11 +0200
Subject: vfat and verbose config file options

---
 src/vdr-plugin/config.c         | 21 +++++++++++++++++++++
 src/webvicli/webvicli/client.py | 19 +++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/vdr-plugin/config.c b/src/vdr-plugin/config.c
index 8bc3fde..1fa62c8 100644
--- a/src/vdr-plugin/config.c
+++ b/src/vdr-plugin/config.c
@@ -118,6 +118,27 @@ bool cWebvideoConfig::ReadConfigFile(const char *inifile) {
     SetTemplatePath(templatepath);
   }
 
+  const char *vfat = iniparser_getstring(conf, "webvi:vfat", NULL);
+  if (vfat) {
+    debug("vfat = %s (from %s)", vfat, inifile);
+
+    if (strcmp(vfat, "1") == 0 || 
+        strcmp(vfat, "true") == 0 ||
+        strcmp(vfat, "yes") == 0 ||
+        strcmp(vfat, "on") == 0)
+    {
+      vfatNames = true;
+    } else if (strcmp(vfat, "0") == 0 || 
+               strcmp(vfat, "false") == 0 ||
+               strcmp(vfat, "no") == 0 ||
+               strcmp(vfat, "off") == 0)
+    {
+      vfatNames = false;
+    } else {
+      warning("Invalid value for config option vfat: %s in %s", vfat, inifile);
+    }
+  }
+
   for (int i=0; i<iniparser_getnsec(conf); i++) {
     const char *section = iniparser_getsecname(conf, i);
 
diff --git a/src/webvicli/webvicli/client.py b/src/webvicli/webvicli/client.py
index a8fd6d7..daefa6d 100644
--- a/src/webvicli/webvicli/client.py
+++ b/src/webvicli/webvicli/client.py
@@ -698,7 +698,21 @@ def load_config(options):
     for sec in cfgprs.sections():
         if sec == 'webvi':
             for opt, val in cfgprs.items('webvi'):
-                options[opt] = val
+                if opt in ['vfat', 'verbose']:
+                    try:
+                        options[opt] = cfgprs.getboolean(sec, opt)
+                    except ValueError:
+                        print 'Invalid config: %s = %s' % (opt, val)
+
+                    # convert verbose to integer
+                    if opt == 'verbose':
+                        if options['verbose']:
+                            options['verbose'] = 1
+                        else:
+                            options['verbose'] = 0
+
+                else:
+                    options[opt] = val
 
         else:
             sitename = urlparse(sec).netloc
@@ -741,7 +755,8 @@ def parse_command_line(cmdlineargs, options):
         options['templatepath'] = cmdlineopt.templatepath
     if cmdlineopt.verbose > 0:
         options['verbose'] = cmdlineopt.verbose
-    options['vfat'] = cmdlineopt.vfat
+    if cmdlineopt.vfat:
+        options['vfat'] = cmdlineopt.vfat
 
     return options
 
-- 
cgit v1.2.3