merge network colour and network

This commit is contained in:
limbe-osc 2016-08-06 07:01:52 +08:00
parent b7a73f5b46
commit 4882714382
4 changed files with 64 additions and 510 deletions

View File

@ -53,7 +53,7 @@ class DeaDBeeF(IntervalModule):
format_stopped = "STOPPED"
interval = 1
status = {
'paused': "",
'paused': '',
'playing': '',
'stopped': '',
}
@ -94,8 +94,7 @@ class DeaDBeeF(IntervalModule):
def run(self):
try:
parts = self.get_info()
artist, title, album, length, elapsed,\
bitrate, codec, isplaying, ispaused = parts
artist, title, album, length, elapsed, bitrate, codec, isplaying, ispaused = parts
db_status = 'stopped'
if isplaying == '1' and ispaused == '':

View File

@ -1,13 +1,13 @@
import netifaces
from i3pystatus import IntervalModule
from i3pystatus import IntervalModule, formatp
from i3pystatus.core.color import ColorRangeModule
from i3pystatus.core.util import make_graph, round_dict, make_bar
def count_bits(integer):
bits = 0
while (integer):
while integer:
integer &= integer - 1
bits += 1
return bits
@ -67,7 +67,7 @@ def sysfs_interface_up(interface, unknown_up=False):
return status == "up" or unknown_up and status == "unknown"
class NetworkInfo():
class NetworkInfo:
"""
Retrieve network information.
"""
@ -161,7 +161,7 @@ class NetworkInfo():
return info
class NetworkTraffic():
class NetworkTraffic:
"""
Retrieve network traffic information
"""
@ -232,6 +232,15 @@ class Network(IntervalModule, ColorRangeModule):
"""
Displays network information for an interface.
formatp support
if u wanna display recv/send speed separate in dynamic color mode, please enable pango hint.
status.register(
"network",
hints={"markup": "pango"},
)
Requires the PyPI packages `colour`, `netifaces`, `psutil` (optional, see below)
and `basiciw` (optional, see below).
@ -255,10 +264,10 @@ class Network(IntervalModule, ColorRangeModule):
* `{quality}` Link quality in percent
* `{quality_bar}` Bar graphically representing link quality
Network Traffic Formatters (requires PyPI pacakge `psutil`):
Network Traffic Formatters (requires PyPI package `psutil`):
* `{interface}` the configured network interface
* `{kbs}` Float representing kb\s
* `{kbs}` Float representing KiB\s corresponds to graph type
* `{network_graph}` Unicode graph representing network usage
* `{bytes_sent}` bytes sent per second (divided by divisor)
* `{bytes_recv}` bytes received per second (divided by divisor)
@ -278,8 +287,10 @@ class Network(IntervalModule, ColorRangeModule):
("end_color", "Hex or English name for end of color range, eg '#FF0000' or 'red'"),
("graph_width", "Width of the network traffic graph"),
("graph_style", "Graph style ('blocks', 'braille-fill', 'braille-peak', or 'braille-snake')"),
("upper_limit",
"Expected max kb/s. This value controls how the network traffic graph is drawn and in what color"),
("recv_limit", "Expected max KiB/s. This value controls the drawing color of receive speed"),
("sent_limit", "Expected max KiB/s. similar with receive_limit"),
("separate_color", "display recv/send color separate in dynamic color mode."
"Note: only network speed formatters will display with range color "),
("graph_type", "Whether to draw the network traffic graph for input or output. "
"Allowed values 'input' or 'output'"),
("divisor", "divide all byte values by this value"),
@ -301,7 +312,9 @@ class Network(IntervalModule, ColorRangeModule):
graph_type = 'input'
graph_width = 15
graph_style = 'blocks'
upper_limit = 150.0
recv_limit = 2048
sent_limit = 1024
separate_color = False
# Network traffic settings
divisor = 1024
@ -319,7 +332,7 @@ class Network(IntervalModule, ColorRangeModule):
def init(self):
# Don't require importing basiciw unless using the functionality it offers.
if any(s in self.format_up or s in self.format_up for s in
if any(s in self.format_down or s in self.format_up for s in
['essid', 'freq', 'quality', 'quality_bar']):
get_wifi_info = True
else:
@ -337,9 +350,10 @@ class Network(IntervalModule, ColorRangeModule):
self.network_traffic = None
if not self.dynamic_color:
self.end_color = self.start_color
self.colors = self.get_hex_color_range(self.start_color, self.end_color, int(self.upper_limit))
self.end_color = self.start_color = self.color_up
self.colors = self.get_hex_color_range(self.start_color, self.end_color, 100)
self.kbs_arr = [0.0] * self.graph_width
self.pango_enabled = self.hints.get("markup", False) and self.hints["markup"] == "pango"
def cycle_interface(self, increment=1):
"""Cycle through available interfaces in `increment` steps. Sign indicates direction."""
@ -354,11 +368,11 @@ class Network(IntervalModule, ColorRangeModule):
self.network_traffic.clear_counters()
self.kbs_arr = [0.0] * self.graph_width
def get_network_graph(self, kbs):
def get_network_graph(self, kbs, limit):
# Cycle array by inserting at the start and chopping off the last element
self.kbs_arr.insert(0, kbs)
self.kbs_arr = self.kbs_arr[:self.graph_width]
return make_graph(self.kbs_arr, 0.0, self.upper_limit, self.graph_style)
return make_graph(self.kbs_arr, 0.0, limit, self.graph_style)
def run(self):
format_values = dict(kbs="", network_graph="", bytes_sent="", bytes_recv="", packets_sent="", packets_recv="",
@ -369,15 +383,38 @@ class Network(IntervalModule, ColorRangeModule):
network_usage = self.network_traffic.get_usage(self.interface)
format_values.update(network_usage)
if self.graph_type == 'input':
kbs = network_usage['bytes_recv']
limit = self.recv_limit
kbs = network_usage['bytes_recv'] * self.divisor / 1024
elif self.graph_type == 'output':
kbs = network_usage['bytes_sent']
limit = self.sent_limit
kbs = network_usage['bytes_sent'] * self.divisor / 1024
else:
raise Exception("graph_type must be either 'input' or 'output'!")
format_values['network_graph'] = self.get_network_graph(kbs)
format_values['kbs'] = "{0:.1f}".format(round(kbs, 2)).rjust(6)
color = self.get_gradient(kbs, self.colors, self.upper_limit)
format_values['network_graph'] = self.get_network_graph(kbs, limit)
format_values['kbs'] = "{0:.1f}".format(round(kbs, 2))
if self.separate_color and self.pango_enabled:
color = self.color_up
per_recv = network_usage["bytes_recv"] * self.divisor / (self.recv_limit * 1024)
per_sent = network_usage["bytes_sent"] * self.divisor / (self.sent_limit * 1024)
c_recv = self.get_gradient(int(per_recv * 100), self.colors, 100)
c_sent = self.get_gradient(int(per_sent * 100), self.colors, 100)
format_values["bytes_recv"] = "<span color=\"" + c_recv + "\">" + \
str(network_usage["bytes_recv"]) + "</span>"
format_values["bytes_sent"] = "<span color=\"" + c_sent + "\">" + \
str(network_usage["bytes_sent"]) + "</span>"
if self.graph_type == 'output':
c_kbs = c_sent
else:
c_kbs = c_recv
format_values['network_graph'] = "<span color=\"" + c_kbs + "\">" + \
str(format_values["network_graph"]) + "</span>"
format_values['kbs'] = "<span color=\"" + c_kbs + "\">" + \
str(format_values["kbs"]) + "</span>"
else:
percent = int(kbs * 100 / limit)
color = self.get_gradient(percent, self.colors, 100)
else:
color = None
@ -395,6 +432,6 @@ class Network(IntervalModule, ColorRangeModule):
self.data = format_values
self.output = {
"full_text": format_str.format(**format_values),
"full_text": formatp(format_str, **format_values).strip(),
'color': color,
}

View File

@ -1,482 +0,0 @@
import netifaces
from i3pystatus import IntervalModule, formatp
from i3pystatus.core.color import ColorRangeModule
from i3pystatus.core.util import round_dict
def count_bits(integer):
bits = 0
while integer:
integer &= integer - 1
bits += 1
return bits
def v6_to_int(v6):
return int(v6.replace(":", ""), 16)
def prefix6(mask):
return count_bits(v6_to_int(mask))
def cidr6(addr, mask):
return "{addr}/{bits}".format(addr=addr, bits=prefix6(mask))
def v4_to_int(v4):
sum = 0
mul = 1
for part in reversed(v4.split(".")):
sum += int(part) * mul
mul *= 2 ** 8
return sum
def prefix4(mask):
return count_bits(v4_to_int(mask))
def cidr4(addr, mask):
return "{addr}/{bits}".format(addr=addr, bits=prefix4(mask))
def get_bonded_slaves():
try:
with open("/sys/class/net/bonding_masters") as f:
masters = f.read().split()
except FileNotFoundError:
return {}
slaves = {}
for master in masters:
with open("/sys/class/net/{}/bonding/slaves".format(master)) as f:
for slave in f.read().split():
slaves[slave] = master
return slaves
def sysfs_interface_up(interface, unknown_up=False):
try:
with open("/sys/class/net/{}/operstate".format(interface)) as f:
status = f.read().strip()
except FileNotFoundError:
# Interface doesn't exist
return False
return status == "up" or unknown_up and status == "unknown"
class NetworkInfo:
"""
Retrieve network information.
"""
def __init__(self, interface, ignore_interfaces, detached_down, unknown_up, get_wifi_info=False):
if interface not in netifaces.interfaces() and not detached_down:
raise RuntimeError(
"Unknown interface {iface}!".format(iface=interface))
self.ignore_interfaces = ignore_interfaces
self.detached_down = detached_down
self.unknown_up = unknown_up
self.get_wifi_info = get_wifi_info
def get_info(self, interface):
format_dict = dict(v4="", v4mask="", v4cidr="", v6="", v6mask="", v6cidr="")
iface_up = sysfs_interface_up(interface, self.unknown_up)
if not iface_up:
return format_dict
network_info = netifaces.ifaddresses(interface)
slaves = get_bonded_slaves()
try:
master = slaves[interface]
except KeyError:
pass
else:
if sysfs_interface_up(interface, self.unknown_up):
master_info = netifaces.ifaddresses(master)
for af in (netifaces.AF_INET, netifaces.AF_INET6):
try:
network_info[af] = master_info[af]
except KeyError:
pass
try:
mac = network_info[netifaces.AF_PACKET][0]["addr"]
except KeyError:
mac = "NONE"
format_dict['mac'] = mac
if iface_up:
format_dict.update(self.extract_network_info(network_info))
format_dict.update(self.extract_wireless_info(interface))
return format_dict
@staticmethod
def extract_network_info(network_info):
info = dict()
if netifaces.AF_INET in network_info:
v4 = network_info[netifaces.AF_INET][0]
info["v4"] = v4["addr"]
info["v4mask"] = v4["netmask"]
info["v4cidr"] = cidr4(v4["addr"], v4["netmask"])
if netifaces.AF_INET6 in network_info:
for v6 in network_info[netifaces.AF_INET6]:
info["v6"] = v6["addr"]
info["v6mask"] = v6["netmask"]
info["v6cidr"] = cidr6(v6["addr"], v6["netmask"])
if not v6["addr"].startswith("fe80::"): # prefer non link-local addresses
break
return info
def extract_wireless_info(self, interface):
info = dict(essid="", freq="", quality=0.0, quality_bar="")
# Just return empty values if we're not using any Wifi functionality
if not self.get_wifi_info:
return info
import basiciw
try:
iwi = basiciw.iwinfo(interface)
except Exception:
# Not a wireless interface
return info
info["essid"] = iwi["essid"]
info["freq"] = iwi["freq"]
quality = iwi["quality"]
if quality["quality_max"] > 0:
info["quality"] = quality["quality"] / quality["quality_max"]
else:
info["quality"] = quality["quality"]
info["quality"] *= 100
info["quality"] = round(info["quality"])
return info
class NetworkTraffic:
"""
Retrieve network traffic information
"""
pnic = None
pnic_before = None
def __init__(self, unknown_up, divisor, round_size):
self.unknown_up = unknown_up
self.divisor = divisor
self.round_size = round_size
def update_counters(self, interface):
import psutil
self.pnic_before = self.pnic
counters = psutil.net_io_counters(pernic=True)
self.pnic = counters[interface] if interface in counters else None
def clear_counters(self):
self.pnic_before = None
self.pnic = None
def get_bytes_sent(self):
return (self.pnic.bytes_sent - self.pnic_before.bytes_sent) / self.divisor
def get_bytes_received(self):
return (self.pnic.bytes_recv - self.pnic_before.bytes_recv) / self.divisor
def get_packets_sent(self):
return self.pnic.packets_sent - self.pnic_before.packets_sent
def get_packets_received(self):
return self.pnic.packets_recv - self.pnic_before.packets_recv
def get_rx_tot_Mbytes(self, interface):
try:
with open("/sys/class/net/{}/statistics/rx_bytes".format(interface)) as f:
return int(f.readline().split('\n')[0]) / (1024 * 1024)
except FileNotFoundError:
return False
def get_tx_tot_Mbytes(self, interface):
try:
with open("/sys/class/net/{}/statistics/tx_bytes".format(interface)) as f:
return int(f.readline().split('\n')[0]) / (1024 * 1024)
except FileNotFoundError:
return False
def get_usage(self, interface):
self.update_counters(interface)
usage = dict(bytes_sent=0, bytes_recv=0, packets_sent=0, packets_recv=0)
if not sysfs_interface_up(interface, self.unknown_up) or not self.pnic_before:
return usage
else:
usage["bytes_sent"] = self.get_bytes_sent()
usage["bytes_recv"] = self.get_bytes_received()
usage["packets_sent"] = self.get_packets_sent()
usage["packets_recv"] = self.get_packets_received()
usage["rx_tot_Mbytes"] = self.get_rx_tot_Mbytes(interface)
usage["tx_tot_Mbytes"] = self.get_tx_tot_Mbytes(interface)
round_dict(usage, self.round_size)
return usage
class NetworkColour(IntervalModule, ColorRangeModule):
"""
Displays network information for an interface.
no graph support
formatp enabled
mode1: single and static color text, dynamic_color and pango disabled.
mode2: mutilple and static color text, dynamic_color disabled and pango enabled.
'color_info', 'color_recv' and 'color_sent' are vaild.
mode3: single and dynamic color text, dynamic_color enabled and pango disabled.
'recv_limit' and 'sent_limit' are vaild. default limit is 20Mbps download bandwidth.
mode4: mutilple and static color text, dynamic_color and pango enabled.
works with '{bytes_sent}' and '{bytes_recv}'. 'color_info', 'recv_limit' and 'sent_limit'
are vaild. '{bytes_sent}' and '{bytes_recv}' will show their color separate.
Requires the PyPI packages `colour`, `netifaces`, `psutil` (optional, see below)
and `basiciw` (optional, see below).
if u wanna display mutilple colors please enable pango markup and set color.
.. rubric:: Available formatters
Network Information Formatters:
* `{interface}` same as setting
* `{v4}` IPv4 address
* `{v4mask}` subnet mask
* `{v4cidr}` IPv4 address in cidr notation (i.e. 192.168.2.204/24)
* `{v6}` IPv6 address
* `{v6mask}` subnet mask
* `{v6cidr}` IPv6 address in cidr notation
* `{mac}` MAC of interface
Wireless Information Formatters (requires PyPI package `basiciw`):
* `{essid}` ESSID of currently connected wifi
* `{freq}` Current frequency
* `{quality}` Link quality in percent
Network Traffic Formatters (requires PyPI pacakge `psutil`):
* `{interface}` the configured network interface
* `{bytes_sent}` bytes sent per second (divided by divisor)
* `{bytes_recv}` bytes received per second (divided by divisor)
* `{packets_sent}` bytes sent per second (divided by divisor)
* `{packets_recv}` bytes received per second (divided by divisor)
* `{rx_tot_Mbytes}` total Mbytes received
* `{tx_tot_Mbytes}` total Mbytes sent
"""
settings = (
("format_up", "format string"),
("format_down", "format string when interface is down"),
("interface", "Interface to watch, eg 'eth0'"),
("color_down", "text color when interface is down"),
("color_info", "color of network information"),
("color_normal", "text color"),
("color_recv", "color of receive speed, effect when pango is enabled"),
("color_sent", "color of sent speed, effect when pango is enabled"),
("dynamic_color", "Set color dynamically based on network traffic."),
("start_color", "Hex or English name for start of color range, eg '#00FF00' or 'green'"),
("end_color", "Hex or English name for end of color range, eg '#FF0000' or 'red'"),
("recv_limit", "Expected max KiB/s. This value controls the drawing color of receive speed"),
("sent_limit", "Expected max KiB/s. similiar with receive_limit"),
("divisor", "divide all byte values by this value"),
("ignore_interfaces", "Array of interfaces to ignore when cycling through "
"on click, eg, ['lo']"),
("round_size", "defines number of digits in round"),
("detached_down", "If the interface doesn't exist, display it as if it were down"),
("unknown_up", "If the interface is in unknown state, display it as if it were up"),
)
interval = 1
interface = 'eth0'
format_up = "{interface} {bytes_recv}KB/s"
format_down = "{interface}: DOWN"
color_normal = "#00FF00"
color_down = "#FF0000"
color_info = None
color_recv = None
color_sent = None
# Dynamic color settings
dynamic_color = True
recv_limit = None
sent_limit = None
# Network traffic settings
divisor = 1024
round_size = None
# Network info settings
detached_down = True
unknown_up = False
ignore_interfaces = ["lo"]
on_leftclick = "nm-connection-editor"
on_rightclick = "cycle_interface"
on_upscroll = ['cycle_interface', 1]
on_downscroll = ['cycle_interface', -1]
# categories
net_info_list = ["interface", "v4", "v4mask", "v4cidr", "v6", \
"v6mask", "v6cidr", "mac", "essid", "freq", "quality"]
net_recv_list = ["bytes_recv", "packets_recv", "rx_tot_Mbytes"]
net_sent_list = ["bytes_sent", "packets_sent", "tx_tot_Mbytes"]
def init(self):
# Don't require importing basiciw unless using the functionality it offers.
if any(s in self.format_up or s in self.format_down for s in
['essid', 'freq', 'quality']):
get_wifi_info = True
else:
get_wifi_info = False
self.network_info = NetworkInfo(self.interface, self.ignore_interfaces, \
self.detached_down, self.unknown_up, get_wifi_info)
# Don't require importing psutil unless using the functionality it offers.
if any(s in self.format_up or s in self.format_down for s in
['bytes_sent', 'bytes_recv', 'packets_sent', 'packets_recv',
'rx_tot_Mbytes', 'tx_tot_Mbytes',]):
self.network_traffic = NetworkTraffic(self.unknown_up, self.divisor, self.round_size)
else:
self.network_traffic = None
self.colors = self.get_hex_color_range(self.start_color, self.end_color, 100)
def cycle_interface(self, increment=1):
"""
Cycle through available interfaces in `increment` steps. Sign indicates direction.
"""
interfaces = [i for i in netifaces.interfaces() if i not in self.ignore_interfaces]
if self.interface in interfaces:
next_index = (interfaces.index(self.interface) + increment) % len(interfaces)
self.interface = interfaces[next_index]
elif len(interfaces) > 0:
self.interface = interfaces[0]
if self.network_traffic:
self.network_traffic.clear_counters()
def get_status_code(self):
status_code = ""
if self.dynamic_color:
status_code += "1"
else:
status_code += "0"
if self.hints.get("markup", False) and self.hints["markup"] == "pango":
status_code += "1"
else:
status_code += "0"
return status_code
def markup_text(self, values):
if self.color_info:
for va in self.net_info_list:
if values[va]:
values[va] = "<span color=\"" + self.color_info + "\">" \
+ values[va] + "</span>"
if self.color_recv:
for va in self.net_recv_list:
if values[va] or values[va] == 0:
values[va] = "<span color=\"" + self.color_recv + "\">" \
+ str(values[va]) + "</span>"
if self.color_sent:
for va in self.net_sent_list:
if values[va] or values[va] == 0:
values[va] = "<span color=\"" + self.color_sent + "\">" \
+ str(values[va]) + "</span>"
def dynamic_mode(self, values):
"""
works with `{bytes_sent}`, `{bytes_recv}`
"""
if self.recv_limit and self.sent_limit:
per_recv = values["bytes_recv"] * self.divisor / (self.recv_limit * 1024)
per_sent = values["bytes_sent"] * self.divisor / (self.sent_limit * 1024)
return int(max(per_recv, per_sent) * 100)
elif self.recv_limit:
per_recv = values["bytes_recv"] * self.divisor / (self.recv_limit * 1024)
return int(per_recv * 100)
elif self.sent_limit:
per_sent = values["bytes_sent"] * self.divisor / (self.sent_limit * 1024)
return int(per_sent * 100)
else:
# default 20Mbps bandwidth
per_recv = values["bytes_recv"] * self.divisor / (2560 * 1024)
return int(per_recv * 100)
def mix_dynamic_mode(self, values):
if self.color_info:
for va in self.net_info_list:
if values[va]:
values[va] = "<span color=\"" + self.color_info + "\">" \
+ values[va] + "</span>"
if self.recv_limit and self.sent_limit:
per_recv = values["bytes_recv"] * self.divisor / (self.recv_limit * 1024)
per_sent = values["bytes_sent"] * self.divisor / (self.sent_limit * 1024)
c_recv = self.get_gradient(int(per_recv * 100), self.colors, 100)
c_sent = self.get_gradient(int(per_sent * 100), self.colors, 100)
values["bytes_recv"] = "<span color=\"" + c_recv + "\">" + str(values["bytes_recv"]) + "</span>"
values["bytes_sent"] = "<span color=\"" + c_sent + "\">" + str(values["bytes_sent"]) + "</span>"
else:
raise Exception("LIMIT NOT SET CORRECTLY")
def run(self):
format_values = dict(bytes_sent="", bytes_recv="", packets_sent="", packets_recv="",
rx_tot_Mbytes="", tx_tot_Mbytes="",
interface="", v4="", v4mask="", v4cidr="", v6="", v6mask="", v6cidr="", mac="",
essid="", freq="", quality="")
color = None
if self.network_traffic:
network_usage = self.network_traffic.get_usage(self.interface)
format_values.update(network_usage)
if sysfs_interface_up(self.interface, self.unknown_up):
format_str = self.format_up
else:
color = self.color_down
format_str = self.format_down
network_info = self.network_info.get_info(self.interface)
format_values.update(network_info)
format_values['interface'] = self.interface
# color
if not color:
code = self.get_status_code()
if code == "01":
# markup text
color = self.color_normal
self.markup_text(format_values)
elif code == "10" and self.network_traffic:
# normal dynamic mode
percent = self.dynamic_mode(format_values)
color = self.get_gradient(percent, self.colors, 100)
elif code == "11" and self.network_traffic:
# mix dynamic mode
color = self.color_normal
self.mix_dynamic_mode(format_values)
else:
color = self.color_normal
self.data = format_values
self.output = {
"full_text": formatp(format_str, **format_values).strip(),
'color': color,
}

View File

@ -40,8 +40,8 @@ class WindowTitle(Module):
def init(self):
self.title = self.empty_title
self.output = {
"full_text": self.title,
"color": self.color,
"full_text": self.title,
"color": self.color,
}
# we are listening to i3 events in a separate thread
@ -57,9 +57,9 @@ class WindowTitle(Module):
# don't show window title when the window already has means
# to display it
if not self.always_show and (
w.border == "normal" or
w.type == "workspace" or
(p.layout in ("stacked", "tabbed") and len(p.nodes) > 1)):
w.border == "normal" or
w.type == "workspace"
or (p.layout in ("stacked", "tabbed") and len(p.nodes) > 1)):
return self.empty_title
else:
title = w.name