diff --git a/src/config.py b/src/config.py index 1e263216..ae1a462f 100644 --- a/src/config.py +++ b/src/config.py @@ -10,13 +10,20 @@ MAINFILE = "twblue.conf" MAINSPEC = "app-configuration.defaults" proxyTypes=["http", "https", "socks4", "socks5"] app = None +sessions=None keymap=None changed_keymap = False def setup (): global app + global sessions log.debug("Loading global app settings...") app = config_utils.load_config(paths.config_path(MAINFILE), paths.app_path(MAINSPEC)) + if app['app-settings']['paranoid']: + log.debug("We're paranoid, creating temporary session storage area...") + sessions={"current_session":"","sessions":[],"ignored_sessions":[]} + else: + sessions=app['sessions'] log.debug("Loading keymap...") global keymap if float(platform.version()[:2]) >= 10 and app["app-settings"]["load_keymap"] == "default.keymap": diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index ab0958a2..a26890f5 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -183,7 +183,7 @@ class accountPanel(bufferController): def setup_account(self): widgetUtils.connect_event(self.buffer, widgetUtils.CHECKBOX, self.autostart, menuitem=self.buffer.autostart_account) - if self.account_id in config.app["sessions"]["ignored_sessions"]: + if self.account_id in config.sessions["ignored_sessions"]: self.buffer.change_autostart(False) else: self.buffer.change_autostart(True) @@ -205,12 +205,12 @@ class accountPanel(bufferController): pub.sendMessage("logout", session_id=self.account_id) def autostart(self, *args, **kwargs): - if self.account_id in config.app["sessions"]["ignored_sessions"]: + if self.account_id in config.sessions["ignored_sessions"]: self.buffer.change_autostart(True) - config.app["sessions"]["ignored_sessions"].remove(self.account_id) + config.sessions["ignored_sessions"].remove(self.account_id) else: self.buffer.change_autostart(False) - config.app["sessions"]["ignored_sessions"].append(self.account_id) + config.sessions["ignored_sessions"].append(self.account_id) config.app.write() class emptyPanel(bufferController): diff --git a/src/sessionmanager/manager.py b/src/sessionmanager/manager.py index f72f211d..285ca0b1 100644 --- a/src/sessionmanager/manager.py +++ b/src/sessionmanager/manager.py @@ -25,8 +25,8 @@ class sessionManager(object): # pass def get_current_session(self): - if self.is_valid(config.app["sessions"]["current_session"]): - return config.app["sessions"]["current_session"] + if self.is_valid(config.sessions["current_session"]): + return config.sessions["current_session"] else: return False @@ -36,16 +36,16 @@ class sessionManager(object): if not os.path.exists(path): log.debug("Creating %s path" % (paths.config_path(path),)) os.mkdir(path) - config.app["sessions"]["sessions"].append(id) + config.sessions["sessions"].append(id) def set_current_session(self, sessionID): - config.app["sessions"]["current_session"] = sessionID + config.sessions["current_session"] = sessionID config.app.write() def is_valid(self, id): if not os.path.exists(paths.config_path(id)): raise session_exceptions.NonExistentSessionError("That session does not exist.") - config.app["sessions"]["current_session"] = "" + config.sessions["current_session"] = "" return False else: return True \ No newline at end of file diff --git a/src/sessionmanager/sessionManager.py b/src/sessionmanager/sessionManager.py index 1417458b..9bb7ae35 100644 --- a/src/sessionmanager/sessionManager.py +++ b/src/sessionmanager/sessionManager.py @@ -81,7 +81,7 @@ class sessionManagerController(object): if (i in session.sessions) == True: continue s = session.Session(i) s.get_configuration() - if i not in config.app["sessions"]["ignored_sessions"]: + if i not in config.sessions["ignored_sessions"]: s.login() session.sessions[i] = s self.new_sessions[i] = s