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

fix warnings

Browse source
This commit is contained in:
Romain Bignon 2014-10-19 13:27:45 +02:00
commit 2eb5507c3a
6 changed files with 88 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/aum/module.py
View file

@ -472,10 +472,10 @@ class AuMModule(Module, CapMessages, CapMessagesPost, CapDating, CapChat, CapCon
def get_account_status(self): def get_account_status(self):
with self.browser: with self.browser:
return ( return (
StatusField('myname', 'My name', self.browser.get_my_name()), StatusField(u'myname', u'My name', unicode(self.browser.get_my_name())),
StatusField('score', 'Score', self.browser.score()), StatusField(u'score', u'Score', unicode(self.browser.score())),
StatusField('avcharms', 'Available charms', self.browser.nb_available_charms()), StatusField(u'avcharms', u'Available charms', unicode(self.browser.nb_available_charms())),
StatusField('newvisits', 'New visits', self.browser.nb_new_visites()), StatusField(u'newvisits', u'New visits', unicode(self.browser.nb_new_visites())),
) )
OBJECTS = {Thread: fill_thread, OBJECTS = {Thread: fill_thread,

63
modules/aum/optim/profiles_walker.py
View file

@ -26,42 +26,43 @@ from weboob.tools.log import getLogger
class ProfilesWalker(Optimization): class ProfilesWalker(Optimization):
def __init__(self, sched, storage, browser): def __init__(self, sched, storage, browser):
self.sched = sched super(ProfilesWalker, self).__init__()
self.storage = storage self._sched = sched
self.browser = browser self._storage = storage
self.logger = getLogger('walker', browser.logger) self._browser = browser
self._logger = getLogger('walker', browser.logger)
self.walk_cron = None self._walk_cron = None
self.view_cron = None self._view_cron = None
self.visited_profiles = set(storage.get('profiles_walker', 'viewed')) self._visited_profiles = set(storage.get('profiles_walker', 'viewed'))
self.logger.info(u'Loaded %d already visited profiles from storage.' % len(self.visited_profiles)) self._logger.info(u'Loaded %d already visited profiles from storage.' % len(self._visited_profiles))
self.profiles_queue = set() self._profiles_queue = set()
def save(self): def save(self):
self.storage.set('profiles_walker', 'viewed', list(self.visited_profiles)) self._storage.set('profiles_walker', 'viewed', list(self._visited_profiles))
self.storage.save() self._storage.save()
def start(self): def start(self):
self.walk_cron = self.sched.repeat(60, self.enqueue_profiles) self._walk_cron = self._sched.repeat(60, self.enqueue_profiles)
self.view_cron = self.sched.schedule(randint(5, 10), self.view_profile) self._view_cron = self._sched.schedule(randint(5, 10), self.view_profile)
return True return True
def stop(self): def stop(self):
self.sched.cancel(self.walk_cron) self._sched.cancel(self._walk_cron)
self.sched.cancel(self.view_cron) self._sched.cancel(self._view_cron)
self.walk_cron = None self._walk_cron = None
self.view_cron = None self._view_cron = None
return True return True
def is_running(self): def is_running(self):
return self.walk_cron is not None return self._walk_cron is not None
def enqueue_profiles(self): def enqueue_profiles(self):
try: try:
with self.browser: with self._browser:
profiles_to_visit = self.browser.search_profiles().difference(self.visited_profiles) profiles_to_visit = self._browser.search_profiles().difference(self._visited_profiles)
self.logger.info(u'Enqueuing profiles to visit: %s' % profiles_to_visit) self._logger.info(u'Enqueuing profiles to visit: %s' % profiles_to_visit)
self.profiles_queue = set(profiles_to_visit) self._profiles_queue = set(profiles_to_visit)
self.save() self.save()
except BrowserUnavailable: except BrowserUnavailable:
return return
@ -69,14 +70,14 @@ class ProfilesWalker(Optimization):
def view_profile(self): def view_profile(self):
try: try:
try: try:
id = self.profiles_queue.pop() id = self._profiles_queue.pop()
except KeyError: except KeyError:
return # empty queue return # empty queue
try: try:
with self.browser: with self._browser:
profile = self.browser.get_profile(id) profile = self._browser.get_profile(id)
self.logger.info(u'Visited profile %s (%s)' % (profile['pseudo'], id)) self._logger.info(u'Visited profile %s (%s)' % (profile['pseudo'], id))
# Get score from the aum_score module # Get score from the aum_score module
#d = self.nucentral_core.callService(context.Context.fromComponent(self), 'aum_score', 'score', profile) #d = self.nucentral_core.callService(context.Context.fromComponent(self), 'aum_score', 'score', profile)
@ -84,15 +85,15 @@ class ProfilesWalker(Optimization):
# deferredlist.append(d) # deferredlist.append(d)
# do not forget that we visited this profile, to avoid re-visiting it. # do not forget that we visited this profile, to avoid re-visiting it.
self.visited_profiles.add(id) self._visited_profiles.add(id)
self.save() self.save()
except BrowserUnavailable: except BrowserUnavailable:
# We consider this profil hasn't been [correctly] analysed # We consider this profil hasn't been [correctly] analysed
self.profiles_queue.add(id) self._profiles_queue.add(id)
return return
except Exception as e: except Exception as e:
self.logger.exception(e) self._logger.exception(e)
finally: finally:
if self.view_cron is not None: if self._view_cron is not None:
self.view_cron = self.sched.schedule(randint(5, 10), self.view_profile) self._view_cron = self._sched.schedule(randint(5, 10), self.view_profile)

49
modules/aum/optim/queries_queue.py
View file

@ -26,66 +26,67 @@ from weboob.tools.log import getLogger
class QueriesQueue(Optimization): class QueriesQueue(Optimization):
def __init__(self, sched, storage, browser): def __init__(self, sched, storage, browser):
self.sched = sched super(QueriesQueue, self).__init__()
self.storage = storage self._sched = sched
self.browser = browser self._storage = storage
self.logger = getLogger('queriesqueue', browser.logger) self._browser = browser
self._logger = getLogger('queriesqueue', browser.logger)
self.queue = storage.get('queries_queue', 'queue', default=[]) self._queue = storage.get('queries_queue', 'queue', default=[])
self.check_cron = None self._check_cron = None
def save(self): def save(self):
self.storage.set('queries_queue', 'queue', self.queue) self._storage.set('queries_queue', 'queue', self._queue)
self.storage.save() self._storage.save()
def start(self): def start(self):
self.check_cron = self.sched.repeat(3600, self.flush_queue) self._check_cron = self._sched.repeat(3600, self.flush_queue)
return True return True
def stop(self): def stop(self):
self.sched.cancel(self.check_cron) self._sched.cancel(self._check_cron)
self.check_cron = None self._check_cron = None
return True return True
def is_running(self): def is_running(self):
return self.check_cron is not None return self._check_cron is not None
def enqueue_query(self, id, priority=999): def enqueue_query(self, id, priority=999):
id_queue = [_id[1] for _id in self.queue] id_queue = [_id[1] for _id in self._queue]
if int(id) in id_queue: if int(id) in id_queue:
raise QueryError('This id is already queued') raise QueryError('This id is already queued')
self.queue.append((int(priority), int(id))) self._queue.append((int(priority), int(id)))
self.save() self.save()
# Try to flush queue to send it now. # Try to flush queue to send it now.
self.flush_queue() self.flush_queue()
# Check if the enqueued query has been sent # Check if the enqueued query has been sent
for p, i in self.queue: for _, i in self._queue:
if i == int(id): if i == int(id):
return False return False
return True return True
def flush_queue(self): def flush_queue(self):
self.queue.sort() self._queue.sort()
priority = 0 priority = 0
id = None id = None
try: try:
try: try:
while len(self.queue) > 0: while len(self._queue) > 0:
priority, id = self.queue.pop() priority, id = self._queue.pop()
if not id: if not id:
continue continue
with self.browser: with self._browser:
if self.browser.send_charm(id): if self._browser.send_charm(id):
self.logger.info('Charm sent to %s' % id) self._logger.info('Charm sent to %s', id)
else: else:
self.queue.append((priority, id)) self._queue.append((priority, id))
self.logger.info("Charm can't be send to %s" % id) self._logger.info("Charm can't be send to %s", id)
break break
# As the charm has been correctly sent (no exception raised), # As the charm has been correctly sent (no exception raised),
@ -97,6 +98,6 @@ class QueriesQueue(Optimization):
except BrowserUnavailable: except BrowserUnavailable:
# We consider this profil hasn't been [correctly] analysed # We consider this profil hasn't been [correctly] analysed
if id is not None: if id is not None:
self.queue.append((priority, id)) self._queue.append((priority, id))
finally: finally:
self.save() self.save()

19
modules/aum/optim/visibility.py
View file

@ -24,25 +24,26 @@ from weboob.capabilities.dating import Optimization
class Visibility(Optimization): class Visibility(Optimization):
def __init__(self, sched, browser): def __init__(self, sched, browser):
self.sched = sched super(Visibility, self).__init__()
self.browser = browser self._sched = sched
self.cron = None self._browser = browser
self._cron = None
def start(self): def start(self):
self.cron = self.sched.repeat(60*5, self.reconnect) self._cron = self._sched.repeat(60*5, self.reconnect)
return True return True
def stop(self): def stop(self):
self.sched.cancel(self.cron) self._sched.cancel(self._cron)
self.cron = None self._cron = None
return True return True
def is_running(self): def is_running(self):
return self.cron is not None return self._cron is not None
def reconnect(self): def reconnect(self):
try: try:
with self.browser: with self._browser:
self.browser.login() self._browser.login()
except BrowserUnavailable: except BrowserUnavailable:
pass pass

8
modules/playme/module.py
View file

@ -36,6 +36,7 @@ __all__ = ['PlayMeModule']
class ProfilesWalker(Optimization): class ProfilesWalker(Optimization):
def __init__(self, sched, storage, browser): def __init__(self, sched, storage, browser):
super(ProfilesWalker, self).__init__()
self._sched = sched self._sched = sched
self._storage = storage self._storage = storage
self._browser = browser self._browser = browser
@ -70,9 +71,9 @@ class ProfilesWalker(Optimization):
self._browser.challenge(user['id']) self._browser.challenge(user['id'])
except NoCredits as e: except NoCredits as e:
delay = int(str(e)) delay = int(str(e))
self._logger.info('No more credits (next try in %d minutes)' % (delay/60)) self._logger.info('No more credits (next try in %d minutes)', (delay/60))
else: else:
self._logger.info('Challenged %s' % user['name']) self._logger.info('Challenged %s', user['name'])
challenged.append(user['id']) challenged.append(user['id'])
self._storage.set('challenged', challenged) self._storage.set('challenged', challenged)
self._storage.save() self._storage.save()
@ -195,8 +196,7 @@ class PlayMeModule(Module, CapMessages, CapMessagesPost, CapDating, CapAccount):
# ---- CapAccount methods --------------------- # ---- CapAccount methods ---------------------
def get_account_status(self): def get_account_status(self):
return ( return (StatusField(u'myname', u'My name', unicode(self.browser.my_name)),
StatusField(u'myname', u'My name', unicode(self.browser.my_name)),
StatusField(u'credits', u'Credits', unicode(self.browser.credits)), StatusField(u'credits', u'Credits', unicode(self.browser.credits)),
) )

24
modules/tinder/module.py
View file

@ -35,34 +35,34 @@ __all__ = ['TinderModule']
class ProfilesWalker(Optimization): class ProfilesWalker(Optimization):
def __init__(self, sched, storage, browser): def __init__(self, sched, storage, browser):
self.sched = sched self._sched = sched
self.storage = storage self._storage = storage
self.browser = browser self._browser = browser
self.logger = getLogger('walker', browser.logger) self._logger = getLogger('walker', browser.logger)
self.view_cron = None self._view_cron = None
def start(self): def start(self):
self.view_cron = self.sched.schedule(1, self.view_profile) self._view_cron = self._sched.schedule(1, self.view_profile)
return True return True
def stop(self): def stop(self):
self.sched.cancel(self.view_cron) self._sched.cancel(self._view_cron)
self.view_cron = None self._view_cron = None
return True return True
def set_config(self, params): def set_config(self, params):
pass pass
def is_running(self): def is_running(self):
return self.view_cron is not None return self._view_cron is not None
def view_profile(self): def view_profile(self):
try: try:
self.browser.like_profile() self._browser.like_profile()
finally: finally:
if self.view_cron is not None: if self._view_cron is not None:
self.view_cron = self.sched.schedule(1, self.view_profile) self._view_cron = self._sched.schedule(1, self.view_profile)
class TinderModule(Module, CapMessages, CapMessagesPost, CapDating): class TinderModule(Module, CapMessages, CapMessagesPost, CapDating):