warp-beacon 2.3.29__py3-none-any.whl → 2.3.31__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.29"
+__version__ = "2.3.31"
 

warp_beacon/scheduler/scheduler.py

@@ -85,8 +85,8 @@ class IGScheduler(object):
 				now = datetime.datetime.now()
 				if 4 <= now.hour < 7:
 					logging.info("Scheduler is paused due to night hours (4:00 - 7:00)")
-					self.event.wait(timeout=10800)
-					continue
+					self.state["remaining"] = 10800
+					self.save_state()
 
 				if self.state["remaining"] <= 0:
 					self.state["remaining"] = randrange(8400, 26200)

warp_beacon/telegram/bot.py

@@ -170,6 +170,9 @@ class Bot(object):
 			if is_group and not is_youtube and CaptionShortner.need_short(job.canonical_name):
 				caption = f"{html.escape(CaptionShortner.smart_truncate_html(job.canonical_name))} ..."
 				job.short_text = True
+			elif is_group:
+				# short enough
+				caption = html.escape(job.canonical_name)
 			# Captions only for YouTube in groups; empty otherwise.
 			# Might be too long for Telegram, so we skip them.
 			if is_youtube and is_group:

warp_beacon/uploader/__init__.py

@@ -1,15 +1,13 @@
 import os
-import threading
-import multiprocessing
-from warp_beacon.jobs.upload_job import UploadJob
 import logging
-
-import asyncio
-
 from typing import Callable
+import asyncio
+import threading
+import multiprocessing
 
-from warp_beacon.storage import Storage
 from warp_beacon.jobs.types import JobType
+from warp_beacon.jobs.upload_job import UploadJob
+from warp_beacon.storage import Storage
 
 class AsyncUploader(object):
 	__JOE_BIDEN_WAKEUP = None
@@ -40,10 +38,9 @@ class AsyncUploader(object):
 			self.threads.append(thread)
 
 	def add_callback(self, message_id: int, callback: Callable) -> None:
-		def callback_wrap(*args, **kwargs) -> None:
-			ret = callback(*args, **kwargs)
+		async def callback_wrap(*args, **kwargs) -> None:
+			await callback(*args, **kwargs)
 			#self.remove_callback(message_id)
-			return ret
 		self.callbacks[message_id] = {"callback": callback_wrap}
 
 	def remove_callback(self, message_id: int) -> None:
@@ -83,7 +80,11 @@ class AsyncUploader(object):
 					if job is self.__JOE_BIDEN_WAKEUP:
 						break
 					if job.is_message_to_admin and job.message_text and self.admin_message_callback:
-						asyncio.ensure_future(self.admin_message_callback(job.message_text, job.account_admins, job.yt_auth), loop=self.loop)
+						#asyncio.ensure_future(self.admin_message_callback(job.message_text, job.account_admins, job.yt_auth), loop=self.loop)
+						self.loop.call_soon_threadsafe(
+							asyncio.create_task,
+							self.admin_message_callback(job.message_text, job.account_admins, job.yt_auth)
+						)
 						continue
 
 					path = ""
@@ -106,20 +107,29 @@ class AsyncUploader(object):
 							if job.job_failed:
 								logging.info("URL '%s' download failed. Skipping upload job ...", job.url)
 								if job.job_failed_msg: # we want to say something to user
-									asyncio.ensure_future(self.callbacks[message_id]["callback"](job), loop=self.loop)
+									self.loop.call_soon_threadsafe(
+										asyncio.create_task,
+										self.callbacks[message_id]["callback"](job)
+									)
 								self.process_done(uniq_id)
 								self.remove_callback(message_id)
 								continue
 							
 							if job.replay:
-								asyncio.ensure_future(self.callbacks[message_id]["callback"](job), loop=self.loop)
+								self.loop.call_soon_threadsafe(
+									asyncio.create_task,
+									self.callbacks[message_id]["callback"](job)
+								)
 								self.remove_callback(message_id)
 								continue
 
 							if job.job_warning:
 								logging.info("Job warning occurred ...")
 								if job.job_warning_msg:
-									asyncio.ensure_future(self.callbacks[message_id]["callback"](job), loop=self.loop)
+									self.loop.call_soon_threadsafe(
+										asyncio.create_task,
+										self.callbacks[message_id]["callback"](job)
+									)
 								continue
 							if in_process:
 								db_list_dicts = self.storage.db_lookup_id(uniq_id)
@@ -131,14 +141,22 @@ class AsyncUploader(object):
 										job.media_type = JobType.COLLECTION
 									elif dlds_len:
 										job.tg_file_id = ",".join(tg_file_ids)
