fix pactl fallback for pamixer

controldeck.py

@@ -19,13 +19,15 @@ def process(args):
     print(f"{e} failed!")
 
 def volume(name):
-  try:
-    return process(f'pamixer --get-volume --sink "{name}"')
-  except OSError as e:
-    #n = process(r"pactl list sinks short | awk '{print $2}'").split()
-    #v = process(r"pactl list sinks | grep '^[[:space:]]Volume:' | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,'").split()
-    #return v[n.index(name)]
-    print(e)
+  result = process(f'pamixer --get-volume --sink "{name}"')
+  if search("pamixer: command not found", result) is not None:
+    n = process(r"pactl list sinks short | awk '{print $2}'").split()
+    v = process(r"pactl list sinks | grep '^[[:space:]]Volume:' | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,'").split()
+    if name in n:
+      result = v[n.index(name)]
+    else:
+      result = '--'
+  return result
 
 def volume_decrease(name):
   #process(f'pactl set-sink-volume "{name}" -5db')

setup.cfg

@@ -0,0 +1,12 @@
+[metadata]
+name = ControlDeck
+
+[options]
+install_requires =
+  justpy
+py_modules =
+  controldeck
+
+[options.entry_points]
+console_scripts =
+  controldeck = controldeck:main

setup.py

@@ -1,8 +1,2 @@
 from setuptools import setup
-
-setup(
-    name='ControlDeck',
-    py_modules=['controldeck'],
-    entry_points={
-    'console_scripts': ['controldeck = controldeck:main', ],},
-)
+setup()