From 1f14678997d9e2d1bad07186c46b15fa01c2dd11 Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Sun, 31 Jul 2022 13:26:24 +0200
Subject: [PATCH] refactor: started switch to new api endpoints & naming

---
 Makefile              |  2 +-
 aiovieter/__init__.py |  2 +-
 aiovieter/repos.py    |  8 --------
 aiovieter/targets.py  | 24 ++++++++++++++++++++++++
 aiovieter/vieter.py   | 34 +++++++++++++++++++++++++++++-----
 5 files changed, 55 insertions(+), 15 deletions(-)
 delete mode 100644 aiovieter/repos.py
 create mode 100644 aiovieter/targets.py

diff --git a/Makefile b/Makefile
index 8c267aa..565390d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,5 +18,5 @@ lint: venv
 	'$(VENV)/bin/flake8' '$(SRC_DIR)'
 
 .PHONY: format
-format: venv
+fmt: venv
 	'$(VENV)/bin/black' '$(SRC_DIR)'
diff --git a/aiovieter/__init__.py b/aiovieter/__init__.py
index ae6d905..4cc22d0 100644
--- a/aiovieter/__init__.py
+++ b/aiovieter/__init__.py
@@ -1,3 +1,3 @@
 from .vieter import Vieter
 
-__all__ = "Vieter"
+__all__ = ["Vieter"]
diff --git a/aiovieter/repos.py b/aiovieter/repos.py
deleted file mode 100644
index f1e813e..0000000
--- a/aiovieter/repos.py
+++ /dev/null
@@ -1,8 +0,0 @@
-class VieterRepos:
-    def __init__(self, vieter):
-        self._vieter = vieter
-
-    async def list(self, offset: int = 0, limit: int = 25):
-        params = {"offset": offset, "limit": limit}
-
-        return await self._vieter._get("/api/repos", params=params)
diff --git a/aiovieter/targets.py b/aiovieter/targets.py
new file mode 100644
index 0000000..8e53258
--- /dev/null
+++ b/aiovieter/targets.py
@@ -0,0 +1,24 @@
+class VieterTargets:
+    def __init__(self, vieter):
+        self._vieter = vieter
+
+    async def list(self, offset: int = 0, limit: int = 25, repo: str = None) -> dict:
+        params = {"offset": offset, "limit": limit, "repo": repo}
+
+        return await self._vieter._get("/targets", params=params)
+    
+    async def info(self, repo_id: int) -> dict:
+        return await self._vieter._get(f"/targets/{repo_id}")
+
+    async def create(self, url: str, branch: str, repo: str, schedule: str = None, arch: [str] = None):
+        params = {
+            'url': url,
+            'branch': branch,
+            'repo': repo,
+            'schedule': schedule,
+        }
+
+        if arch is not None:
+            params['arch'] = arch.join(',')
+
+        await self._vieter._post('/targets', params=params)
diff --git a/aiovieter/vieter.py b/aiovieter/vieter.py
index 38f73f4..cf9fd71 100644
--- a/aiovieter/vieter.py
+++ b/aiovieter/vieter.py
@@ -1,9 +1,16 @@
 import aiohttp
 
-from .repos import VieterRepos
+from .targets import VieterTargets
 from .logs import VieterBuildLogs
 
 
+API_PREFIX = '/api/v1'
+
+
+class VieterApiException(Exception):
+    pass
+
+
 class Vieter:
     def __init__(self, address: str, api_key: str) -> None:
         self._address = address
@@ -12,15 +19,32 @@ class Vieter:
             base_url=address, headers={"X-Api-Key": api_key}
         )
 
-        self.repos = VieterRepos(self)
+        self.targets = VieterTargets(self)
         self.logs = VieterBuildLogs(self)
 
     async def close(self):
         await self._client.close()
 
     async def _do_req(self, method: str, path: str, params: dict = None):
-        async with self._client.request(method, path, params=params) as res:
-            return await res.json()
+        if params is not None:
+            params = {k: v for k, v in params.items() if v is not None}
+
+        await self._client.request(method, f"{API_PREFIX}{path}", params=params)
+
+    async def _do_req_json(self, method: str, path: str, params: dict = None):
+        if params is not None:
+            params = {k: v for k, v in params.items() if v is not None}
+
+        async with self._client.request(method, f"{API_PREFIX}{path}", params=params) as res:
+            data = await res.json()
+
+            if res.status != 200:
+                raise VieterApiException(data["message"])
+
+            return data["data"]
 
     async def _get(self, *args, **kwargs):
-        return await self._do_req("GET", *args, **kwargs)
+        return await self._do_req_json("GET", *args, **kwargs)
+
+    async def _post(self, *args, **kwargs):
+        return await self._do_req("POST", *args, **kwargs)