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

fix API to store optimization name in object ID

Browse source
This commit is contained in:
Romain Bignon 2014-12-20 16:20:03 +01:00
commit 38a3de1ef9
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
weboob/applications/havedate/havedate.py
View file

@ -183,8 +183,8 @@ class HaveDate(Boobmsg):
else: else:
backend = args[2] backend = args[2]
optims = set() optims = set()
for (name, optim) in self.do('iter_optimizations', backends=backend): for optim in self.do('iter_optimizations', backends=backend):
optims.add(name) optims.add(optim.id)
return sorted(optims - set(args[3:])) return sorted(optims - set(args[3:]))
def do_optim(self, line): def do_optim(self, line):
@ -222,17 +222,17 @@ class HaveDate(Boobmsg):
optims = {} optims = {}
backends = set() backends = set()
for (name, optim) in self.do('iter_optimizations', backends=backend_name): for optim in self.do('iter_optimizations', backends=backend_name):
if optims_names is not None and name not in optims_names: if optims_names is not None and optim.id not in optims_names:
continue continue
if optim.is_running(): if optim.is_running():
status = 'RUNNING' status = 'RUNNING'
else: else:
status = '-------' status = '-------'
if name not in optims: if optim.id not in optims:
optims[name] = {optim.backend: status} optims[optim.id] = {optim.backend: status}
else: else:
optims[name][optim.backend] = status optims[optim.id][optim.backend] = status
backends.add(optim.backend) backends.add(optim.backend)
backends = sorted(backends) backends = sorted(backends)

3
weboob/capabilities/dating.py
View file

@ -110,6 +110,7 @@ class CapDating(Capability):
:param optim: optimization :param optim: optimization
:type optim: :class:`Optimization` :type optim: :class:`Optimization`
""" """
optim.id = name
setattr(self, 'OPTIM_%s' % name, optim) setattr(self, 'OPTIM_%s' % name, optim)
def iter_optimizations(self): def iter_optimizations(self):
@ -125,7 +126,7 @@ class CapDating(Capability):
if attr is None: if attr is None:
continue continue
yield attr_name[6:], attr yield attr
def get_optimization(self, optim): def get_optimization(self, optim):
""" """