-										job.media_type = JobType[db_list_dicts.pop()["media_type"].upper()]
-									asyncio.ensure_future(self.callbacks[message_id]["callback"](job), loop=self.loop)
+										db_data = db_list_dicts.pop()
+										job.media_type = JobType[db_data["media_type"].upper()]
+										job.canonical_name = db_data.get("canonical_name", "")
+									self.loop.call_soon_threadsafe(
+										asyncio.create_task,
+										self.callbacks[message_id]["callback"](job)
+									)
 									self.process_done(uniq_id)
 									self.remove_callback(message_id)
 								else:
 									self.queue_task(job)
 							else:
-								asyncio.ensure_future(self.callbacks[message_id]["callback"](job), loop=self.loop)
+								self.loop.call_soon_threadsafe(
+									asyncio.create_task,
+									self.callbacks[message_id]["callback"](job)
+								)
 								self.process_done(uniq_id)
 								self.remove_callback(message_id)
 						else:

{warp_beacon-2.3.29.dist-info → warp_beacon-2.3.31.dist-info}/METADATA

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

{warp_beacon-2.3.29.dist-info → warp_beacon-2.3.31.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=-QW5zAmOpUMiNxKC9uasXqo7vywFKRlp_1o42QGAO-I,24
+warp_beacon/__version__.py,sha256=6WuiVqC37jmvlGi1GNaJkQDAVLgaOvkYIZwJr1WO5FM,24
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -19,7 +19,7 @@ warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-Z
 warp_beacon/mediainfo/silencer.py,sha256=qxMuViOoVwUYb60uCVvqHiGrqByR1_4_rqMT-XdMkwc,1813
 warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tEI,2480
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scheduler/scheduler.py,sha256=gcV-e-9MjL8JEfu7T3Gy1imUrXz266ub9Ub4O27W5Hw,2786
+warp_beacon/scheduler/scheduler.py,sha256=WFfV5flS4xtqNjalM95KW4jLMJ70PskRpP9e7cUQM2U,2796
 warp_beacon/scraper/__init__.py,sha256=V_C5SmAmRtjFfVBtTotOHCW3ILMQ8m_ulrBF6ry59_A,16944
 warp_beacon/scraper/abstract.py,sha256=6A6KuBUHZhu8VAyBwLgmnxMPHJcLpgwLapmULy8hpoA,2726
 warp_beacon/scraper/account_selector.py,sha256=zv5ci_Y7W-tzKeFklffpLts19a1wFg69fqefK-_i_pk,5122
@@ -36,15 +36,15 @@ warp_beacon/scraper/youtube/youtube.py,sha256=fGrbjBngvvNdpzhb1yZVedNW0_tCrLc31V
 warp_beacon/storage/__init__.py,sha256=0Vajd0oITKJfu2vmNx5uQSt3-L6vwIvUYWJo8HZCjco,3398
 warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=rau3QoukQsp5MGb2X1QkUq00_Vv_gkjbIhgqfECgzaE,17040
+warp_beacon/telegram/bot.py,sha256=T_5NUYFgPAuX6PVefYsdB_3ma3VHwSYhJnTZKNWEWY0,17123
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
 warp_beacon/telegram/handlers.py,sha256=XXIfdV_RCj7tyZMPXchuKmGoDdweOaR08ADDaBPWo_U,9426
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
-warp_beacon/uploader/__init__.py,sha256=5KRWsxPRGuQ56YhCEnJsXnb-yQp8dpvWEsPDf0dD-fw,4964
-warp_beacon-2.3.29.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.29.dist-info/METADATA,sha256=8XB7RwAZ5B2uNbFdyEmDqi85YftlA3cNBL9OCjyG04k,21723
-warp_beacon-2.3.29.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-warp_beacon-2.3.29.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.29.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
-warp_beacon-2.3.29.dist-info/RECORD,,
+warp_beacon/uploader/__init__.py,sha256=E9rlZIf7xlQz6MutMOwJ8S5Vm2uheR5nv23Kv8duRQg,5427
+warp_beacon-2.3.31.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.31.dist-info/METADATA,sha256=NJdQjwobTeXr3CfN4u7ojakyoLlIbPXXghSbVBHj3uc,21723
+warp_beacon-2.3.31.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+warp_beacon-2.3.31.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.31.dist-info/top_level.txt,sha256=2iKFlYwJ-meO9sCX4OGEP1hhQN17t2KFksQ5dXMhXUA,1103
+warp_beacon-2.3.31.dist-info/RECORD,,