warp-beacon 2.6.62__py3-none-any.whl → 2.6.63__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.62"
+__version__ = "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/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/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/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.dist-info → warp_beacon-2.6.63.dist-info}/METADATA

@@ -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.dist-info → warp_beacon-2.6.63.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=09IBOKxWe42LVlV24GfMJOBKt0hFlSRUhV5Q52nzG_Y,24
+warp_beacon/__version__.py,sha256=0KBAGOPAv97q-WuHyu9Q4j_MnJB9l3T_j_629z8mY2M,24
 warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,7 +23,7 @@ warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 warp_beacon/scheduler/instagram_human.py,sha256=0LaRUu0MBBuEOQeFzuq22HIYfJL9pTK_7udsXfef0Fk,8204
 warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
 warp_beacon/scraper/__init__.py,sha256=buXmGcJnwCi0qGZAh3srcSbww0XvKyTACp_DW11e86Q,20225
-warp_beacon/scraper/abstract.py,sha256=Hr8BrLLG4AhVluKO50ryXy2T96goJ83ahXKRXnnQBn8,3110
+warp_beacon/scraper/abstract.py,sha256=hRyBbdZ5HK7QyyXlbFAgk3FZe2SIil0WBZ9vJziZv_s,3554
 warp_beacon/scraper/account_selector.py,sha256=-tAbOIbM7sC9QafsgSe64RCWXewRO-RehEYsYSB3HGo,9727
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
 warp_beacon/scraper/fail_handler.py,sha256=zcPK3ZVEsu6JmHYcWP7L3naTRK3gWFVRkpP84VBOtJs,964
@@ -31,9 +31,9 @@ warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5
 warp_beacon/scraper/utils.py,sha256=xJfCVhiLjVPoFVupE10sTzX7UpgNWbx2EeYIsoYXGDk,43
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
-warp_beacon/scraper/instagram/instagram.py,sha256=f4B_pHk99C9EGWRXCINCW7NeOA0gSuVryknGHLNyMCI,15827
+warp_beacon/scraper/instagram/instagram.py,sha256=hNknsMVEOG9pQw5hnXGbqvRNAbp5gJXKdIny6drF7rA,15899
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=cSvFOZAZzRNwVTlSQ9EK7kf3RzdwSvw8HBfbDv94qPQ,13578
+warp_beacon/scraper/youtube/abstract.py,sha256=sU1inNjg0dv96ae8pZennYfczE4u227RcpgulOtTNLw,13132
 warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
 warp_beacon/scraper/youtube/shorts.py,sha256=1GtoYUlxAwcgSQcn80u5ehNJytH5AN5dPOicmX-XD8E,1705
 warp_beacon/scraper/youtube/youtube.py,sha256=x9v9p1coA9TvBhxjNAofGu4UBkAEdYPE2ePRnU-5tK0,7233
@@ -46,13 +46,13 @@ warp_beacon/telegram/download_status.py,sha256=SIWIKPjNJwl13VxBZcN-YKB0bzWqrMxhV
 warp_beacon/telegram/edit_message.py,sha256=L6YXPuR87aLBly0yUjS4XjXUbOtUQlrKEPKhzBVcjdI,5417
 warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
-warp_beacon/telegram/progress_bar.py,sha256=hVr-VmfVadRTRtzfChqCigCKT_4KRlKqT-dJxi5U9dc,3590
+warp_beacon/telegram/progress_bar.py,sha256=Af5iN3Sng14dVMJhd4vxLF4tJPEygaHii230FSeoSx8,3603
 warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.62.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.62.dist-info/METADATA,sha256=LpNvKWdS3weCwLpmT7Q9bjhYgrQ_SIYzMf0aJQ_abs0,22706
-warp_beacon-2.6.62.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-warp_beacon-2.6.62.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.62.dist-info/top_level.txt,sha256=2x4wBJ_HeeBt6Bsdu9C4tItXWqH8spX8jGSHpoL0IMw,1334
-warp_beacon-2.6.62.dist-info/RECORD,,
+warp_beacon-2.6.63.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.63.dist-info/METADATA,sha256=fGrV2iZU4vHbgPrlbTKdoxgPLrq7wsEB_M2kY_glNCg,22706
+warp_beacon-2.6.63.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+warp_beacon-2.6.63.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.63.dist-info/top_level.txt,sha256=2x4wBJ_HeeBt6Bsdu9C4tItXWqH8spX8jGSHpoL0IMw,1334
+warp_beacon-2.6.63.dist-info/RECORD,,