warp-beacon 2.2.20__tar.gz → 2.2.22__tar.gz

{warp_beacon-2.2.20/warp_beacon.egg-info → warp_beacon-2.2.22}/PKG-INFO

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

warp_beacon-2.2.22/warp_beacon/__version__.py

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

{warp_beacon-2.2.20 → warp_beacon-2.2.22}/warp_beacon/scheduler/scheduler.py

@@ -1,5 +1,6 @@
 import os
 import time
+from random import randrange
 import threading
 import json
 
@@ -14,7 +15,7 @@ class IGScheduler(object):
 	running = True
 	thread = None
 	event = None
-	state = {"remaining": 3600}
+	state = {"remaining": randrange(3600, 10800)}
 
 	def __init__(self, downloader: warp_beacon.scraper.AsyncDownloader) -> None:
 		self.downloader = downloader
@@ -81,7 +82,8 @@ class IGScheduler(object):
 		while self.running:
 			try:
 				if self.state["remaining"] <= 0:
-					self.state["remaining"] = 3600
+					self.state["remaining"] = randrange(3600, 10800)
+					logging.info("Next scheduler activity in '%s' seconds", self.state["remaining"])
 
 				start_time = time.time()
 				self.event.wait(timeout=self.state["remaining"])

{warp_beacon-2.2.20 → warp_beacon-2.2.22}/warp_beacon/scraper/__init__.py

@@ -28,21 +28,21 @@ class AsyncDownloader(object):
 	uploader = None
 	workers_count = 0
 	auth_event = multiprocessing.Event()
+	manager = None
 	acc_selector = None
 	scheduler = None
 
 	def __init__(self, uploader: AsyncUploader, workers_count: int) -> None:
-		self.allow_loop = multiprocessing.Value('i', 1)
+		self.manager = multiprocessing.Manager()
+		self.allow_loop = self.manager.Value('i', 1)
+		self.acc_selector = AccountSelector(self.manager, ACC_FILE)
 		self.uploader = uploader
 		self.workers_count = workers_count
-		AccountSelector.register('AccoutSelector', AccountSelector)
 
 	def __del__(self) -> None:
 		self.stop_all()
 
 	def start(self) -> None:
-		self.acc_selector = AccountSelector(ACC_FILE)
-		self.acc_selector.start()
 		for _ in range(self.workers_count):
 			proc = multiprocessing.Process(target=self.do_work, args=(self.acc_selector,))
 			self.workers.append(proc)
@@ -74,7 +74,7 @@ class AsyncDownloader(object):
 		if job.account_switches > self.acc_selector.count_service_accounts(job.job_origin):
 			raise AllAccountsFailed("All config accounts failed!")
 		if report_error:
-			selector.bump_acc_fail("rate_limits")
+			selector.bump_acc_fail(report_error)
 		selector.next()
 		cur_acc = selector.get_current()
 		logging.info("Current account: '%s'", str(cur_acc))
@@ -339,7 +339,7 @@ class AsyncDownloader(object):
 				#proc.terminate()
 				logging.info("process #%d stopped", proc.pid)
 		self.workers.clear()
-		self.acc_selector.shutdown()
+		self.manager.shutdown()
 
 	def queue_task(self, job: DownloadJob) -> str:
 		self.job_queue.put_nowait(job)

{warp_beacon-2.2.20 → warp_beacon-2.2.22}/warp_beacon/scraper/account_selector.py

@@ -1,25 +1,29 @@
+import multiprocessing.managers
 import os
 import json
 import re
 
+import multiprocessing
 from itertools import cycle
 
-from multiprocessing.managers import BaseManager
-
 from warp_beacon.jobs import Origin
 
 import logging
 
-class AccountSelector(BaseManager):
+class AccountSelector(object):
 	accounts = []
 	acc_pool = None
 	current = None
 	current_module_name = None
-	index = 0
-	accounts_meta_data = {}
+	index = None
+	accounts_meta_data = None
 	session_dir = "/var/warp_beacon"
+	manager = None
 
-	def __init__(self, acc_file_path: str) -> None:
+	def __init__(self, manager: multiprocessing.managers.SyncManager, acc_file_path: str) -> None:
+		self.manager = manager
+		self.index = self.manager.Value('i', 0)
+		self.accounts_meta_data = self.manager.dict()
 		if os.path.exists(acc_file_path):
 			with open(acc_file_path, 'r', encoding="utf-8") as f:
 				self.accounts = json.loads(f.read())
@@ -28,8 +32,6 @@ class AccountSelector(BaseManager):
 				self.load_yt_sessions()
 		else:
 			raise ValueError("Accounts file not found")
-		
-		super().__init__()
 
 	def __del__(self) -> None:
 		pass
@@ -61,26 +63,26 @@ class AccountSelector(BaseManager):
 		self.current_module_name = module_name
 		self.acc_pool = cycle(self.accounts[module_name])
 		self.current = next(self.acc_pool)
-		self.index = self.accounts[module_name].index(self.current)
+		self.index.value = self.accounts[module_name].index(self.current)
 
 	def next(self) -> dict:
 		self.current = next(self.acc_pool)
-		self.index = self.accounts[self.current_module_name].index(self.current)
-		logging.info("Next account index is '%d'", self.index)
+		self.index.value = self.accounts[self.current_module_name].index(self.current)
+		logging.info("Next account index is '%d'", self.index.value)
 		return self.current
 	
 	def bump_acc_fail(self, key: str, amount: int = 1) -> int:
-		self.accounts_meta_data[self.index][key] += amount
-		return self.accounts_meta_data[self.index][key]
+		self.accounts_meta_data[self.index.value][key] += amount
+		return self.accounts_meta_data[self.index.value][key]
 
 	def how_much(self, key: str) -> int:
-		return self.accounts_meta_data[self.current_module_name][self.index][key]
+		return self.accounts_meta_data[self.current_module_name][self.index.value][key]
 	
 	def get_current(self) -> tuple:
-		return (self.index, self.current)
+		return (self.index.value, self.current)
 	
 	def get_meta_data(self) -> dict:
-		return self.accounts_meta_data[self.current_module_name][self.index]
+		return self.accounts_meta_data[self.current_module_name][self.index.value]
 	
 	def count_service_accounts(self, mod_name: Origin) -> int:
 		module_name = 'youtube' if next((s for s in ("yt", "youtube", "youtu_be") if s in mod_name.value), None) else 'instagram'

{warp_beacon-2.2.20 → warp_beacon-2.2.22}/warp_beacon/scraper/youtube/abstract.py

@@ -119,7 +119,7 @@ class YoutubeAbstract(ScraperAbstract):
 
 		if aspect_ratio_height > 4:
 			image = image.resize((image.size[0], image.size[1]+new_image.size[1]))
-			height += new_image.size[1] - 20
+			height += new_image.size[1] - 10
 
 		paste_position = ((target_width - width) // 2, (target_height - height) // 2)
 		new_image.paste(image, paste_position)

{warp_beacon-2.2.20 → warp_beacon-2.2.22/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.20/warp_beacon/__version__.py

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