warp-beacon 2.6.62__tar.gz → 2.6.63__tar.gz

{warp_beacon-2.6.62/warp_beacon.egg-info → warp_beacon-2.6.63}/PKG-INFO

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

warp_beacon-2.6.63/warp_beacon/__version__.py

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

{warp_beacon-2.6.62 → warp_beacon-2.6.63}/warp_beacon/scraper/abstract.py

@@ -1,4 +1,5 @@
 import os
+import time
 import pathlib
 from abc import ABC, abstractmethod
 from typing import Callable, Union
@@ -77,6 +78,20 @@ class ScraperAbstract(ABC):
 			logging.exception(e)
 
 		return ''
+	
+	def rename_local_file(self, filename: str) -> str:
+		if not os.path.exists(filename):
+			raise NameError("No file provided")
+		path_info = pathlib.Path(filename)
+		ext = path_info.suffix
+		#old_filename = path_info.stem
+		time_name = str(time.time()).replace('.', '_')
+		new_filename = f"{time_name}{ext}"
+		new_filepath = f"{os.path.dirname(filename)}/{new_filename}"
+
+		os.rename(filename, new_filepath)
+
+		return new_filepath
 
 	def force_ipv6(self) -> None:
 		def allowed_gai_family():

{warp_beacon-2.6.62 → warp_beacon-2.6.63}/warp_beacon/scraper/instagram/instagram.py

@@ -227,7 +227,7 @@ class InstagramScraper(ScraperAbstract):
 	def download_video(self, url: str, media_info: Media) -> dict:
 		self.cl.request_timeout = int(os.environ.get("IG_REQUEST_TIMEOUT", default=60))
 		path = self.download_hndlr(self.cl.video_download_by_url, url, folder='/tmp')
-		return {"local_media_path": str(path), "canonical_name": self.extract_canonical_name(media_info), \
+		return {"local_media_path": self.rename_local_file(str(path)), "canonical_name": self.extract_canonical_name(media_info), \
 			"media_type": JobType.VIDEO, "last_pk": media_info.pk, \
 			"media_info": {"duration": round(media_info.video_duration)}}
 
@@ -238,7 +238,7 @@ class InstagramScraper(ScraperAbstract):
 			path = InstagramScraper.convert_webp_to_png(path)
 		if ".heic" in path_lowered:
 			path = InstagramScraper.convert_heic_to_png(path)
-		return {"local_media_path": path, "canonical_name": self.extract_canonical_name(media_info), "media_type": JobType.IMAGE, "last_pk": media_info.pk}
+		return {"local_media_path": self.rename_local_file(path), "canonical_name": self.extract_canonical_name(media_info), "media_type": JobType.IMAGE, "last_pk": media_info.pk}
 	
 	def download_story(self, story_info: Story) -> dict:
 		path, media_type, media_info = "", JobType.UNKNOWN, {}
@@ -263,7 +263,7 @@ class InstagramScraper(ScraperAbstract):
 			media_type = JobType.VIDEO
 			media_info["duration"] = story_info.video_duration
 
-		return {"local_media_path": path, "media_type": media_type, "media_info": media_info, "effective_url": effective_url}
+		return {"local_media_path": self.rename_local_file(path), "media_type": media_type, "media_info": media_info, "effective_url": effective_url}
 
 	def download_stories(self, stories: list[Story]) -> dict:
 		chunks = []

{warp_beacon-2.6.62 → warp_beacon-2.6.63}/warp_beacon/scraper/youtube/abstract.py

@@ -4,7 +4,6 @@ import json
 import logging
 import math
 import os
-import pathlib
 import socket
 import ssl
 import time
@@ -65,20 +64,6 @@ class YoutubeAbstract(ScraperAbstract):
 			logging.exception(e)
 
 		return 0
-
-	def rename_local_file(self, filename: str) -> str:
-		if not os.path.exists(filename):
-			raise NameError("No file provided")
-		path_info = pathlib.Path(filename)
-		ext = path_info.suffix
-		#old_filename = path_info.stem
-		time_name = str(time.time()).replace('.', '_')
-		new_filename = f"{time_name}{ext}"
-		new_filepath = f"{os.path.dirname(filename)}/{new_filename}"
-
-		os.rename(filename, new_filepath)
-
-		return new_filepath
 	
 	def get_video_id(self, url: str) -> Optional[str]:
 		parsed_url = urlparse(url)

{warp_beacon-2.6.62 → warp_beacon-2.6.63}/warp_beacon/telegram/progress_bar.py

@@ -81,11 +81,11 @@ class ProgressBar(object):
 			try:
 				#await self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>{operation}</b> {label}", ParseMode.HTML)
 				# we don't need to wait completion, waste of time and resources
-				text = f"{pbar}\n<b>{operation}</b>"
+				text = f"{pbar}\n{operation}"
 				if label:
-					text += f"\n{label}"
+					text += f"\n<code>{label}</code>"
 				if total:
-					text += f" {self.format_size_si(total)}"
+					text += f" <b>{self.format_size_si(total)}</b>"
 				task = self.client.loop.create_task(
 					self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
 				)

{warp_beacon-2.6.62 → warp_beacon-2.6.63/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.62/warp_beacon/__version__.py

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