warp-beacon 2.5.3__py3-none-any.whl → 2.5.5__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.5.3"
+__version__ = "2.5.5"
 

warp_beacon/scraper/exceptions.py

@@ -48,18 +48,17 @@ class UnknownError(ScraperError):
 	pass
 
 def extract_exception_message(e: Exception) -> str:
-	msg = ""
 	if hasattr(e, "expected"):
-		msg = "Expected bytes: %d" % int(e.expected)
+		return f"Expected bytes: {int(e.expected)}"
 	elif hasattr(e, "error_string"):
-		msg = e.error_string
-	elif hasattr(e, "message"):
-		msg = e.message
+		return str(e.error_string)
 	elif hasattr(e, "reason"):
-		msg = e.reason
+		return str(e.reason)
 	elif hasattr(e, "msg"):
-		msg = e.msg
-	elif hasattr(e, "args"):
-		msg = str(e.args)
-		
-	return msg
+		return str(e.msg)
+	elif hasattr(e, "args") and len(e.args) == 1:
+		return str(e.args[0])
+	elif hasattr(e, "args") and len(e.args) > 1:
+		return ", ".join(map(str, e.args))
+	else:
+		return str(e)

warp_beacon/scraper/youtube/abstract.py

@@ -9,12 +9,12 @@ import ssl
 from typing import Callable, Union, Optional
 import logging
 import json
-import urllib
 import http.client
 import pytubefix.exceptions
 import requests
 from PIL import Image
 import numpy as np
+import urllib
 import urllib3
 from urllib.parse import urlparse, parse_qs
 
@@ -194,6 +194,8 @@ class YoutubeAbstract(ScraperAbstract):
 					urllib.error.HTTPError) as e:
 				if hasattr(e, "code") and (int(e.code) == 403 or int(e.code) == 400):
 					raise Unavailable(extract_exception_message(e))
+				if hasattr(e, "reason") and "Remote end closed connection without response" in str(e.reason):
+					raise Unavailable(extract_exception_message(e))
 				logging.warning("Youtube read timeout! Retrying in '%d' seconds ...", pause_secs)
 				logging.info("Your `YT_MAX_RETRIES` values is '%d'", max_retries)
 				logging.exception(extract_exception_message(e))

warp_beacon/telegram/bot.py

@@ -248,7 +248,7 @@ class Bot(object):
 					args["thumb"] = job.media_info["thumb"]
 					args["caption"] = self.build_signature_caption(job)
 
-				args["file_name"] = "downloaded_via_warp_beacon_bot%s" % (os.path.splitext(job.local_media_path)[-1])
+				args["file_name"] = job.local_media_path
 		elif job.media_type == JobType.IMAGE:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
@@ -268,6 +268,8 @@ class Bot(object):
 				else:
 					args["photo"] = job.local_media_path
 					args["caption"] = self.build_signature_caption(job)
+
+				args["file_name"] = job.local_media_path
 		elif job.media_type == JobType.AUDIO:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
@@ -294,6 +296,8 @@ class Bot(object):
 					args["duration"] = round(job.media_info["duration"])
 					args["title"] = job.canonical_name
 					args["caption"] = self.build_signature_caption(job)
+
+				args["file_name"] = job.local_media_path
 		elif job.media_type == JobType.ANIMATION:
 			if job.tg_file_id:
 				if job.placeholder_message_id:
@@ -321,6 +325,8 @@ class Bot(object):
 					args["duration"] = round(job.media_info["duration"])
 					args["thumb"] = job.media_info["thumb"]
 					args["caption"] = self.build_signature_caption(job)
+
+				args["file_name"] = job.local_media_path
 		elif job.media_type == JobType.COLLECTION:
 			if job.tg_file_id:
 				args["media"] = []

{warp_beacon-2.5.3.dist-info → warp_beacon-2.5.5.dist-info}/METADATA

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

{warp_beacon-2.5.3.dist-info → warp_beacon-2.5.5.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=322qh3fU632OT78vSP8jfr_12xwaJcFYctBN5ykTHK8,23
+warp_beacon/__version__.py,sha256=OVY6OQEFGm1xkC4U8v57ta-eZyl8mpdZy40jqhRm6Bo,23
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,28 +25,28 @@ warp_beacon/scheduler/scheduler.py,sha256=MoPdPKiMNqVD19N-8yDc0wkTlwghFeQV3STBip
 warp_beacon/scraper/__init__.py,sha256=Wl_GHtBW6GMH45nD9jjzSJGxBkkkrDZAFx9QIqkagO0,18218
 warp_beacon/scraper/abstract.py,sha256=CiOyKCxVYWhPnOUpLAVIRNuHBftN6gmxqATdhjzkaS4,2852
 warp_beacon/scraper/account_selector.py,sha256=1ftgBKyaW_JiC6KX6wPfid3YWk8hRctfOTROrH1OnJ8,6943
-warp_beacon/scraper/exceptions.py,sha256=L4UCZqDOLKu5-TPUcTErIbNDLrAQJghkMaPqzTfsm1g,1376
+warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
 warp_beacon/scraper/fail_handler.py,sha256=_blvckfTZ4xWVancQKVRXH5ClKGwfrBxMwvXIFZh1qA,975
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/instagram.py,sha256=KyOZnIt6A8wkroXkZcIJMscuy5N5ZEz9-v3Ciwo0C7M,14654
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=r_g6zkEX9h5VqQVHaQFAD-lWsEOs7Um353N98nB3tfA,11548
+warp_beacon/scraper/youtube/abstract.py,sha256=7LpVD6Vc3wFTCeRoCzw1Pw9FDa2EXlqzrlRCZY9zmXw,11699
 warp_beacon/scraper/youtube/music.py,sha256=m-1iPYe1p0OZmOlYl8gjHErsazCcXqs3qDA7KyIT6GI,2923
 warp_beacon/scraper/youtube/shorts.py,sha256=sPrOjhcLlV0m5a-j4mSFsF6CkNapeUdGZqoWAYheiCM,1894
 warp_beacon/scraper/youtube/youtube.py,sha256=ctHPmTfNO-5dcYeh1K4_PkB6MQRVgByr4EvaCvZp9WE,6171
 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=QH9NBJrNvVoLrDF4YDH54XdJX6DWNRMeHGshnOAvhFs,18073
+warp_beacon/telegram/bot.py,sha256=eY6g3XiKbl76OF6gWVThIlH6GkTYqcoiUGbXH9YzkLk,18150
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
 warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
 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=e75mOcC0vrUVjrTNMQzVUTgXGdGo4J6n8t5doOnYG5I,5616
-warp_beacon-2.5.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.5.3.dist-info/METADATA,sha256=_cc9n7thfLVlWMm3a1IM-_M65hDA8oVemU3pBvrXeZ0,22625
-warp_beacon-2.5.3.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-warp_beacon-2.5.3.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.5.3.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
-warp_beacon-2.5.3.dist-info/RECORD,,
+warp_beacon-2.5.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.5.5.dist-info/METADATA,sha256=7dSF2xHIhDv6i5vtVm82U2Rx5OLRMgNRJZV7fBw6mKU,22625
+warp_beacon-2.5.5.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+warp_beacon-2.5.5.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.5.5.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
+warp_beacon-2.5.5.dist-info/RECORD,,