warp-beacon 2.2.0__py3-none-any.whl → 2.2.1__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 

warp_beacon/scheduler/scheduler.py

@@ -1,4 +1,7 @@
+import os
+import time
 import threading
+import json
 
 from warp_beacon.jobs import Origin
 import warp_beacon
@@ -6,10 +9,12 @@ import warp_beacon
 import logging
 
 class IGScheduler(object):
+	state_file = "/var/warp_beacon/scheduler_state.json"
 	downloader = None
 	running = True
 	thread = None
 	event = None
+	state = {"remaining": 3600}
 
 	def __init__(self, downloader: warp_beacon.scraper.AsyncDownloader) -> None:
 		self.downloader = downloader
@@ -18,6 +23,23 @@ class IGScheduler(object):
 	def __del__(self) -> None:
 		self.stop()
 
+	def save_state(self) -> None:
+		try:
+			with open(self.state_file, 'w+', encoding="utf-8") as f:
+				f.write(json.dumps(self.state))
+		except Exception as e:
+			logging.error("Failed to save Scheduler state!")
+			logging.exception(e)
+
+	def load_state(self) -> None:
+		try:
+			if os.path.exists(self.state_file):
+				with open(self.state_file, 'r', encoding="utf-8") as f:
+					self.state = json.loads(f.read())
+		except Exception as e:
+			logging.error("Failed to load Scheduler state!")
+			logging.exception(e)
+
 	def start(self) -> None:
 		self.thread = threading.Thread(target=self.do_work)
 		self.thread.start()
@@ -55,11 +77,20 @@ class IGScheduler(object):
 
 	def do_work(self) -> None:
 		logging.info("Scheduler thread started ...")
+		self.load_state()
+		timeout = self.state["remaining"]
 		while self.running:
 			try:
 				logging.info("Scheduler waking up")
+				start_time = time.time()
 				self.validate_ig_session()
-				self.event.wait(timeout=3600)
+				self.event.wait(timeout=timeout)
+				elapsed = time.time() - start_time
+				self.state["remaining"] = timeout - elapsed
+
+				if self.state["remaining"] <= 0:
+					self.state["remaining"] = 3600
 			except Exception as e:
 				logging.error("An error occurred in scheduler thread!")
-				logging.exception(e)
+				logging.exception(e)
+		self.save_state()

warp_beacon/telegram/bot.py

@@ -170,6 +170,7 @@ class Bot(object):
 					)
 				else:
 					args["video"] = job.tg_file_id.replace(":video", '')
+					args["caption"] = self.build_signature_caption(job)
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaVideo(
@@ -200,6 +201,7 @@ class Bot(object):
 					)
 				else:
 					args["photo"] = job.tg_file_id.replace(":image", '')
+					args["caption"] = self.build_signature_caption(job)
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaPhoto(
@@ -208,6 +210,7 @@ class Bot(object):
 					)
 				else:
 					args["photo"] = job.local_media_path
+					args["caption"] = self.build_signature_caption(job)
 		elif job.media_type == JobType.AUDIO:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
@@ -239,10 +242,12 @@ class Bot(object):
 			if job.tg_file_id:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAnimation(
-						media=job.tg_file_id.replace(":animation", '')
+						media=job.tg_file_id.replace(":animation", ''),
+						caption=self.build_signature_caption(job)
 					)
 				else:
 					args["animation"] = job.tg_file_id.replace(":animation", '')
+					args["caption"] = self.build_signature_caption(job)
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAnimation(

{warp_beacon-2.2.0.dist-info → warp_beacon-2.2.1.dist-info}/METADATA

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

{warp_beacon-2.2.0.dist-info → warp_beacon-2.2.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuww
 var/warp_beacon/accounts.json,sha256=rKFQM_b9eoDS4mJ1B_SZNolPLXx1SQdQMdY2F_ZcBt8,1523
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=WMCzR_QnD3JzFHSeOqgJDoy5dvPLvgg2SMbWaTYllMs,23
+warp_beacon/__version__.py,sha256=AmBkr7ARRWHmff4IC1Z-mqL0cMMtNqSb8LKSY7kfXXc,23
 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
@@ -18,7 +18,7 @@ warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-Z
 warp_beacon/mediainfo/silencer.py,sha256=MgUc9Ibbhjhg9GbJMNfJqrdDkMsQShZkQ1sCwvW_-qI,1647
 warp_beacon/mediainfo/video.py,sha256=AIRy_op_BvehsjarM1rvT5Qo0QWwf-Q6xVVd_aCnbJ4,2505
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scheduler/scheduler.py,sha256=BO9nzJ2oKK877527HrzztBBOSClt5cAK1jGmO7gv38c,1536
+warp_beacon/scheduler/scheduler.py,sha256=OtUnXPf83Uhe6j7VCwpW4KWasOPB5OXy9v471Ra42Ss,2436
 warp_beacon/scraper/__init__.py,sha256=0ZxLxzXweg1LJ1qBRJ1s3EOKe7xpUrp9Nj26gjsLMOQ,14734
 warp_beacon/scraper/abstract.py,sha256=aNZ9ypF9B8BjflcIwi-7wEzIqF-XPeF0xvfX9CP_iIw,2708
 warp_beacon/scraper/account_selector.py,sha256=RYBmLDhE-fqaLqQiQ6zVd13q-1pqQ3F3nYJu2Gx3gV4,2881
@@ -32,14 +32,14 @@ warp_beacon/scraper/youtube/shorts.py,sha256=pHfvEBau8Zp7Ar3LBuPmjqYq8fmjJUQvzeZ
 warp_beacon/scraper/youtube/youtube.py,sha256=K98n2TSJaDZt-xT7mADZL1UEf2exIYm0Wnenn2GAYfI,2250
 warp_beacon/storage/__init__.py,sha256=8XsJXq9X7GDlTaWREF4W1PDX9PH5utwhjf5c5M8Bb7o,3378
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=lH_0oQCsJOLLAwQVzFAOiSW4wm7-UQrKZRDd-PzDfiU,14792
+warp_beacon/telegram/bot.py,sha256=khk2NvVz_UvxEA_Cz43D5jFuV4z_mUNLOXLhwXKUxz8,15069
 warp_beacon/telegram/handlers.py,sha256=ccqUY7YbddDNbTxYVxpDPjLVJmcAL14yoaQ7xT9WBLU,6725
 warp_beacon/telegram/placeholder_message.py,sha256=u5kVfTjGmVYkwA5opniRltHXGpsdSxI41WEde8J5os0,6418
 warp_beacon/telegram/utils.py,sha256=ikfwmuDvd0XtOuwP29tZPjAz7kwiGSSu_QR-vpv6pMY,2352
 warp_beacon/uploader/__init__.py,sha256=rsUkzzmtaeQY-kNkcIiPsrayS9idFKY3hBC71mR19XE,4743
-warp_beacon-2.2.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.2.0.dist-info/METADATA,sha256=LyrV1URH8gNbGV57ZTyyWGzuIC4UrrBvLzZR_a-AcVw,21250
-warp_beacon-2.2.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-warp_beacon-2.2.0.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.2.0.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.2.0.dist-info/RECORD,,
+warp_beacon-2.2.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.1.dist-info/METADATA,sha256=LU8S-4Q189DPmiDq9rx4tdfyKJjCIvsSgInmaja0PqQ,21250
+warp_beacon-2.2.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+warp_beacon-2.2.1.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.1.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.1.dist-info/RECORD,,