Răsfoiți Sursa

refactor: merge acpi-backlight-eval script into __init__.py & add setuptools entry point

Fabian Peter Hammerle 6 ani în urmă
părinte
comite
f2c19fb758
3 a modificat fișierele cu 26 adăugiri și 35 ștergeri
  1. 0 33
      acpi-backlight-eval
  2. 23 1
      acpi_backlight/__init__.py
  3. 3 1
      setup.py

+ 0 - 33
acpi-backlight-eval

@@ -1,33 +0,0 @@
-#!/usr/bin/env python3
-
-# pylint: disable=missing-docstring,invalid-name
-
-import acpi_backlight
-import acpi_backlight.evaluate
-
-
-def acpi_backlight_eval(expr_str):
-    backlight = acpi_backlight.Backlight()
-    backlight.brightness_relative = acpi_backlight.evaluate.evaluate_expression(
-        expr_str=expr_str,
-        names={'b': backlight.brightness_relative},
-    )
-    print(backlight.brightness_relative)
-
-
-def _init_argparser():
-    import argparse
-    argparser = argparse.ArgumentParser()
-    argparser.add_argument('expr_str')
-    return argparser
-
-
-def main(argv):
-    argparser = _init_argparser()
-    args = argparser.parse_args(argv[1:])
-    acpi_backlight_eval(**vars(args))
-    return 0
-
-if __name__ == "__main__":
-    import sys
-    sys.exit(main(sys.argv))

+ 23 - 1
acpi_backlight/__init__.py

@@ -1,7 +1,10 @@
 # pylint: disable=missing-docstring
 
+import argparse
 import os
 
+import acpi_backlight.evaluate
+
 _ACPI_BACKLIGHT_ROOT_DIR_PATH = '/sys/class/backlight'
 
 
@@ -40,4 +43,23 @@ class Backlight:
     @brightness_relative.setter
     def brightness_relative(self, brightness_relative):
         self._brightness_absolute = max(0, min(1, brightness_relative)) \
-                                    * self._max_brightness_absolute
+            * self._max_brightness_absolute
+
+
+def backlight_eval(expr_str):
+    backlight = acpi_backlight.Backlight()
+    backlight.brightness_relative = acpi_backlight.evaluate.evaluate_expression(
+        expr_str=expr_str,
+        names={'b': backlight.brightness_relative},
+    )
+    print(backlight.brightness_relative)
+
+
+def main():
+    argparser = argparse.ArgumentParser()
+    argparser.add_argument('expr_str')
+    args = argparser.parse_args()
+    backlight_eval(expr_str=args.expr_str)
+
+if __name__ == '__main__':
+    main()

+ 3 - 1
setup.py

@@ -9,7 +9,9 @@ setuptools.setup(
     author_email='fabian@hammerle.me',
     url='https://github.com/fphammerle/acpi-backlight',
     packages=['acpi_backlight'],
-    scripts=['acpi-backlight-eval'],
+    entry_points={'console_scripts': [
+        'acpi-backlight-eval=acpi_backlight:main',
+    ]},
     setup_requires=['setuptools_scm'],
     tests_require=['pytest'],
     classifiers=[