From 67ef2bd8e5d9beab0f5dcf0a54567590350ad26c Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Fri, 31 Aug 2007 08:14:17 +0000 Subject: first work on using json for the hole model --- (limited to 'sessionstore.py') diff --git a/sessionstore.py b/sessionstore.py index 73251ff..0847976 100644 --- a/sessionstore.py +++ b/sessionstore.py @@ -24,23 +24,20 @@ from xpcom.components import interfaces import json + def get_session(browser): session_history = browser.web_navigation.sessionHistory - + if session_history.count == 0: return '' - - session_data = {} - session_data['history'] = _get_history(session_history) - logging.debug('%r' % session_data) - return json.write(session_data) - -def set_session(browser, session_str): - session_data = json.read(session_str) - _set_history(browser.web_navigation.sessionHistory, session_data['history']) - - if session_data['history']: - browser.web_navigation.gotoIndex(len(session_data['history']) - 1) + + return _get_history(session_history) + +def set_session(browser, data): + _set_history(browser.web_navigation.sessionHistory, data) + + if data: + browser.web_navigation.gotoIndex(len(data) - 1) else: browser.load_uri('about:blank') -- cgit v0.9.1