[core] Remove alias from module

Hide alias concept for modules in the engine. That way, the individual
modules never get to know about whether a module has been aliased or
not.

see #23
This commit is contained in:
Tobi-wan Kenobi 2016-12-02 18:53:34 +01:00
parent f306366629
commit 2f3f171ca5
21 changed files with 48 additions and 45 deletions

View file

@ -9,8 +9,8 @@ def parameters():
return [ "battery.device: The device to read from (defaults to BAT0)" ]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._battery = config.parameter("device", "BAT0")
self._capacity = 100
self._status = "Unknown"

View file

@ -9,8 +9,8 @@ def parameters():
]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._brightness = 0
self._max = 0
self._percent = 0

View file

@ -7,8 +7,8 @@ def description():
return "Enable/disable auto screen lock."
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._activated = 0
output.add_callback(module="caffeine.activate", button=1, cmd=[ 'notify-send "Consuming caffeine"', 'xset s off' ])
output.add_callback(module="caffeine.deactivate", button=1, cmd=[ 'notify-send "Out of coffee"', 'xset s default' ])

View file

@ -15,8 +15,8 @@ def parameters():
]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._status = "default"
self._fmt = self._config.parameter("format", "{artist} - {title} {position}/{duration}")

View file

@ -11,8 +11,8 @@ def parameters():
]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._perc = psutil.cpu_percent(percpu=False)
output.add_callback(module=self.instance(), button=1, cmd="gnome-system-monitor")

View file

@ -12,8 +12,8 @@ def parameters():
]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._path = self._config.parameter("path", "/")
output.add_callback(module=self.instance(), button=1, cmd="nautilus {}".format(self._path))

View file

@ -59,8 +59,8 @@ def get_dnf_info(obj):
obj.set("other", other)
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._counter = {}
self._thread = threading.Thread(target=get_dnf_info, args=(self,))

View file

@ -13,8 +13,8 @@ def parameters():
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._languages = self._config.parameter("lang", "en").split("|")
self._idx = 0

View file

@ -12,8 +12,8 @@ def parameters():
]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._cpus = 1
try:
self._cpus = multiprocessing.cpu_count()

View file

@ -12,8 +12,8 @@ def parameters():
]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._mem = psutil.virtual_memory()
output.add_callback(module=self.instance(), button=1, cmd="gnome-system-monitor")

View file

@ -10,8 +10,8 @@ def parameters():
]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._exclude = tuple(filter(len, self._config.parameter("exclude", "lo,virbr,docker,vboxnet,veth").split(",")))
self._state = "down"
self._typecache = {}

View file

@ -6,8 +6,8 @@ def description():
return "Displays available updates per repository for pacman."
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._count = 0
def widgets(self):

View file

@ -56,8 +56,8 @@ def get_rtt(obj):
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._counter = {}

View file

@ -18,8 +18,8 @@ def parameters():
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._module = self.__module__.split(".")[-1]
self._left = 0

View file

@ -8,8 +8,8 @@ def parameters():
return [ "spacer.text: Text to draw (defaults to '')" ]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
def widgets(self):
return bumblebee.output.Widget(self, self._config.parameter("text", ""))

View file

@ -21,8 +21,8 @@ def default_format(module):
return default
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
module = self.__module__.split(".")[-1]

View file

@ -13,8 +13,8 @@ def parameters():
]
class Module(bumblebee.module.Module):
def __init__(self, output, config, alias):
super(Module, self).__init__(output, config, alias)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._widgets = []