nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

create the StatesMixin

Browse source
This commit is contained in:
Romain Bignon 2015-08-03 12:15:37 +02:00
commit 7654ded661
1 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

56
weboob/browser/browsers.py
View file

@ -91,11 +91,6 @@ class Browser(object):
Maximum of threads for asynchronous requests. Maximum of threads for asynchronous requests.
""" """
__states__ = []
"""
Saved state variables.
"""
ALLOW_REFERRER = True ALLOW_REFERRER = True
""" """
Controls the behavior of get_referrer. Controls the behavior of get_referrer.
@ -126,26 +121,6 @@ class Browser(object):
def deinit(self): def deinit(self):
self.session.close() self.session.close()
def load_state(self, state):
if 'cookies' in state:
try:
self.session.cookies = pickle.loads(zlib.decompress(base64.b64decode(state['cookies'])))
except (TypeError, zlib.error, EOFError, ValueError):
self.logger.error('Unable to reload cookies from storage')
else:
self.logger.info('Reloaded cookies from storage')
for attrname in self.__states__:
if attrname in state:
setattr(self, attrname, state[attrname])
def dump_state(self):
state = {}
state['cookies'] = base64.b64encode(zlib.compress(pickle.dumps(self.session.cookies, -1)))
for attrname in self.__states__:
state[attrname] = getattr(self, attrname)
self.logger.info('Stored cookies into storage')
return state
def save_response(self, response, warning=False, **kwargs): def save_response(self, response, warning=False, **kwargs):
if self.responses_dirname is None: if self.responses_dirname is None:
import tempfile import tempfile
@ -772,8 +747,28 @@ class LoginBrowser(PagesBrowser):
def do_logout(self): def do_logout(self):
self.session.cookies.clear() self.session.cookies.clear()
class StatesMixin(object):
"""
Mixin to store states of browser.
"""
__states__ = []
"""
Saved state variables.
"""
def load_state(self, state): def load_state(self, state):
super(LoginBrowser, self).load_state(state) if 'cookies' in state:
try:
self.session.cookies = pickle.loads(zlib.decompress(base64.b64decode(state['cookies'])))
except (TypeError, zlib.error, EOFError, ValueError):
self.logger.error('Unable to reload cookies from storage')
else:
self.logger.info('Reloaded cookies from storage')
for attrname in self.__states__:
if attrname in state:
setattr(self, attrname, state[attrname])
if 'url' in state: if 'url' in state:
try: try:
@ -782,11 +777,12 @@ class LoginBrowser(PagesBrowser):
pass pass
def dump_state(self): def dump_state(self):
if not self.page or not self.page.logged: state = {}
return {}
state = super(LoginBrowser, self).dump_state()
state['url'] = self.page.url state['url'] = self.page.url
state['cookies'] = base64.b64encode(zlib.compress(pickle.dumps(self.session.cookies, -1)))
for attrname in self.__states__:
state[attrname] = getattr(self, attrname)
self.logger.info('Stored cookies into storage')
return state return state