Fix bug + restructure (#26)

* new structure and tests

* fix lint

* additional test

* Fix up

* Fix up

* Fix up

Author: inverse

.dockerignore

@@ -4,3 +4,4 @@
 # Except
 !/entrypoint.py
 !/requirements.txt
+!/edge_addon/

.github/workflows/main.yml

@@ -17,5 +17,17 @@ jobs:
       with:
         python-version: '3.13'
     - name: Install pip dependencies
-      run: pip install -r requirements.txt
+      run: pip install -r requirements-dev.txt
     - uses: pre-commit/action@v3.0.1
+
+  test:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@master
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+    - name: Install pip dependencies
+      run: pip install -r requirements-dev.txt
+    - name: Run tests
+      run: python -m pytest -v

.gitignore

@@ -1,2 +1,3 @@
 /.venv/
 /.mypy_cache/
+__pycache__/

README.md

@@ -8,7 +8,7 @@ Built using the [Edge Addons API](https://github.com/web-scrobbler/python-edge-a
 
 ```yaml
 steps:
-  - uses: web-scrobbler/edge-addon@v2.0.3
+  - uses: web-scrobbler/edge-addon@v2.0.4
     with:
       product_id: ${{ secrets.EDGE_PRODUCT_ID }}
       client_id: ${{ secrets.EDGE_CLIENT_ID }}

edge_addon/__init__.py

@@ -0,0 +1,57 @@
+import sys
+from dataclasses import dataclass
+
+from edge_addons_api.client import Options as EdgeOptions
+
+
+@dataclass
+class Options:
+    product_id: str
+    client_id: str
+    api_key: str
+    file_path: str
+    notes: str
+    debug: bool
+    retry_count: int
+    sleep_seconds: int
+
+    def to_edge_options(self) -> EdgeOptions:
+        return EdgeOptions(
+            product_id=self.product_id,
+            client_id=self.client_id,
+            api_key=self.api_key,
+            retry_count=self.retry_count,
+            sleep_seconds=self.sleep_seconds,
+        )
+
+
+def create_options() -> Options:
+    """
+    create Options object from system arguments.
+
+    Returns:
+        Options object containing all configuration
+    """
+    if len(sys.argv) < 9:
+        print("Incorrect number of arguments given. Please check action parameters")
+        sys.exit(1)
+
+    product_id = sys.argv[1]
+    client_id = sys.argv[2]
+    api_key = sys.argv[3]
+    file_path = sys.argv[4]
+    notes = sys.argv[5]
+    debug = sys.argv[6].lower() in ["true", "1"]
+    retry_count = int(sys.argv[7])
+    sleep_seconds = int(sys.argv[8])
+
+    return Options(
+        product_id=product_id,
+        client_id=client_id,
+        api_key=api_key,
+        file_path=file_path,
+        notes=notes,
+        debug=debug,
+        retry_count=retry_count,
+        sleep_seconds=sleep_seconds,
+    )

edge_addon/config.py

@@ -0,0 +1,13 @@
+import logging
+import sys
+
+
+def setup_logging(debug: bool) -> None:
+    """Setup logging configuration."""
+    logger = logging.getLogger()
+    handler = logging.StreamHandler(sys.stdout)
+    logger.addHandler(handler)
+
+    if debug:
+        logger.setLevel(logging.DEBUG)
+        logging.getLogger("urllib3").setLevel(logging.WARNING)

edge_addon/logging_utils.py

@@ -1,47 +1,22 @@
 #!/usr/bin/env python
 
-import logging
 import sys
 
-from edge_addons_api.client import Client, Options
+from edge_addons_api.client import Client
 from edge_addons_api.exceptions import UploadException
 
-if len(sys.argv) < 6:
-    print("Incorrect number of arguments given. Please check action parameters")
-    sys.exit(1)
-
-product_id = sys.argv[1]
-client_id = sys.argv[2]
-api_key = sys.argv[3]
-file_path = sys.argv[5]
-notes = sys.argv[6]
-debug = sys.argv[7].lower() in ["true", "1"]
-retry_count = int(sys.argv[8])
-sleep_seconds = int(sys.argv[9])
-
-logger = logging.getLogger()
-handler = logging.StreamHandler(sys.stdout)
-logger.addHandler(handler)
-
-if debug:
-    logger.setLevel(logging.DEBUG)
-    logging.getLogger("urllib3").setLevel(logging.WARNING)
-
+from edge_addon.config import create_options
+from edge_addon.logging_utils import setup_logging
 
-options = Options(
-    product_id=product_id,
-    client_id=client_id,
-    api_key=api_key,
-    retry_count=retry_count,
-    sleep_seconds=sleep_seconds,
-)
+options = create_options()
+setup_logging(options.debug)
 
-client = Client(options)
+client = Client(options.to_edge_options())
 
 print("Submitting addon")
 
 try:
-    operation_id = client.submit(file_path=file_path, notes=notes)
+    operation_id = client.submit(file_path=options.file_path, notes=options.notes)
     client.fetch_publish_status(operation_id)
 
     print("Successfully uploaded addon")

entrypoint.py

@@ -0,0 +1,2 @@
+-r requirements.txt
+pytest==7.4.0