warp-beacon 2.7.1__tar.gz → 2.7.3__tar.gz

{warp_beacon-2.7.1/warp_beacon.egg-info → warp_beacon-2.7.3}/PKG-INFO

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

warp_beacon-2.7.3/warp_beacon/__version__.py

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

{warp_beacon-2.7.1 → warp_beacon-2.7.3}/warp_beacon/scraper/utils.py

@@ -4,7 +4,7 @@ from fake_useragent import UserAgent
 
 class ScraperUtils(object):
 	@staticmethod
-	def get_ua_dict(browsers: list = ['Facebook', 'Android'], platforms: list = ['mobile', 'tablet'], os: list =['Android']) -> dict:
+	def get_ua_dict(browsers: list = None, platforms: list = ['mobile', 'tablet'], os: list = ['Android']) -> dict:
 		random_client = None
 		try:
 			ua = UserAgent(browsers=browsers, platforms=platforms, os=os)
@@ -16,5 +16,5 @@ class ScraperUtils(object):
 		return random_client
 
 	@staticmethod
-	def get_ua(browsers: list = ['Facebook', 'Android'], platforms: list = ['mobile', 'tablet'], os: list =['Android']) -> str:
+	def get_ua(browsers: list = None, platforms: list = ['mobile', 'tablet'], os: list = ['Android']) -> str:
 		return ScraperUtils.get_ua_dict(browsers=browsers, platforms=platforms, os=os)["useragent"]

{warp_beacon-2.7.1 → warp_beacon-2.7.3}/warp_beacon/scraper/youtube/abstract.py

@@ -66,7 +66,6 @@ class YoutubeAbstract(ScraperAbstract):
 
 		# avoid task acquiring in parallel worker
 		self.yt_validate_event.clear()
-		#time.sleep(35)
 
 		return 0
 	
@@ -233,14 +232,15 @@ class YoutubeAbstract(ScraperAbstract):
 			return
 		bytes_downloaded = total_size - bytes_remaining
 		percentage_of_completion = bytes_downloaded / (total_size or 1) * 100
-		if total_size == 0 or percentage_of_completion >= self._download_progress_threshold:
+		if total_size == 0 or percentage_of_completion == 0 or percentage_of_completion >= self._download_progress_threshold:
 			msg = {
 				"action": "report_download_status",
 				"current": bytes_downloaded,
 				"total": total_size,
 				"message_id": self.job.placeholder_message_id,
 				"chat_id": self.job.chat_id,
-				"completed": percentage_of_completion >= 100
+				"completed": percentage_of_completion >= 100,
+				"media_type": stream.type
 			}
 			self.status_pipe.send(msg)
 			logging.debug("[Download worker] Downloaded %d%%", percentage_of_completion)

{warp_beacon-2.7.1 → warp_beacon-2.7.3}/warp_beacon/telegram/download_status.py

@@ -16,12 +16,15 @@ class DownloadStatus(object):
 		self.status_pipe, self.child_conn = Pipe()
 
 	async def handle_message(self, msg: dict, progress_bar: ProgressBar) -> None:
+		op = "Downloading"
+		if msg.get("media_type", None):
+			op += f" {msg['media_type']}"
 		await progress_bar.progress_callback(
 			current=msg.get("current", 0),
 			total=msg.get("total", 0),
 			message_id=msg.get("message_id", 0),
 			chat_id=msg.get("chat_id", 0),
-			operation="Downloading",
+			operation=op,
 			report_type=msg.get("report_type", ReportType.PROGRESS),
 			label=msg.get("label", "")
 		)

{warp_beacon-2.7.1 → warp_beacon-2.7.3}/warp_beacon/telegram/progress_bar.py

@@ -15,6 +15,7 @@ class ProgressBar(object):
 		self._next_threshold = 5
 		self.client = client
 		self.complete = False
+		self.rendered_text = ""
 
 	def is_complete(self) -> bool:
 		return self.complete
@@ -104,13 +105,18 @@ class ProgressBar(object):
 			pbar = self.make_emoji_progress_bar(percent, 10)
 			logging.info("[Progress bar]: Operation: %s %d%%", operation, percent)
 			try:
-				# we don't need to wait completion, waste of time and resources
 				text = f"{pbar}\n{operation}"
 				if label:
 					text += f"\n<code>{label}</code>"
 				if total:
 					text += f" <b>{self.format_size_si(total)}</b>"
+
+				# avoid duplicate render
+				if text == f"{chat_id}:{message_id}:{text}":
+					return
+
 				await self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
+				self.rendered_text = f"{chat_id}:{message_id}:{text}"
 				#task = self.client.loop.create_task(
 				#	self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
 				#)
@@ -120,7 +126,7 @@ class ProgressBar(object):
 			except Exception as e:
 				logging.warning("An error occurred while setup task to update progress bar")
 				logging.exception(e)
-			if total > 0:
+			if total > 0 and percent != 0:
 				self._next_threshold += 5
 
 	@staticmethod

{warp_beacon-2.7.1 → warp_beacon-2.7.3/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.7.1/warp_beacon/__version__.py

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