From 2b2d8e898046fbdc16a37585cd6b0375b565fc55 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 09:24:26 +1000 Subject: [PATCH] ratbagctl: get the special name list from the enum For two dicts x and y the merged dict can be created as {**x, **y}. We use that to take the enum names and covert them to lowercase with hyphens instead of underscores. Signed-off-by: Peter Hutterer --- tools/ratbagctl.in | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/tools/ratbagctl.in b/tools/ratbagctl.in index 1ad6feb1..9a3ee3ca 100755 --- a/tools/ratbagctl.in +++ b/tools/ratbagctl.in @@ -32,28 +32,9 @@ from ratbagd import Ratbagd, RatbagdDevice, RatbagdProfile, RatbagdMacro, Ratbag button_specials_strmap = { - RatbagdButton.ActionSpecial.UNKNOWN: "unknown", - RatbagdButton.ActionSpecial.DOUBLECLICK: "doubleclick", - RatbagdButton.ActionSpecial.WHEEL_LEFT: "wheel-left", - RatbagdButton.ActionSpecial.WHEEL_RIGHT: "wheel-right", - RatbagdButton.ActionSpecial.WHEEL_UP: "wheel-up", - RatbagdButton.ActionSpecial.WHEEL_DOWN: "wheel-down", - RatbagdButton.ActionSpecial.RATCHET_MODE_SWITCH: "ratchet-mode-switch", - RatbagdButton.ActionSpecial.RESOLUTION_CYCLE_UP: "resolution-cycle-up", - RatbagdButton.ActionSpecial.RESOLUTION_CYCLE_DOWN: "resolution-cycle-down", - RatbagdButton.ActionSpecial.RESOLUTION_UP: "resolution-up", - RatbagdButton.ActionSpecial.RESOLUTION_DOWN: "resolution-down", - RatbagdButton.ActionSpecial.RESOLUTION_ALTERNATE: "resolution-alternate", - RatbagdButton.ActionSpecial.RESOLUTION_DEFAULT: "resolution-default", - RatbagdButton.ActionSpecial.PROFILE_CYCLE_UP: "profile-cycle-up", - RatbagdButton.ActionSpecial.PROFILE_CYCLE_DOWN: "profile-cycle-down", - RatbagdButton.ActionSpecial.PROFILE_UP: "profile-up", - RatbagdButton.ActionSpecial.PROFILE_DOWN: "profile-down", - RatbagdButton.ActionSpecial.SECOND_MODE: "second-mode", - RatbagdButton.ActionSpecial.BATTERY_LEVEL: "battery-level", + **{e: e.name.lower().replace("_", "-") for e in RatbagdButton.ActionSpecial}, + **{e.name.lower().replace("_", "-"): e for e in RatbagdButton.ActionSpecial} } -for k, v in [(v, k) for k, v in button_specials_strmap.items()]: - button_specials_strmap[k] = v def list_devices(r, args):