From 6d9303d26df0ad351387633832468fa20f42c434 Mon Sep 17 00:00:00 2001
From: real-yfprojects <real-yfprojects@users.noreply.github.com>
Date: Sat, 11 Mar 2023 20:15:00 +0100
Subject: [PATCH] Use `FlatpakGenerator.build_module_as_[yaml_]str` in `main`.

These methods implement formatting, so why duplicate that code. Fixes #45.

* req2flatpak.py (main)
---
 req2flatpak.py            | 16 +++++++++-------
 tests/test_req2flatpak.py |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/req2flatpak.py b/req2flatpak.py
index d3cf18e..ff6799b 100755
--- a/req2flatpak.py
+++ b/req2flatpak.py
@@ -808,14 +808,16 @@ def main():  # pylint: disable=too-many-branches
     }
 
     # generate flatpak-builder build module
-    build_module = FlatpakGenerator.build_module(requirements, downloads)
-
     if options.yaml:
-        yaml.dump(build_module, output_stream, default_flow_style=False)
-        parser.exit()
-
-    # write output
-    json.dump(build_module, output_stream, indent=4)
+        # write yaml
+        output_stream.write(
+            FlatpakGenerator.build_module_as_yaml_str(requirements, downloads)
+        )
+    else:
+        # write json
+        output_stream.write(
+            FlatpakGenerator.build_module_as_str(requirements, downloads)
+        )
 
 
 if __name__ == "__main__":
diff --git a/tests/test_req2flatpak.py b/tests/test_req2flatpak.py
index 0b15008..ead2a7f 100644
--- a/tests/test_req2flatpak.py
+++ b/tests/test_req2flatpak.py
@@ -91,7 +91,7 @@ def validate_build_module(self, build_module: dict) -> None:
     @contextmanager
     def requirements_file(
         self,
-    ) -> Generator[tempfile._TemporaryFileWrapper[str], None, None]:
+    ) -> Generator[tempfile._TemporaryFileWrapper, None, None]:
         """Create a temporary requirements file."""
         with tempfile.NamedTemporaryFile(mode="w+", encoding="utf-8") as req_file:
             req_file.write("\n".join(self.requirements))