Use ini format instead of json for colors configuration

Author: ids1024

_wikicurses

@@ -42,6 +42,7 @@ _wikicurses_name() {
 _wikicurses() {
 	_arguments -s : \
 		{-h,--help}'[Display help message]'\
+		'--dumpcolors[Write current color settings to config file]'\
 		{-w,--wiki}'[Url or name of wiki to use]:wikis:_wikicurses_wiki'\
 		{-f,--feed}'[Show featured articles (Wikipedia only)]:feeds:_wikicurses_feed'\
 		'*:pages:_wikicurses_name'

src/wikicurses/main.py

@@ -1,6 +1,5 @@
 import argparse
 import urwid
-import json
 import tempfile
 import subprocess
 import os
@@ -514,7 +513,8 @@ def main():
         print(*sugestions, sep='\n')
         return
     elif args.dumpcolors:
-        print(json.dumps(settings.defcolors, indent=2))
+        settings.dumpColors()
+        print("Color settings written to " + settings.configpath + '/colors.')
         return
 
     callback = lambda x, y: openPage(args.feed or args.search, bool(args.feed))

src/wikicurses/settings.py

@@ -27,11 +27,30 @@
         'h2': [['bold', 'underline'], '', ''],
         'h': [['bold', 'underline'], '', '']
         }
-colors = defcolors
-if os.path.exists(configpath + '/colors.json'):
-    with open(configpath + '/colors.json') as file:
-        # Use colors in colors.json, with defaults as fallbacks
-        colors.insert(json.load(file))
+if os.path.exists(configpath + '/colors'):
+    colorsconf = configparser.ConfigParser()
+    colors = {}
+    colorsconf.read(configpath + '/colors')
+    for name, (defsettings, deffgcolor, defbgcolor) in defcolors.items():
+        try:
+            settings = colorsconf.get(name, 'settings').split()
+        except (configparser.NoSectionError, configparser.NoOptionError):
+            settings = defsettings
+        fgcolor = colorsconf.get(name, 'fgcolor', fallback=deffgcolor)
+        bgcolor = colorsconf.get(name, 'bgcolor', fallback=defbgcolor)
+        colors[name] = [settings, fgcolor, bgcolor]
+else:
+    colors = defcolors
+
+def dumpColors():
+    colorsconf = configparser.ConfigParser()
+    for name, (settings, fgcolor, bgcolor) in colors.items():
+        colorsconf.add_section(name)
+        colorsconf.set(name, 'settings', ' '.join(settings))
+        colorsconf.set(name, 'fgcolor', fgcolor)
+        colorsconf.set(name, 'bgcolor', bgcolor)
+    with open(configpath + '/colors', 'w') as file:
+        colorsconf.write(file)
 
 class Settings:
 

wikicurses.1

@@ -1,4 +1,4 @@
-.TH wikicurses 1 2015-04-07
+.TH wikicurses 1 2015-04-10
 .SH NAME
 wikicurses \- curses interface for MediaWiki
 .SH SYNOPSIS
@@ -162,10 +162,10 @@ view featured feed
 .PP
 \-\-dumpcolors
 .RS 4
-print default color settings
+write current color settings to config file
 .RE
 .SH COLOR SETTINGS
-To use colors other than the defaults, you need a file called ~/.config/wikicurses/colors.json.  To create this file with the default color settings, run wikicurses --dumpcolors > ~/.config/wikicurses/colors.json.  This is a json object containing various things that can be colored.  Each has an array containing the foreground color, display settings (bold, underline, or standout), and the background color.  The color options are the same as in urwid (see http://urwid.org/manual/displayattributes.html).
+To use colors other than the defaults, you need a file called ~/.config/wikicurses/colors.  To create this file with the current color settings, run wikicurses --dumpcolors.  This is a configuration file containing various things that can be colored.  Each has allows setting display settings (bold, underline, or standout), foreground color, and background color.  Multiple settings can be set by separating with spaces.  The color options are the same as in urwid (see http://urwid.org/manual/displayattributes.html).
 .SH ENVIRONMENT VARIABLES
 .PP
 HOME, XDG_CONFIG_HOME