mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-07-18 06:06:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Config validation, invisible interface fix

Browse Source
This commit is contained in:
Manuel Cortez
2015-03-30 10:55:56 -06:00
parent a513303a9a
commit d2f7228653
5 changed files with 27 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sessionmanager/session.py
View File

@@ -11,7 +11,7 @@ import sound
import logging
from twitter import utils
from twython import TwythonError, TwythonRateLimitError, TwythonAuthError
from config_utils import Configuration, ConfigurationResetException
import config_utils
from mysc.thread_utils import stream_threaded
from pubsub import pub
log = logging.getLogger("sessionmanager.session")
@@ -106,7 +106,7 @@ class Session(object):
file_ = "%s/session.conf" % (self.session_id,)
# try:
log.debug("Creating config file %s" % (file_,))
self.settings = Configuration(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()
# except:
# log.exception("The session configuration has failed.")

4
src/sessionmanager/sessionManager.py
View File

@@ -8,7 +8,7 @@ import os
import logging
import session
import manager
from config_utils import Configuration
import config_utils
import config
log = logging.getLogger("sessionmanager.sessionManager")
@@ -32,7 +32,7 @@ class sessionManagerController(object):
if os.path.isdir(paths.config_path(i)):
log.debug("Adding session %s" % (i,))
strconfig = "%s/session.conf" % (paths.config_path(i))
config_test = Configuration(strconfig)
config_test = config_utils.load_config(strconfig)
name = config_test["twitter"]["user_name"]
if config_test["twitter"]["user_key"] != "" and config_test["twitter"]["user_secret"] != "":
sessionsList.append(name)