Fixes

[maegirls] / trunk / src / config.py

diff --git a/trunk/src/config.py b/trunk/src/config.py
index 30a3f50..7cf6729 100755 (executable)
--- a/trunk/src/config.py
+++ b/trunk/src/config.py
@@ -22,33 +22,101 @@
 
 __version__ = "$Id: 0.py 2265 2010-02-21 19:16:26Z v13 $"
 
+import os
+
 import pickle
 import time
 import algo
 
-fn="/home/user/.maedays"
+try:
+    home=os.environ['HOME']
+except:
+    home="/home/user"
+
+fn="%s/.maegirls" % (home, )
 
+# Defaults for a girl
 defaults={
     'cycle':   28,
     'day0':    algo.today(),
     }
 
-def store(name, cycle, day0):
-    # Load old
-    all=loadAll()
-    # Override
-    all[name]={
-       'cycle':    cycle,
-       'day0':     day0,
+# Default config
+defaultcfg={
+    'ver':     1,              # Configuration version
+    'girls':   {               # List of configured girls
+       'default':  defaults
+       },
+    'cur':     "default",      # Current girl
+    }
+
+def loadConfig():
+    try:
+       f=file(fn, "r")
+       st=f.read()
+       f.close()
+       ret=pickle.loads(st)
+    except:
+       ret={}
+
+#    print "load:", ret
+
+    return(ret)
+
+def sanitize_before_store(cfg0):
+    cfg={
+       'ver':      cfg0['ver'],
+       'cur':      str(cfg0['cur']),
+       'girls':    {}
        }
 
-    st=pickle.dumps(all)
+    if cfg0.has_key('girls'):
+       for i in cfg0['girls']:
+           cfg['girls'][str(i)]=cfg0['girls'][i]
+
+    return(cfg)
+
+def storeConfig(cfg0):
+    cfg0['ver']=1
+    cfg=sanitize_before_store(cfg0)
+#    print "store:", cfg
+    st=pickle.dumps(cfg)
     f=file(fn, "w")
     f.write(st)
     f.close()
 
-def loadOne(name):
-    all=loadAll()
+def storeGirl(name, dt):
+    # Load old
+    cfg=loadConfig()
+
+    # Ensure
+    if not cfg.has_key('girls'):
+       cfg['girls']={}
+
+    # Override
+    cfg['girls'][name]={
+       'cycle':    dt['cycle'],
+       'day0':     dt['day0'],
+       }
+
+    storeConfig(cfg)
+
+def newGirl(name):
+    global defaults
+
+    storeGirl(name, defaults)
+
+def loadGirls():
+    cfg=loadConfig()
+    try:
+       ret=cfg['girls']
+    except:
+       ret={}
+
+    return(ret)
+
+def loadGirl(name):
+    all=loadGirls()
     if all.has_key(name):
        ret=all[name]
     else:
@@ -56,16 +124,38 @@ def loadOne(name):
 
     return(ret)
 
-def loadAll():
+def girlExists(name):
+    all=loadGirls()
+    if all.has_key(name):
+       ret=True
+    else:
+       ret=False
+    return(ret)
+
+def setCurrentGirl(name):
+    cfg=loadConfig()
+    cfg['cur']=name
+    storeConfig(cfg)
+
+def getCurrentGirl():
+    cfg=loadConfig()
     try:
-       f=file(fn, "r")
-       st=f.read()
-       f.close()
-       ret=pickle.loads(st)
+       ret=cfg['cur']
     except:
-       ret={}
+       ret='default'
 
     return(ret)
 
+def removeGirl(name):
+    cfg=loadConfig()
+    if cfg['girls'].has_key(name):
+       cfg['girls'].pop(name)
+       storeConfig(cfg)
+
+def init():
+    cur=getCurrentGirl()
+    if not girlExists(cur):
+       storeConfig(defaultcfg)
+
 # vim: set ts=8 sts=4 sw=4 noet formatoptions=r ai nocindent: