denis/rzr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enhance error handling

Browse source
This commit is contained in:
Denis Lehmann 2021-04-28 21:31:46 +02:00
parent ac363d83aa
commit d723394529
1 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
bin/rzr
View file

@ -30,8 +30,10 @@ def print_logo():
print(logo)
def error(msg):
def error(msg, e=True):
print("ERROR: {}".format(msg), file=sys.stderr)
if e:
exit(1)
def get_color_tuple(color_string):
@ -68,7 +70,6 @@ def apply_device_profile(device_profile):
)
if not device:
error("device '{}' not available".format(device_profile["name"]))
exit(1)
# Open lightmap
try:
@ -79,7 +80,8 @@ def apply_device_profile(device_profile):
error(
"the lightmap '{}' for device '{}' doesn't exist".format(
device_profile["lightmap"], device_profile["name"]
)
),
False,
)
list_lightmaps()
exit(1)
@ -89,7 +91,6 @@ def apply_device_profile(device_profile):
device_profile["lightmap"], device_profile["name"], e
)
)
exit(1)
# Set light colors
try:
@ -104,14 +105,12 @@ def apply_device_profile(device_profile):
light, device_profile["lightmap"], device_profile["name"]
)
)
exit(1)
except Exception as e:
error(
"failed to set light '{}' for device '{}': {}".format(
light, device_profile["name"], e
)
)
exit(1)
# Apply light colors
device.fx.advanced.draw()
@ -124,12 +123,11 @@ def apply_profile(name):
try:
profile = toml.load("{}/{}.toml".format(profile_directory, name))
except FileNotFoundError:
error("the profile '{}' doesn't exist".format(name))
error("the profile '{}' doesn't exist".format(name), False)
list_profiles()
exit(1)
except Exception as e:
error("couldn't load profile '{}': {}".format(name, e))
exit(1)
for device in profile:
apply_device_profile(profile[device])
@ -140,6 +138,8 @@ def iterate_lights():
global device_manager
try:
# Turn all lights off
for device in device_manager.devices:
device.fx.none()
@ -153,8 +153,6 @@ def iterate_lights():
print("{} will be iterated in {} seconds".format(device.name, i))
time.sleep(1)
try:
# Turn on one light every second
for i in range(device.fx.advanced.rows):
for j in range(device.fx.advanced.cols):
@ -165,7 +163,6 @@ def iterate_lights():
except Exception as e:
error("failed to iterate device '{}': {}".format(device.name, e))
exit(1)
def list_devices():
@ -236,7 +233,7 @@ if __name__ == "__main__":
try:
device_manager = DeviceManager()
except Exception as e:
error("failed to load device manager: {}".format(e))
error("failed to load device manager: {}".format(e), False)
print("Is the openrazer-daemon running?")
exit(1)
@ -246,14 +243,14 @@ if __name__ == "__main__":
profile_directory = args.profile_directory
if not os.path.exists(lightmap_directory):
error("lightmap directory '{}' doesn't exist".format(lightmap_directory))
error("lightmap directory '{}' doesn't exist".format(lightmap_directory), False)
create = input("Create the directory? [y/N] ")
if create in ["y", "Y"]:
Path(lightmap_directory).mkdir(parents=True, exist_ok=True)
else:
directories_available = False
if not os.path.exists(profile_directory):
error("profile directory '{}' doesn't exist".format(profile_directory))
error("profile directory '{}' doesn't exist".format(profile_directory), False)
create = input("Create the directory? [y/N] ")
if create in ["y", "Y"]:
Path(profile_directory).mkdir(parents=True, exist_ok=True)