Fix matcher/scanner issues

scanner/matcher/matcher.py

@@ -34,7 +34,7 @@ class Matcher:
 
 	async def identify(self, path: str):
 		try:
-			await self.identify(path)
+			await self._identify(path)
 			await self._client.delete_issue(path)
 		except ProviderError as e:
 			logger.error(e)

scanner/matcher/subscriber.py

@@ -1,3 +1,4 @@
+import asyncio
 from dataclasses import dataclass
 from dataclasses_json import DataClassJsonMixin
 from typing import Literal
@@ -34,22 +35,23 @@ class Subscriber:
 
 	async def listen(self, scanner: Matcher):
 		async def on_message(message: AbstractIncomingMessage):
-			async with message.process():
+			msg = Message.from_json(message.body)
-				msg = Message.from_json(message.body)
+			ack = False
-				ack = False
+			match msg.action:
-				match msg.action:
+				case "scan":
-					case "scan":
+					ack = await scanner.identify(msg.path)
-						ack = await scanner.identify(msg.path)
+				case "delete":
-					case "delete":
+					ack = await scanner.delete(msg.path)
-						ack = await scanner.delete(msg.path)
+				case _:
-					case _:
+					logger.error(f"Invalid action: {msg.action}")
-						logger.error(f"Invalid action: {msg.action}")
+			if ack:
-				if ack:
+				await message.ack()
-					await message.ack()
+			else:
-				else:
+				await message.reject()
-					await message.nack(requeue=False)
 
 		# Allow up to 20 scan requests to run in parallel on the same listener.
 		# Since most work is calling API not doing that is a waste.
 		await self._channel.set_qos(prefetch_count=20)
 		await self._queue.consume(on_message)
+		await asyncio.Future()
+

scanner/providers/implementations/themoviedatabase.py

@@ -26,7 +26,7 @@ logger = getLogger(__name__)
 class TheMovieDatabase(Provider):
 	def __init__(
 		self,
-		languages,
+		languages: list[str],
 		client: ClientSession,
 		api_key: str,
 		xem: TheXem,

scanner/providers/provider.py

@@ -20,6 +20,7 @@ class Provider:
 		if not languages:
 			print("Missing environment variable 'LIBRARY_LANGUAGES'.")
 			exit(2)
+		languages = languages.split(",")
 		providers = []
 
 		from providers.idmapper import IdMapper

scanner/scanner/__main__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 import asyncio
-import matcher
+import scanner
 
-asyncio.run(matcher.main())
+asyncio.run(scanner.main())