add missing endpoints

kontor-scripts/api.py

@@ -28,24 +28,30 @@ MAPPING: Dict[str, str] = {
     "story_arc": "api/comics/storyarcs",
     "issue": "api/comics/issues",
     "issue_work": "api/comics/issueworks",
-    "article": "",
-    "bookshelf_publisher": "",
-    "book": "",
-    "author": "",
-    "article_author": "",
-    "book_author": "",
-    "media_article": "",
+    "article": "api/bookshelf/articles",
+    "bookshelf_publisher": "api/bookshelf/publishers",
+    "book": "api/bookshelf/books",
+    "author": "api/bookshelf/authors",
+    "article_author": "api/bookshelf/articleauthors",
+    "book_author": "api/bookshelf/bookauthors",
+    "media_article": "api/media/articles",
     "media_video": "api/media/videos",
     "media_file": "api/media/files",
     "media_actor": "api/media/actors",
     "media_actor_file": "api/media/actorfiles",
-    "profile": "",
-    "permission": "",
-    "assignment": "",
-    "token": "",
-    "mail_account": "",
+    "profile": "api/user/profiles",
+    "permission": "api/user/permissions",
+    "assignment": "api/user/assignments",
+    "token": "api/user/tokens",
+    "mail_account": "api/admin/mailaccount",
 }
 
+class EndPointNotAvailableException(Exception):
+    """
+    Raised when calling an not existing endpoint.
+    """
+    
+    pass
 
 @dataclass
 class Login:
@@ -99,7 +105,9 @@ class Server:
             url: str = f"{self.url}/{MAPPING[table]}?{param}"
         headers: Dict[str, str] = {"Authorization": f"Bearer {self.token}"}
         response = requests.get(url, headers=headers, timeout=self.timeout)
-        log.info(f"Status: {response.status_code}")
+        log.debug(f"Status: {response.status_code}")
+        if response.status_code==404:
+            raise EndPointNotAvailableException
         data = response.json()
         return data
 
@@ -121,6 +129,16 @@ class ApiConfig:
 
     login: Login
     server: List[Server]
+    
+    def get_server(self, server_name: str) -> Optional[Server]:
+        """
+        """
+        found_server = None
+        for server in self.server:
+            if server.name == server_name:
+                found_server = server
+        return found_server
+        
 
 
 def get_logger(level, config: str):

kontor-scripts/db/models/bookshelf.py

@@ -1,4 +1,4 @@
-from typing import Any, AnyStr, Dict
+from typing import Any, Dict
 from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
 

kontor-scripts/sync.py

@@ -1,12 +1,13 @@
 from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
-from dataclasses import dataclass
-from api import get_logger, get_api_config
+from typing import List
+from api import MAPPING, EndPointNotAvailableException, Server, get_logger, get_api_config
 
 
 parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter)
 parser.add_argument("--verbose", "-v", action="count", default=0)
 parser.add_argument("--config", "-c", default="kontor-api")
 parser.add_argument("--dry-run", "-m", action="store_true")
+parser.add_argument("--server", "-s")
 parser.add_argument("--cleanup", "-d", action="store_true")
 args = parser.parse_args()
 
@@ -15,7 +16,20 @@ if __name__== "__main__":
     logger = get_logger(args.verbose, "kontor")
     logger.info("kontor.sync started")
     apiConfig = get_api_config(logger, args.config)
-    for server in apiConfig.server:
-        data = server.request(logger, "media_file")
-        logger.info(len(data))
+    server_list: List[Server] = []
+    if args.server:
+        server = apiConfig.get_server(args.server)
+        if server:
+            server_list.append(server)
+    else:
+        server_list.extend(apiConfig.server)
+    for server in server_list:
+        for table, path in MAPPING.items():
+            try:
+                data = server.request(logger, table=table)
+                logger.info("%s: %s", table, len(data))
+                if len(data) == 1:
+                    logger.info("show data: %s", data)
+            except EndPointNotAvailableException:
+                logger.info("Endpoint not implemented")
     logger.info("kontor.sync finished")