mirror/vincentbernat.i3wm-configuration
1
0
Fork 0
mirror of https://github.com/vincentbernat/i3wm-configuration.git synced 2025-06-21 01:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

i3-companion: reblacken at 88 line-length

Browse source 
And tell flake8 that's OK.
This commit is contained in:
Vincent Bernat 2021-07-17 09:14:45 +02:00
parent de0b36587f
commit 8a78f68e77
2 changed files with 20 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.flake8 Normal file
View file

@ -0,0 +1,2 @@
[flake8]
max-line-length = 88

72
bin/i3-companion
View file

@ -148,9 +148,7 @@ def retry(max_retries):
retries = max_retries retries = max_retries
while True: while True:
try: try:
logger.debug( logger.debug("execute %s (remaining tries: %s)", fn, retries)
"execute %s (remaining tries: %s)", fn, retries
)
return await fn(*args, **kwargs) return await fn(*args, **kwargs)
except Exception as e: except Exception as e:
if retries > 0: if retries > 0:
@ -180,9 +178,7 @@ def debounce(sleep, *, unless=None):
while True: while True:
try: try:
# Wait for an urgent work or until sleep is elapsed # Wait for an urgent work or until sleep is elapsed
await asyncio.wait_for( await asyncio.wait_for(workers[fn].urgent.wait(), timeout=sleep)
workers[fn].urgent.wait(), timeout=sleep
)
logger.debug("urgent work received for %s", fn) logger.debug("urgent work received for %s", fn)
except asyncio.TimeoutError: except asyncio.TimeoutError:
pass pass
@ -236,9 +232,7 @@ async def notify(i3, **kwargs):
"""Send a notification with notify-send.""" """Send a notification with notify-send."""
conn = i3.session_bus["org.freedesktop.Notifications"] conn = i3.session_bus["org.freedesktop.Notifications"]
obj = conn["/org/freedesktop/Notifications"] obj = conn["/org/freedesktop/Notifications"]
notifications = await obj.get_async_interface( notifications = await obj.get_async_interface("org.freedesktop.Notifications")
"org.freedesktop.Notifications"
)
parameters = dict( parameters = dict(
app_name=logger.name, app_name=logger.name,
replaces_id=0, replaces_id=0,
@ -288,9 +282,7 @@ async def workspace_rename(i3, event):
continue continue
for k, v in application_icons.items(): for k, v in application_icons.items():
if re.match(rf"^{k}\b", name, re.IGNORECASE): if re.match(rf"^{k}\b", name, re.IGNORECASE):
logger.debug( logger.debug("in %s, found '%s', matching %s", attr, name, k)
"in %s, found '%s', matching %s", attr, name, k
)
return v return v
return application_icons_nomatch return application_icons_nomatch
@ -336,9 +328,7 @@ async def new_workspace(i3, event):
# Move the window to this workspace # Move the window to this workspace
if event == "move-to-new-workspace": if event == "move-to-new-workspace":
await current.command( await current.command(f"move container to workspace " f'number "{num}"')
f"move container to workspace " f'number "{num}"'
)
@on(I3Event.WINDOW_NEW) @on(I3Event.WINDOW_NEW)
@ -619,14 +609,10 @@ async def output_update(i3, event):
interface="org.freedesktop.DBus.Properties", interface="org.freedesktop.DBus.Properties",
member="PropertiesChanged", member="PropertiesChanged",
signature="sa{sv}as", signature="sa{sv}as",
onlyif=lambda args: ( onlyif=lambda args: args[0] == "org.bluez.Device1" and "Connected" in args[1],
args[0] == "org.bluez.Device1" and "Connected" in args[1]
),
) )
) )
async def bluetooth_notifications( async def bluetooth_notifications(i3, event, path, interface, changed, invalid):
i3, event, path, interface, changed, invalid
):
"""Display notifications related to Bluetooth state.""" """Display notifications related to Bluetooth state."""
obj = i3.system_bus["org.bluez"][path] obj = i3.system_bus["org.bluez"][path]
obd = await obj.get_async_interface(interface) obd = await obj.get_async_interface(interface)
@ -671,9 +657,7 @@ async def bluetooth_status(i3, event, *args):
# OK, get the info # OK, get the info
conn = i3.system_bus["org.bluez"] conn = i3.system_bus["org.bluez"]
om = await conn["/"].get_async_interface( om = await conn["/"].get_async_interface("org.freedesktop.DBus.ObjectManager")
"org.freedesktop.DBus.ObjectManager"
)
objects = await om.GetManagedObjects() objects = await om.GetManagedObjects()
objects = objects[0] objects = objects[0]
powered = False powered = False
@ -751,9 +735,7 @@ async def bluetooth_status(i3, event, *args):
interface="org.freedesktop.DBus.Properties", interface="org.freedesktop.DBus.Properties",
member="PropertiesChanged", member="PropertiesChanged",
signature="sa{sv}as", signature="sa{sv}as",
onlyif=lambda args: ( onlyif=lambda args: args[0] == "org.dunstproject.cmd0" and "paused" in args[1],
args[0] == "org.dunstproject.cmd0" and "paused" in args[1]
),
) )
) )
async def dunst_status_update(i3, event, path, interface, changed, invalid): async def dunst_status_update(i3, event, path, interface, changed, invalid):
@ -765,9 +747,7 @@ async def dunst_status_update(i3, event, path, interface, changed, invalid):
polybar( polybar(
"dunst", "dunst",
icons[ icons[
changed["paused"][1] changed["paused"][1] and "notifications-disabled" or "notifications-enabled"
and "notifications-disabled"
or "notifications-enabled"
], ],
) )
@ -809,9 +789,7 @@ async def network_manager_notifications(i3, event, path, state, reason):
kind = await nmca.Type kind = await nmca.Type
id = await nmca.Id id = await nmca.Id
if kind == "vpn": if kind == "vpn":
await notify( await notify(i3, app_icon="network-vpn", summary=f"{id}", body="VPN connected!")
i3, app_icon="network-vpn", summary=f"{id}", body="VPN connected!"
)
elif kind == "802-3-ethernet": elif kind == "802-3-ethernet":
await notify( await notify(
i3, i3,
@ -856,9 +834,7 @@ async def network_manager_status(i3, event, *args):
# Build status from devices # Build status from devices
conn = i3.system_bus[ofnm] conn = i3.system_bus[ofnm]
nm = await conn["/org/freedesktop/NetworkManager"].get_async_interface( nm = await conn["/org/freedesktop/NetworkManager"].get_async_interface(ofnm)
ofnm
)
devices = await nm.AllDevices devices = await nm.AllDevices
for device in devices: for device in devices:
nmd = await conn[device].get_async_interface(f"{ofnm}.Device") nmd = await conn[device].get_async_interface(f"{ofnm}.Device")
@ -870,9 +846,7 @@ async def network_manager_status(i3, event, *args):
if state != NM_DEVICE_STATE_ACTIVATED: if state != NM_DEVICE_STATE_ACTIVATED:
status.append(icons["nowifi"]) status.append(icons["nowifi"])
continue continue
nmw = await conn[device].get_async_interface( nmw = await conn[device].get_async_interface(f"{ofnm}.Device.Wireless")
f"{ofnm}.Device.Wireless"
)
ap = await nmw.ActiveAccessPoint ap = await nmw.ActiveAccessPoint
if not ap: if not ap:
status.append(icons["nowifi"]) status.append(icons["nowifi"])
@ -889,22 +863,15 @@ async def network_manager_status(i3, event, *args):
][strength // 34] ][strength // 34]
) )
status.append( status.append(
bytes(name) bytes(name).decode("utf-8", errors="replace").replace("%", "%%")
.decode("utf-8", errors="replace")
.replace("%", "%%")
) )
elif ( elif kind == NM_DEVICE_TYPE_ETHERNET and state == NM_DEVICE_STATE_ACTIVATED:
kind == NM_DEVICE_TYPE_ETHERNET
and state == NM_DEVICE_STATE_ACTIVATED
):
status.append(icons["wired"]) status.append(icons["wired"])
# Build status for VPN connection # Build status for VPN connection
connections = await nm.ActiveConnections connections = await nm.ActiveConnections
for connection in connections: for connection in connections:
nma = await conn[connection].get_async_interface( nma = await conn[connection].get_async_interface(f"{ofnm}.Connection.Active")
f"{ofnm}.Connection.Active"
)
vpn = await nma.Vpn vpn = await nma.Vpn
if vpn: if vpn:
state = await nma.State state = await nma.State
@ -981,13 +948,10 @@ async def main(options):
async def wrapped(path, args): async def wrapped(path, args):
if event.onlyif is not None and not event.onlyif(args): if event.onlyif is not None and not event.onlyif(args):
logger.debug( logger.debug(
"received DBus event for %s, not interested", "received DBus event for %s, not interested", fn
fn,
) )
return return
logger.debug( logger.debug("received DBus event %s for %s", event, fn)
"received DBus event %s for %s", event, fn
)
return await fn(i3, event, path, *args) return await fn(i3, event, path, *args)
return wrapped return wrapped