CONFIG: structured options, another one step

data/interfaces/default/config-templates.html

@@ -1,14 +1,90 @@
-<%def name="OptionString(key, label='', tip='', caption='', size=None)">
+<%def name="OptionString(o)">
 <%
-    txt_size_attr = ' size="%d"' % size if size is not None else '';
+    size_attr = '' if o.maxlength is None else ' size="%d"' % o.maxlength
+    tooltip_attr = '' if o.tooltip is None else ' title="%s"' % o.tooltip
+    uiname = o.appkey + '_config_opt'
 %>
     <div class="row">
-        <label title="${tip}">
-            ${label}
-        </label>
-        <input type="text" name="${key}" value="${config[key]}" ${txt_size_attr} />
-        %if caption:
-            <small>${caption}</small>
+        %if o.label is not None:
+            <label ${tooltip_attr} for="${uiname}">
+                ${o.label}
+            </label>
+        %endif
+
+        <input type="text" id="${uiname}" name="${uiname}" value="${o.value}" ${size_attr} />
+
+        %if o.caption is not None:
+            <small>${o.caption}</small>
+        %endif
+    </div>
+</%def>
+
+
+<%def name="OptionPassword(o)">
+<%
+    size_attr = '' if o.maxlength is None else ' size="%d"' % o.maxlength
+    tooltip_attr = '' if o.tooltip is None else ' title="%s"' % o.tooltip
+    uiname = o.appkey + '_config_opt'
+%>
+    <div class="row">
+        %if o.label is not None:
+            <label ${tooltip_attr} for="${uiname}">
+                ${o.label}
+            </label>
+        %endif
+
+        <input type="password" id="${uiname}" name="${uiname}" value="${o.value}" ${size_attr} />
+
+        %if o.caption is not None:
+            <small>${o.caption}</small>
+        %endif
+    </div>
+</%def>
+
+
+<%def name="OptionNumber(o)">
+<%
+    min_attr = '' if o.minvalue is None else ' min="%d"' % o.minvalue
+    max_attr = '' if o.maxvalue is None else ' size="%d"' % o.maxvalue
+    tooltip_attr = '' if o.tooltip is None else ' title="%s"' % o.tooltip
+    uiname = o.appkey + '_config_opt'
+%>
+    <div class="row">
+        %if o.label is not None:
+            <label ${tooltip_attr} for="${uiname}">
+                ${o.label}
+            </label>
+        %endif
+
+        <input type="number" id="${uiname}" name="${uiname}" value="${o.value}" ${min_attr} ${max_attr} />
+
+        %if o.caption is not None:
+            <small>${o.caption}</small>
         %endif
     </div>
 </%def>
+
+<%def name="OptionBool(o)">
+<%
+    tooltip_attr = '' if o.tooltip is None else ' title="%s"' % o.tooltip
+    uiname = o.appkey + '_config_opt'
+    checked_attr = 'checked' if o.value else ''
+%>
+    <div class="row checkbox">
+        %if o.label is not None:
+            <label ${tooltip_attr} for="${uiname}">
+                ${o.label}
+            </label>
+        %endif
+
+        <input type="checkbox" id="${uiname}" name="${uiname}" value="1" ${checked_attr} />
+
+        %if o.caption is not None:
+            <small>${o.caption}</small>
+        %endif
+    </div>
+</%def>
+
+<%def name="OptionSwitch(o)">
+<strong>Turn</strong>
+</%def>

data/interfaces/default/config.html

@@ -32,14 +32,16 @@ <h1 class="clearfix"><i class="fa fa-gear"></i> Settings</h1>
 
             % for tab in tabs:
             <div id="${tab.id}">
-                % for block in tab.iblocks():
+                % for block in tab:
                     <fieldset>
                         <legend>${block.caption}</legend>
-                        % for option in block.ioptions():
-                            <div>${${option.tmp}}</div>
-                        % endfor    # for option in block.ioptions() 
+                        % for option in block:
+                            <div>
+                                ${option.render()}
+                            </div>
+                        % endfor    # for option in block
                     </fieldset>
-                % endfor    # for block in tab.iblocks()
+                % endfor    # for block in tab
             </div>
             % endfor    # for tab in tabs
         </form>

data/interfaces/default/config2.html

@@ -36,17 +36,8 @@ <h1 class="clearfix"><i class="fa fa-gear"></i> Settings</h1>
                         <td>
                             <fieldset>
                                 <legend>Basic</legend>
-
-                                ${OptionString('http_host',
-                                        tip='Host to bind web server to',
-                                        label='HTTP Host',
-                                        caption='Use 0.0.0.0 to allow outside connections',
-                                        size=30)}
-
-                                ${OptionString('http_port',
-                                        tip='Port to bind web server to. Note that ports below 1024 may require root.',
-                                        label='HTTP Port',
-                                        size=10)}
+
+
 
                                 <div class="row">
                                     <label title="Username for web server authentication. Leave empty to disable.">

headphones/config.py

@@ -7,9 +7,10 @@
 from configview import Tab, Tabs, Block
 from configoptions import path, bool_int
 
-from configoptions import OptionString, OptionNumber, OptionSwitch
+from configoptions import OptionString, OptionNumber, OptionSwitch, OptionPassword, OptionBool, OptionPath
 
 def _(x):
+    """ required just for marking translatable strings"""
     return x
 
 _TABS = Tabs((
@@ -21,7 +22,7 @@ def _(x):
     Tab('advanced', _("Advanced Settings")),
 ))
 
-def register_block(tabid, *blocks):
+def registerBlock(tabid, *blocks):
     tab = None
     for t in _TABS:
         if t.id == tabid:
@@ -32,28 +33,74 @@ def register_block(tabid, *blocks):
     for block in blocks:
         tab.add([block])
 
