warp-beacon 2.2.63__tar.gz → 2.2.64__tar.gz

{warp_beacon-2.2.63/warp_beacon.egg-info → warp_beacon-2.2.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: warp_beacon
-Version: 2.2.63
+Version: 2.2.64
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

{warp_beacon-2.2.63 → warp_beacon-2.2.64}/setup.py

@@ -82,7 +82,8 @@ setup(
 		"warp_beacon/scraper/youtube/youtube",
 		"warp_beacon/scraper/youtube/shorts",
 		"warp_beacon/scraper/youtube/music",
-		"warp_beacon/scraper/fail_handler"
+		"warp_beacon/scraper/fail_handler",
+		"warp_beacon/storage/mongo"
 	],
 	#scripts=['scripts/wait_dc_update.py'],
 	data_files=[

warp_beacon-2.2.64/warp_beacon/__version__.py

@@ -0,0 +1,2 @@
+__version__ = "2.2.64"
+

{warp_beacon-2.2.63 → warp_beacon-2.2.64}/warp_beacon/scraper/__init__.py

@@ -16,6 +16,7 @@ from warp_beacon.jobs.download_job import DownloadJob
 from warp_beacon.jobs.upload_job import UploadJob
 from warp_beacon.jobs.types import JobType
 from warp_beacon.scraper.account_selector import AccountSelector
+from warp_beacon.storage.mongo import DBClient
 from warp_beacon.scraper.fail_handler import FailHandler
 
 import logging
@@ -33,9 +34,10 @@ class AsyncDownloader(object):
 	manager = None
 	acc_selector = None
 	scheduler = None
-	fail_handler = FailHandler()
+	fail_handler = None
 
-	def __init__(self, uploader: AsyncUploader, workers_count: int) -> None:
+	def __init__(self, uploader: AsyncUploader, db_connect: DBClient, workers_count: int) -> None:
+		self.fail_handler = FailHandler(db_connect)
 		self.manager = multiprocessing.Manager()
 		self.allow_loop = self.manager.Value('i', 1)
 		self.acc_selector = AccountSelector(self.manager, ACC_FILE)

{warp_beacon-2.2.63 → warp_beacon-2.2.64}/warp_beacon/scraper/fail_handler.py

@@ -1,8 +1,8 @@
 import os
 
 import pickle
-from pymongo import MongoClient
 
+from warp_beacon.storage.mongo import DBClient
 from warp_beacon.jobs.download_job import DownloadJob
 
 import logging
@@ -10,17 +10,11 @@ import logging
 class FailHandler(object):
 	client = None
 	db = None
-	def __init__(self) -> None:
-		self.client = MongoClient(
-			host=os.environ.get("MONGODB_HOST", default='127.0.0.1'), 
-			port=int(os.environ.get("MONGODB_PORT", default=27017)),
-			username=os.environ.get("MONGODB_USER", default='root'),
-			password=os.environ.get("MONGODB_PASSWORD", default="changeme"))
-		self.db = self.client.media.failed_jobs
+	def __init__(self, client: DBClient) -> None:
+		self.db = client.client.media.failed_jobs
 
 	def __del__(self) -> None:
-		if self.client:
-			self.client.close()
+		self.client.close()
 
 	def store_failed_job(self, job: DownloadJob) -> int:
 		db_id = -1

{warp_beacon-2.2.63 → warp_beacon-2.2.64}/warp_beacon/storage/__init__.py

@@ -4,7 +4,7 @@ from enum import Enum
 
 from urllib.parse import urlparse, parse_qs
 
-from pymongo import MongoClient
+from warp_beacon.storage.mongo import DBClient
 
 import logging
 
@@ -19,20 +19,14 @@ VIDEO_STORAGE_DIR = os.environ.get("VIDEO_STORAGE_DIR", default="/var/warp_beaco
 class Storage(object):
 	client = None
 	db = None
-	def __init__(self) -> None:
+	def __init__(self, client: DBClient) -> None:
 		if not os.path.isdir(VIDEO_STORAGE_DIR):
 			os.mkdir(VIDEO_STORAGE_DIR)
-
-		self.client = MongoClient(
-			host=os.environ.get("MONGODB_HOST", default='127.0.0.1'), 
-			port=int(os.environ.get("MONGODB_PORT", default=27017)),
-			username=os.environ.get("MONGODB_USER", default='root'),
-			password=os.environ.get("MONGODB_PASSWORD", default="changeme"))
-		self.db = self.client.media.media
+		self.client = client
+		self.db = self.client.client.media.media
 
 	def __del__(self) -> None:
-		if self.client:
-			self.client.close()
+		self.client.close()
 
 	@staticmethod
 	def compute_uniq(url: str) -> str:

warp_beacon-2.2.64/warp_beacon/storage/mongo.py

@@ -0,0 +1,22 @@
+import os
+
+from pymongo import MongoClient
+
+class DBClient(object):
+	client = None
+
+	def __init__(self) -> None:
+		self.client = MongoClient(
+			host=os.environ.get("MONGODB_HOST", default='127.0.0.1'), 
+			port=int(os.environ.get("MONGODB_PORT", default=27017)),
+			username=os.environ.get("MONGODB_USER", default='root'),
+			password=os.environ.get("MONGODB_PASSWORD", default="changeme")
+		)
+
+	def __del__(self) -> None:
+		self.close()
+
+	def close(self) -> None:
+		if self.client:
+			self.client.close()
+			self.client = None

{warp_beacon-2.2.63 → warp_beacon-2.2.64}/warp_beacon/telegram/bot.py

@@ -15,6 +15,7 @@ import warp_beacon
 from warp_beacon.__version__ import __version__
 from warp_beacon.telegram.handlers import Handlers
 from warp_beacon.telegram.placeholder_message import PlaceholderMessage
+from warp_beacon.storage.mongo import DBClient
 from warp_beacon.storage import Storage
 from warp_beacon.uploader import AsyncUploader
 from warp_beacon.jobs.upload_job import UploadJob
@@ -25,7 +26,7 @@ from warp_beacon.scheduler.scheduler import IGScheduler
 import logging
 
 class Bot(object):
-	storage = Storage()
+	storage = None
 	uploader = None
 	downloader = None
 	allow_loop = True
@@ -40,6 +41,9 @@ class Bot(object):
 			format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO
 		)
 
+		db_connect = DBClient()
+		self.storage = Storage(db_connect)
+
 		logging.info("Starting Warp Beacon version '%s' ...", __version__)
 
 		workers_amount = min(32, os.cpu_count() + 4)
@@ -71,7 +75,8 @@ class Bot(object):
 		)
 		self.downloader = warp_beacon.scraper.AsyncDownloader(
 			workers_count=int(os.environ.get("WORKERS_POOL_SIZE", default=workers_amount)),
-			uploader=self.uploader
+			uploader=self.uploader,
+			db_connect=db_connect
 		)
 
 		self.scheduler = IGScheduler(self.downloader)

{warp_beacon-2.2.63 → warp_beacon-2.2.64/warp_beacon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: warp_beacon
-Version: 2.2.63
+Version: 2.2.64
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

{warp_beacon-2.2.63 → warp_beacon-2.2.64}/warp_beacon.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ warp_beacon/scraper/youtube/music.py
 warp_beacon/scraper/youtube/shorts.py
 warp_beacon/scraper/youtube/youtube.py
 warp_beacon/storage/__init__.py
+warp_beacon/storage/mongo.py
 warp_beacon/telegram/__init__.py
 warp_beacon/telegram/bot.py
 warp_beacon/telegram/handlers.py

{warp_beacon-2.2.63 → warp_beacon-2.2.64}/warp_beacon.egg-info/top_level.txt

@@ -27,6 +27,7 @@ warp_beacon/scraper/youtube/music
 warp_beacon/scraper/youtube/shorts
 warp_beacon/scraper/youtube/youtube
 warp_beacon/storage
+warp_beacon/storage/mongo
 warp_beacon/telegram
 warp_beacon/telegram/bot
 warp_beacon/telegram/handlers

warp_beacon-2.2.63/warp_beacon/__version__.py

@@ -1,2 +0,0 @@
-__version__ = "2.2.63"
-