mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-29 22:23:12 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

#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.

Browse Source
This commit is contained in:
Bill Dengler 2015-05-09 23:12:17 -04:00
parent f394701789
commit a5198b881e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/controller/mainController.py
View File

@ -531,7 +531,6 @@ class Controller(object):
if hasattr(session_.sessions[item], "timelinesStream"): session_.sessions[item].timelinesStream.disconnect() if hasattr(session_.sessions[item], "timelinesStream"): session_.sessions[item].timelinesStream.disconnect()
session_.sessions[item].sound.cleaner.cancel() session_.sessions[item].sound.cleaner.cancel()
log.debug("Shelving database for " + session_.sessions[item].session_id) 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": if system == "Windows":

9
src/sessionmanager/session.py
View File

@ -113,7 +113,6 @@ class Session(object):
log.debug("Creating config file %s" % (file_,)) log.debug("Creating config file %s" % (file_,))
self.settings = config_utils.load_config(paths.config_path(file_), paths.app_path("Conf.defaults")) self.settings = config_utils.load_config(paths.config_path(file_), paths.app_path("Conf.defaults"))
self.init_sound() self.init_sound()
if self.settings["general"]["persist_size"] != 0:
self.deshelve() self.deshelve()
# except: # except:
# log.exception("The session configuration has failed.") # log.exception("The session configuration has failed.")
@ -370,6 +369,10 @@ class Session(object):
def shelve(self): def shelve(self):
"Shelve the database to allow for persistance." "Shelve the database to allow for persistance."
shelfname=paths.config_path(str(self.session_id)+".db") 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: try:
if not os.path.exists(shelfname): if not os.path.exists(shelfname):
output.speak("Generating database, this might take a while.",True) output.speak("Generating database, this might take a while.",True)
@ -391,6 +394,10 @@ class Session(object):
def deshelve(self): def deshelve(self):
"Import a shelved database." "Import a shelved database."
shelfname=paths.config_path(str(self.session_id)+".db") 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: try:
shelf=shelve.open(paths.config_path(shelfname),'c') shelf=shelve.open(paths.config_path(shelfname),'c')
for key,value in shelf.items(): for key,value in shelf.items():