warp-beacon 2.5.3__tar.gz → 2.5.5__tar.gz

{warp_beacon-2.5.3/warp_beacon.egg-info → warp_beacon-2.5.5}/PKG-INFO

@@ -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.5/warp_beacon/__version__.py

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

{warp_beacon-2.5.3 → warp_beacon-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-2.5.3 → warp_beacon-2.5.5}/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-2.5.3 → warp_beacon-2.5.5}/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 → warp_beacon-2.5.5/warp_beacon.egg-info}/PKG-INFO

@@ -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/warp_beacon/__version__.py

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