Get rid of battery and brightness dummies on kubaDesktop

.i3/lemonbar/i3_lemonbar_modules.py

@@ -186,23 +186,16 @@ conky.text = [["""
 conky_end_body = """
 ]]"""
 class ConkyFastModule(LemonModule):
-    if common.hostname() == 'kubaDesktop':
-        conky_config = (conky_config(update_interval=1)
-                     + conky_begin_body
-                     + """\\
-${exec ~/.i3/lemonbar/get_vol.sh} """
-                     + conky_net('enp5s0')
-                     + conky_end_body)
-    else:
-        conky_config = (conky_config(update_interval=1)
-                     + conky_begin_body
-                     + """\\
-${exec ~/.i3/lemonbar/get_vol.sh} """
-                     + conky_net('wlp3s0')
-                     + conky_net('enp2s0')
-                     + conky_end_body)
 
     def __init__(self):
+        self.conky_config = (conky_config(update_interval=1)
+                          + conky_begin_body
+                          + """\\
+${exec ~/.i3/lemonbar/get_vol.sh} """
+                          + ( conky_net('enp5s0') if common.hostname() == 'kubaDesktop' else
+                              (conky_net('wlp3s0')
+                             + conky_net('enp2s0')))
+                          + conky_end_body)
         super().__init__()
 
     def _start_module(self):
@@ -232,32 +225,29 @@ ${exec ~/.i3/lemonbar/get_vol.sh} """
 
 
     def _parse_data_w_wlan(self, data):
-        # wlan and eth
+        self.parse_vol  (data[0])
-        (wland_v, wlanu_v) = format_load(data[1:3], self.wlan_load, config.net_alert)
+        self.parse_wlan (data[1:3])
+        self.parse_eth  (data[3:5])
+
+    def _parse_data_wo_wlan(self, data):
+        self.parse_vol  (data[0])
+        self.parse_eth  (data[1:3])
+
+    def parse_wlan(self, data):
+        (wland_v, wlanu_v) = format_load(data, self.wlan_load, config.net_alert)
         self.wlan_load.items = [(config.icon_wlan + config.icon_dl, wland_v)
                                ,(config.icon_ul, wlanu_v)]
 
-        (ethd_v, ethu_v) = format_load(data[3:5], self.eth_load, config.net_alert)
+    def parse_eth(self, data):
+        (ethd_v, ethu_v) = format_load(data, self.eth_load, config.net_alert)
         self.eth_load.items = [(config.icon_eth + config.icon_dl, ethd_v)
                                ,(config.icon_ul, ethu_v)]
 
-        # Volume
+    def parse_vol(self, data):
-        mute = data[0] == 'MUTE' or data[0] == 'NONE'
+        mute = data == 'MUTE' or data == 'NONE'
-        (vol,vols) = (-1,'×') if mute else (int(data[0]), data[0]+'%')
+        (vol,vols) = (-1,'×') if mute else (int(data), data+'%')
-        icon_v = config.icon_vol_mute if vol == 0 else \
+        icon_v = (config.icon_vol_mute if vol == 0 else
-                config.icon_vol_low if vol < 50 else config.icon_vol
+                  config.icon_vol_low if vol < 50 else config.icon_vol)
-        self.volume.items = [(icon_v, vols)]
-
-    def _parse_data_wo_wlan(self, data):
-        (ethd_v, ethu_v) = format_load(data[1:3], self.eth_load, config.net_alert)
-        self.eth_load.items = [(config.icon_eth + config.icon_dl, ethd_v)
-                               ,(config.icon_ul, ethu_v)]
-
-        # Volume
-        mute = data[0] == 'MUTE' or data[0] == 'NONE'
-        (vol,vols) = (-1,'×') if mute else (int(data[0]), data[0]+'%')
-        icon_v = config.icon_vol_mute if vol == 0 else \
-                config.icon_vol_low if vol < 50 else config.icon_vol
         self.volume.items = [(icon_v, vols)]
 
     def nmtui(self):