-"""
-${OptionString('http_host',
-    tip='Host to bind web server to',
-    label='HTTP Host',
-    caption='Use 0.0.0.0 to allow outside connections',
-    size=30)}
-
-${OptionString('http_port',
-    tip='Port to bind web server to. Note that ports below 1024 may require root.',
-    label='HTTP Port',
-    size=10)}
-"""
-register_block('webui',
+
+# <div class="row checkbox">
+#     <input type="checkbox" name="enable_https" id="enable_https" value="1" ${config['enable_https']} />
+#     <label title="Enable HTTPS for web server for encrypted communication">
+#         Enable HTTPS
+#     </label>
+# </div>
+# <div id="https_options">
+#     <div class="row">
+#         <label>HTTPS Cert</label>
+#         <input type="text" name="https_cert" value="${config['https_cert']}" size="30">
+#     </div>
+#     <div class="row">
+#         <label>HTTPS Key</label>
+#         <input type="text" name="https_key" value="${config['https_key']}" size="30">
+#     </div>
+# </div>
+
+
+registerBlock('webui',
    Block('basic', caption=_("Basic"), options=[
-       OptionString('HTTP_HOST', default='', maxlength=30),
-       OptionNumber('HTTP_PORT', default=8181, minvalue=1, maxvalue=99999),
+
+       OptionString('HTTP_HOST', 'General', 'localhost',
+            label=_('HTTP Host'),
+            caption=_('Use 0.0.0.0 to allow outside connections'),
+            tooltip=_('Host to bind web server to'),
+            maxlength=30
+            ),
+       OptionNumber('HTTP_PORT', 'General', 8181,
+            label=_('HTTP Port'),
+            tooltip=_('Port to bind web server to. Note that ports below 1024 may require root.'),
+            minvalue=1,
+            maxvalue=99999),
+       OptionPath('HTTP_USERNAME', 'General', '',
+            label=_('HTTP Username'),
+            tooltip=_('Username for web server authentication. Leave empty to disable.'),
+            maxlength=30),
+       OptionPassword('HTTP_PASSWORD', 'General', '',
+            label=_('HTTP Password'),
+            tooltip=_('Password for web server authentication. Leave empty to disable.'),
+            maxlength=30),
+       OptionBool('LAUNCH_BROWSER', 'General', True,
+            label=_('Launch Browser on Startup'),
+            tooltip=_('Launch browser pointed to Headphones, on startup.'),
+            ),
    ]),
 
+
+# <fieldset>
+#     <legend>API</legend>
+#     <div class="row checkbox">
+#         <input type="checkbox" id="api_enabled" />
+#     </div>
+#     <div id="apioptions" class="row">
+#         <label></label>
+#         <input type="text" name="api_key" id="api_key" value="${config['api_key']}" size="20">
+#         <input type="button" value="Generate" id="generate_api">
+#         <small>Current API key: <strong>${config['api_key']}</strong></small>
+#     </div>
+# </fieldset>
    Block('api', caption=_("API"), options=[
-       OptionString('API_KEY', default='', maxlength=20),
-       OptionSwitch('API_ENABLED', default=False),
-   ]),
+        OptionSwitch('API_ENABLED', 'General', False,
+            label=_('Enable API'),
+            tooltip=_('Allow remote applications to interface with Headphones')),
+        OptionString('API_KEY', 'General', '',
+            label=_('API key'),
+            maxlength=20),
+  ]),
 )
 
 # =======================================================================================
@@ -67,8 +114,8 @@ def register_block(tabid, *blocks):
     # This is used in importer.py to determine how complete an album needs to
     # be - to be considered "downloaded". Percentage from 0-100
     'ALBUM_COMPLETION_PCT': (int, 'Advanced', 80),
-    'API_ENABLED': (int, 'General', 0),
-    'API_KEY': (str, 'General', ''),
+'API_ENABLED': (int, 'General', 0),
+'API_KEY': (str, 'General', ''),
     'AUTOWANT_ALL': (int, 'General', 0),
     'AUTOWANT_MANUALLY_ADDED': (int, 'General', 1),
     'AUTOWANT_UPCOMING': (int, 'General', 1),
@@ -149,12 +196,12 @@ def register_block(tabid, *blocks):
     'HPUSER': (str, 'General', ''),
     'HTTPS_CERT': (path, 'General', ''),
     'HTTPS_KEY': (path, 'General', ''),
-    'HTTP_HOST': (str, 'General', 'localhost'),
-    'HTTP_PASSWORD': (str, 'General', ''),
-    'HTTP_PORT': (int, 'General', 8181),
+'HTTP_HOST': (str, 'General', 'localhost'),
+'HTTP_PASSWORD': (str, 'General', ''),
+'HTTP_PORT': (int, 'General', 8181),
     'HTTP_PROXY': (int, 'General', 0),
     'HTTP_ROOT': (str, 'General', '/'),
-    'HTTP_USERNAME': (str, 'General', ''),
+'HTTP_USERNAME': (str, 'General', ''),
     'IDTAG': (int, 'Beets', 0),
     'IGNORE_CLEAN_RELEASES': (int, 'General', 0),
     'IGNORED_WORDS': (str, 'General', ''),
@@ -169,7 +216,7 @@ def register_block(tabid, *blocks):
     'KEEP_NFO': (int, 'General', 0),
     'KEEP_TORRENT_FILES': (int, 'General', 0),
     'LASTFM_USERNAME': (str, 'General', ''),
-    'LAUNCH_BROWSER': (int, 'General', 1),
+'LAUNCH_BROWSER': (int, 'General', 1),
     'LIBRARYSCAN': (int, 'General', 1),
     'LIBRARYSCAN_INTERVAL': (int, 'General', 300),
     'LMS_ENABLED': (int, 'LMS', 0),