diff --git a/kontor-scripts/add_links.py b/kontor-scripts/add_links.py index c827d74..c889411 100644 --- a/kontor-scripts/add_links.py +++ b/kontor-scripts/add_links.py @@ -11,7 +11,8 @@ from bs4 import BeautifulSoup import requests from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter from pathlib import Path -from api import Server, get_api_config, get_logger +from api import Server, get_api_config +from log import get_logger from db.models.media import MediaActor, MediaActorFile, MediaFile parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter) @@ -182,7 +183,7 @@ if __name__ == "__main__": media_actor_file.last_modified_date = datetime.now() media_actor_file.version = 0 media_actor_file.media_file_id = media_file.id - media_actor_file.media_actor_id = media_actor["id"] + media_actor_file.media_actor_id = media_actor.id logger.info("create mapping with %s", media_actor_file) if not args.dry_run: logger.info("add MediaFile Actor mapping %s", media_actor_file) diff --git a/kontor-scripts/read_queue.py b/kontor-scripts/read_queue.py index bc29f0d..ebfb740 100644 --- a/kontor-scripts/read_queue.py +++ b/kontor-scripts/read_queue.py @@ -1,15 +1,9 @@ -import logging - import stomp -import logging.config import time -import yaml import msgspec import sys -from pathlib import Path from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter -from typing import Any, Dict, List, Optional -from platformdirs import PlatformDirs +from typing import Optional from api import Server, get_api_config from log import get_logger @@ -17,7 +11,8 @@ from log import get_logger 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("--server", "-s", default="127.0.0.1") +parser.add_argument("--server", "-s") +parser.add_argument("--messages", "-m", default="127.0.0.1") parser.add_argument("--port", "-p", default="61616") args = parser.parse_args() @@ -65,7 +60,7 @@ if __name__ == '__main__': if not first_server: sys.exit(2) data = first_server.request(log=logger, table="media_file") - host = [(args.server, args.port)] + host = [(args.messages, args.port)] conn_add = stomp.Connection(host_and_ports=host) conn_add.set_listener('', AddLinkListener(logger, conn_add)) conn_add.connect(username='artemis', passcode='artemis', wait=True) diff --git a/kontor-scripts/sync.py b/kontor-scripts/sync.py index 8e2c1dd..0b91e86 100644 --- a/kontor-scripts/sync.py +++ b/kontor-scripts/sync.py @@ -11,9 +11,9 @@ from api import ( MAPPING, EndPointNotAvailableException, Server, - get_api_config, - get_logger, + get_api_config ) +from log import get_logger parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter) parser.add_argument("--verbose", "-v", action="count", default=0)