refactor: add json logger

Author: NTFSvolume

src/bunkr_uploader/api/__init__.py

@@ -169,20 +169,20 @@ async def upload_chunk(self, file: File, server: URL, chunk: Chunk) -> None:
         if not result["success"]:
             raise ChunkUploadError(file, chunk)
 
-    def _create_chunk_dataform(self, file_info: File, chunk: Chunk) -> FormData:
+    def _create_chunk_dataform(self, file: File, chunk: Chunk) -> FormData:
         form = FormData()
         form.add_fields(
-            ("dzuuid", file_info.uuid),
+            ("dzuuid", file.uuid),
             ("dzchunkindex", str(chunk.index)),
-            ("dztotalfilesize", str(file_info.size)),
+            ("dztotalfilesize", str(file.size)),
             ("dzchunksize", str(self._chunk_size)),
             ("dztotalchunkcount", str(chunk.total)),
             ("dzchunkbyteoffset", str(chunk.offset)),
         )
         form.add_field(
             "files[]",
             chunk.data,
-            filename=file_info.upload_name,
+            filename=file.upload_name,
             content_type="application/octet-stream",
         )
         return form

src/bunkr_uploader/client.py

@@ -2,17 +2,19 @@
 
 import asyncio
 import dataclasses
+import datetime
 import logging
 from typing import TYPE_CHECKING, Any, Self
 
 import aiofiles
-from pydantic import ByteSize
+from pydantic import ByteSize, TypeAdapter
 
 from bunkr_uploader.api import BunkrrAPI
 from bunkr_uploader.api._exceptions import ChunkUploadError, FileUploadError
 from bunkr_uploader.api._files import Chunk, File
 from bunkr_uploader.api._responses import UploadResponse
 
+from .logger import json_logger
 from .progress import new_progress
 
 if TYPE_CHECKING:
@@ -23,13 +25,25 @@
 
     from bunkr_uploader.config import ConfigSettings
 
+
 logger = logging.getLogger(__name__)
 
 
+def _utc_now() -> datetime.datetime:
+    return datetime.datetime.now().astimezone(datetime.UTC)
+
+
 @dataclasses.dataclass(slots=True)
 class FileUploadResult:
     file: File
     result: UploadResponse
+    timestamp: datetime.datetime = dataclasses.field(init=False, default_factory=_utc_now)
+
+    def dumps(self) -> str:
+        return _file_upload_result_serializer(self, indent=2).decode()
+
+
+_file_upload_result_serializer = TypeAdapter(FileUploadResult).dump_json
 
 
 class BunkrrUploader:
@@ -71,7 +85,7 @@ def _prepare_files(self, files: Iterable[Path]) -> Generator[File]:
             else:
                 yield file
 
-    async def _upload_chunk(self, file: File, chunk: Chunk, server: URL) -> bool:
+    async def _upload_chunk(self, file: File, server: URL, chunk: Chunk) -> bool:
         """Upload a single chunk with retry mechanism."""
         for attempt in range(self.settings.chunk_retries):
             msg = f"uploading chunk {chunk.index} of file {file.original_name} (attempt {attempt + 1}/{self.settings.chunk_retries})"
@@ -113,7 +127,7 @@ async def _upload_file(self, file: File, server: URL) -> UploadResponse:
                     return await self._api.direct_upload(file, server)
 
                 async for chunk in self._chunked_read(file):
-                    await self._upload_chunk(file, chunk, server)
+                    await self._upload_chunk(file, server, chunk)
 
                 return await self._api.finish_chunks(file, server)
 
@@ -196,7 +210,9 @@ async def _upload(self, file: File, album_id: str | None) -> FileUploadResult:
         try:
             server = await self._get_server()
             response = await self._upload_file(file, server)
-            return FileUploadResult(file, response)
+            result = FileUploadResult(file, response)
+            json_logger.info(result)
+            return result
         finally:
             self._sem.release()
 

src/bunkr_uploader/logger.py

@@ -1,12 +1,18 @@
+from __future__ import annotations
+
 import logging
 
 # from datetime import datetime
 from pathlib import Path
+from typing import TYPE_CHECKING, cast
 
 from rich.console import Console
 from rich.logging import RichHandler
 from rich.theme import Theme
 
+if TYPE_CHECKING:
+    from bunkr_uploader.client import FileUploadResult
+
 _CONSOLE_THEME = Theme(
     {
         "logging.level.warning": "yellow",
@@ -45,3 +51,16 @@ def setup_logger(name: str) -> None:
         console=Console(file=log_file_path.open("a", encoding="utf8"), width=280),
     )
     logger.addHandler(file_handler)
+
+
+class JsonFormatter(logging.Formatter):
+    def format(self, record: logging.LogRecord) -> str:
+        result: FileUploadResult = cast("FileUploadResult", record.msg)
+        return result.dumps()
+
+
+json_logger = logging.getLogger("bunkr_output_json")
+json_file_handler = logging.FileHandler(Path("bunkr_upload.json"))
+json_file_handler.setFormatter(JsonFormatter())
+json_logger.addHandler(json_file_handler)
+json_logger.setLevel(10)