From 7964c223c181f5bc7bb2c60757c23bcfa7a26021 Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Thu, 27 Apr 2023 23:48:36 +0200 Subject: [PATCH] Refactor main to callable function Preparation for `pyproject.toml` entry-point --- scripts/boxes | 33 ++++++++++++++------------------- scripts/boxes2inkscape | 7 ++++++- scripts/boxes2pot | 7 ++++++- scripts/boxes_proxy.py | 6 +++++- scripts/boxesserver | 6 +++++- 5 files changed, 36 insertions(+), 23 deletions(-) diff --git a/scripts/boxes b/scripts/boxes index 700d5a7..01ecff2 100755 --- a/scripts/boxes +++ b/scripts/boxes @@ -28,25 +28,6 @@ except ImportError: import boxes.generators -# __version__ = get_distribution('boxes').version - - -def main(): - # version = 'boxes.py v{}'.format(__version__) - - if len(sys.argv) > 1 and sys.argv[1].startswith("--id="): - del sys.argv[1] - if len(sys.argv) == 1: - print_usage() - elif sys.argv[1] == '--list': - list_grouped_generators() - else: - name = sys.argv[1].lower() - if name.startswith("--generator="): - name = name[12:] - run_generator(name, sys.argv[2:]) - - def print_usage(): print(__doc__) @@ -113,5 +94,19 @@ def generators_by_name(): } +def main() -> None: + if len(sys.argv) > 1 and sys.argv[1].startswith("--id="): + del sys.argv[1] + if len(sys.argv) == 1: + print_usage() + elif sys.argv[1] == '--list': + list_grouped_generators() + else: + name = sys.argv[1].lower() + if name.startswith("--generator="): + name = name[12:] + run_generator(name, sys.argv[2:]) + + if __name__ == '__main__': main() diff --git a/scripts/boxes2inkscape b/scripts/boxes2inkscape index badf529..72b1fa7 100755 --- a/scripts/boxes2inkscape +++ b/scripts/boxes2inkscape @@ -147,8 +147,13 @@ class Boxes2INX: self.writeINX(name, box, path) -if __name__ == "__main__": +def main() -> None: if len(sys.argv) != 2: print("Usage: boxes2inkscape TARGETPATH") + return b = Boxes2INX() b.writeAllINX(sys.argv[1]) + + +if __name__ == "__main__": + main() diff --git a/scripts/boxes2pot b/scripts/boxes2pot index 35e3a92..d9d5a53 100755 --- a/scripts/boxes2pot +++ b/scripts/boxes2pot @@ -138,9 +138,14 @@ msgstr "" f.write('msgstr ""\n') -if __name__ == "__main__": +def main() -> None: if len(sys.argv) != 2: print("Usage: boxes2pot TARGETPATH") + return b = Boxes2pot() b.readBoxes() b.writePOT(sys.argv[1]) + + +if __name__ == "__main__": + main() diff --git a/scripts/boxes_proxy.py b/scripts/boxes_proxy.py index 695d11d..71b4f6c 100644 --- a/scripts/boxes_proxy.py +++ b/scripts/boxes_proxy.py @@ -74,5 +74,9 @@ class boxesPyWrapper(inkex.GenerateExtension): return group -if __name__ == '__main__': +def main() -> None: boxesPyWrapper().run() + + +if __name__ == '__main__': + main() diff --git a/scripts/boxesserver b/scripts/boxesserver index e5368bf..2140263 100755 --- a/scripts/boxesserver +++ b/scripts/boxesserver @@ -683,7 +683,7 @@ def get_qrcode(url, format): return image_bytes.getvalue() -if __name__ == "__main__": +def main() -> None: parser = argparse.ArgumentParser() parser.add_argument("--host", default="") @@ -707,6 +707,10 @@ if __name__ == "__main__": fc.stop() httpd.server_close() print("BoxesServer stops.") + + +if __name__ == "__main__": + main() else: boxserver = BServer(url_prefix='/boxes.py', static_url="https://florianfesti.github.io/boxes/static") application = boxserver.serve