@@ -269,32 +259,22 @@ ${exec ~/.i3/lemonbar/get_vol.sh} """
         common.kill_on_unfocus.append(p.pid)
 
 class ConkySlowModule(LemonModule):
-    if common.hostname() == 'kubaDesktop':
-        conky_config = conky_config() + """
-conky.text = [[
-${cpu} \
-${mem} \
-${fs_used_perc /} \
-${fs_used_perc /home} \
-F100 \
-100.00 \
-${exec /home/kuba/.i3/scripts/lang.sh show}
-]]
-    """
-    else:
-        conky_config = conky_config() + """
-conky.text = [[
-${cpu} \
-${mem} \
-${fs_used_perc /} \
-${fs_used_perc /home} \
-${exec ~/.i3/lemonbar/get_bat.sh} \
-${exec brillo} \
-${exec /home/kuba/.i3/scripts/lang.sh show}
-]]
-    """
 
     def __init__(self):
+        self.conky_config = (conky_config()
+                          + conky_begin_body
+                          + """\\
+${cpu} \\
+${mem} \\
+${fs_used_perc /} \\
+${fs_used_perc /home} """
+                          + ("""\\
+${exec ~/.i3/lemonbar/get_bat.sh} \\
+${exec brillo} """ if common.hostname() != 'kubaDesktop' else '')
+                          + """\\
+${exec /home/kuba/.i3/scripts/lang.sh show} \\
+${exec ~/.i3/lemonbar/get_vol.sh}"""
+                          + conky_end_body)
         super().__init__()
 
     def _start_module(self):
@@ -306,30 +286,40 @@ ${exec /home/kuba/.i3/scripts/lang.sh show}
 
         self.sys_load      = parser.IconTextUnit('sys_load', action='load', order=10)
         self.disk          = parser.IconTextUnit('disk', order=11)
-        self.brightness    = parser.IconTextUnit('brightness', action='adj_br', order=21
-                , external={'BRIGHT': self.parse_brightness})
-        self.battery       = parser.IconTextUnit('battery', action='dpms', order=22)
         self.language      = parser.IconTextUnit('language', action='lang', order=32
                 , external={'LANG': self.parse_language})
 
 
-        self.register_action('load'   , self.htop)
+        self.register_action('load', self.htop)
-        self.register_action('lang'   , self.lang_comm)
+        self.register_action('lang', self.lang_comm)
-        self.register_action('adj_br' , self.adj_br)
+
-        self.register_action('dpms'   , self.dpms_comm)
+        if common.hostname() != 'kubaDesktop':
+            self.brightness    = parser.IconTextUnit('brightness', action='adj_br', order=21
+                                                   , external={'BRIGHT': self.parse_brightness})
+            self.battery       = parser.IconTextUnit('battery', action='dpms', order=22)
+            self.register_action('adj_br' , self.adj_br)
+            self.register_action('dpms'   , self.dpms_comm)
+            self._parse_data = self._parse_data_w_batt
+        else:
+            self._parse_data = self._parse_data_wo_batt
 
     def _stop_module(self):
 
         if self.p_handle is not None:
             self.p_handle.terminate()
 
-    def _parse_data(self, data):
+    def _parse_data_w_batt(self, data):
         self.parse_sys_load   (data[0:2]) # System load
         self.parse_disk       (data[2:4]) # Disk usage
         self.parse_battery    (data[4:5]) # Battery
         self.parse_brightness (data[5:6]) # Screen brightness
         self.parse_language   (data[6:7]) # Language
 
+    def _parse_data_wo_batt(self, data):
+        self.parse_sys_load   (data[0:2]) # System load
+        self.parse_disk       (data[2:4]) # Disk usage
+        self.parse_language   (data[4:5]) # Language
+
     def parse_sys_load(self, data):
         if int(data[0]) > int(config.cpu_alert):
             self.sys_load.alt_scheme = parser.COLOR_SCHEME.CPU_ALERT