From a5198b881e62c32f94dfd7ccf5c39073b5a5768a Mon Sep 17 00:00:00 2001
From: Bill Dengler <codeofdusk@gmail.com>
Date: Sat, 9 May 2015 23:12:17 -0400
Subject: [PATCH] #15: Allow for caching to be disabled, delete database when
 cache is disabled, remove unneeded conditional logic from method calls and
 move into methods themselves.

---
 src/controller/mainController.py |  3 +--
 src/sessionmanager/session.py    | 11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index f12e9791..2005e6f5 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -531,8 +531,7 @@ class Controller(object):
    if hasattr(session_.sessions[item], "timelinesStream"): session_.sessions[item].timelinesStream.disconnect()
    session_.sessions[item].sound.cleaner.cancel()
    log.debug("Shelving database for " +    session_.sessions[item].session_id)
-   if session_.sessions[item].settings["general"]["persistant_session"] == True:
-    session_.sessions[item].shelve()
+   session_.sessions[item].shelve()
 
   if system == "Windows":
    self.systrayIcon.RemoveIcon()
diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py
index 572c1a57..4cc29efb 100644
--- a/src/sessionmanager/session.py
+++ b/src/sessionmanager/session.py
@@ -113,8 +113,7 @@ class Session(object):
    log.debug("Creating config file %s" % (file_,))
    self.settings = config_utils.load_config(paths.config_path(file_), paths.app_path("Conf.defaults"))
    self.init_sound()
-   if self.settings["general"]["persist_size"] != 0:
-    self.deshelve()
+   self.deshelve()
 #  except:
 #   log.exception("The session configuration has failed.")
 #   self.settings = None
@@ -370,6 +369,10 @@ class Session(object):
  def shelve(self):
   "Shelve the database to allow for persistance."
   shelfname=paths.config_path(str(self.session_id)+".db")
+  if self.settings["general"]["persist_size"] == 0:
+   if os.path.exists(shelfname)
+    os.remove(shelfname)
+   return
   try:
    if not os.path.exists(shelfname):
     output.speak("Generating database, this might take a while.",True)
@@ -391,6 +394,10 @@ class Session(object):
  def deshelve(self):
   "Import a shelved database."
   shelfname=paths.config_path(str(self.session_id)+".db")
+  if self.settings["general"]["persist_size"] == 0:
+   if os.path.exists(shelfname)
+    os.remove(shelfname)
+   return
   try:
    shelf=shelve.open(paths.config_path(shelfname),'c')
    for key,value in shelf.items():