From f3e66a1a6be7acfb159026fc95f71e1e6798a496 Mon Sep 17 00:00:00 2001 From: Brage Date: Mon, 17 Jul 2023 01:15:27 +0200 Subject: [PATCH] Updated python --- pyMetadata/app.py | 8 ++++---- pyMetadata/sources/anii.py | 10 +++++----- pyMetadata/sources/imdb.py | 8 ++++---- pyMetadata/sources/result.py | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pyMetadata/app.py b/pyMetadata/app.py index 787059a6..2f6cc871 100644 --- a/pyMetadata/app.py +++ b/pyMetadata/app.py @@ -4,7 +4,7 @@ import threading import json from kafka import KafkaConsumer, KafkaProducer from fuzzywuzzy import fuzz -from sources.result import Result, Metadata +from sources.result import DataResult, Metadata from sources.anii import metadata as AniiMetadata from sources.imdb import metadata as ImdbMetadata @@ -103,7 +103,7 @@ class MessageHandlerThread(threading.Thread): producer.send(kafka_topic, key="event:metadata:obtained", value=result_json) producer.close() - def perform_action(self, title) -> Result: + def perform_action(self, title) -> DataResult: anii = AniiMetadata(title) imdb = ImdbMetadata(title) @@ -132,13 +132,13 @@ class MessageHandlerThread(threading.Thread): else: # Begge registrene feilet, håndter etter eget behov - most_likely_result = Result(statusType="ERROR", errorMessage="No Result") + most_likely_result = DataResult(statusType="ERROR", errorMessage="No Result") # Returner det mest sannsynlige resultatet return most_likely_result - def compose_message(self, referenceId: str, result: Result) -> ProducerDataValueSchema: + def compose_message(self, referenceId: str, result: DataResult) -> ProducerDataValueSchema: """""" return ProducerDataValueSchema( referenceId=referenceId, diff --git a/pyMetadata/sources/anii.py b/pyMetadata/sources/anii.py index 5832bffe..2f07b0d7 100644 --- a/pyMetadata/sources/anii.py +++ b/pyMetadata/sources/anii.py @@ -1,5 +1,5 @@ from AnilistPython import Anilist -from result import Metadata, Result +from result import Metadata, DataResult class metadata(): name: str = None @@ -8,7 +8,7 @@ class metadata(): def __init__(self, name) -> None: self.name = name - def lookup(self) -> Result: + def lookup(self) -> DataResult: """""" try: result = self.anilist.get_anime(self.name) @@ -24,10 +24,10 @@ class metadata(): else: meta.type = 'serie' meta.genres = result.get('genres', []) - return Result("SUCCESS", None, meta) + return DataResult("SUCCESS", None, meta) except IndexError as ingore: - return Result(statusType="IGNORE", errorMessage=f"No result for {self.name}") + return DataResult(statusType="IGNORE", errorMessage=f"No result for {self.name}") except Exception as e: - return Result(statusType="ERROR", errorMessage=str(e)) + return DataResult(statusType="ERROR", errorMessage=str(e)) \ No newline at end of file diff --git a/pyMetadata/sources/imdb.py b/pyMetadata/sources/imdb.py index 7ea77095..3b975dbd 100644 --- a/pyMetadata/sources/imdb.py +++ b/pyMetadata/sources/imdb.py @@ -1,5 +1,5 @@ import imdb -from result import Metadata, Result +from result import Metadata, DataResult class metadata(): name: str = None @@ -9,7 +9,7 @@ class metadata(): self.name = name - def lookup(self) -> Result: + def lookup(self) -> DataResult: """""" try: query = self.imdb.search_movie(self.name) @@ -29,6 +29,6 @@ class metadata(): meta.genres = result.get('genres', []) - return Result("SUCCESS", None, meta) + return DataResult("SUCCESS", None, meta) except Exception as e: - return Result(statusType="ERROR", errorMessage=str(e)) \ No newline at end of file + return DataResult(statusType="ERROR", errorMessage=str(e)) \ No newline at end of file diff --git a/pyMetadata/sources/result.py b/pyMetadata/sources/result.py index b244c6bb..5db78c7d 100644 --- a/pyMetadata/sources/result.py +++ b/pyMetadata/sources/result.py @@ -11,7 +11,7 @@ class Metadata: genres: List[str] @dataclass -class Result: +class DataResult: statusType: str errorMessage: str data: Metadata