warp-beacon 2.6.71__py3-none-any.whl → 2.6.73__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.71"
+__version__ = "2.6.73"
 

warp_beacon/scraper/instagram/instagram.py

@@ -332,13 +332,13 @@ class InstagramScraper(ScraperAbstract):
 			try:
 				scrap_type, media_id = self.scrap(job.url)
 				if scrap_type == "media":
-					self.status_pipe.send({
-						"action": "report_download_status",
-						"report_type": ReportType.ANNOUNCE,
-						"label": "Collecting meta information ...",
-						"chat_id": self.job.chat_id,
-						"message_id": self.job.placeholder_message_id
-					})
+					#self.status_pipe.send({
+					#	"action": "report_download_status",
+					#	"report_type": ReportType.ANNOUNCE,
+					#	"label": "Collecting meta information ...",
+					#	"chat_id": self.job.chat_id,
+					#	"message_id": self.job.placeholder_message_id
+					#})
 					media_info = self.download_hndlr(self.cl.media_info_v1, media_id)
 					logging.info("media_type is '%d', product_type is '%s'", media_info.media_type, media_info.product_type)
 					if media_info.media_type == 2 and media_info.product_type == "clips": # Reels
@@ -432,7 +432,7 @@ class InstagramScraper(ScraperAbstract):
 	
 	def download_progress(self, total: int | None, bytes_transferred: int, path: Path) -> None:
 		percentage_of_completion = round(bytes_transferred / (total or 1) * 100)
-		if total == 0 or percentage_of_completion >= self._download_progress_threshold:
+		if percentage_of_completion >= self._download_progress_threshold:
 			logging.debug("[Download] IG file '%s', %d", str(path), percentage_of_completion)
 			msg = {
 				"action": "report_download_status",

warp_beacon/scraper/instagram/wb_instagrapi.py

@@ -35,7 +35,6 @@ class WBClient(Client):
 			content_length = int(response.headers.get("Content-Length", 0))
 		except (TypeError, ValueError):
 			logging.warning("Content-Length header is missing or invalid.")
-			content_length = 0
 
 		downloaded = 0
 		with open(path, "wb") as f:
@@ -59,4 +58,37 @@ class WBClient(Client):
 				f'Broken file "{path}" (expected {content_length}, got {downloaded})'
 			)
 
+		return path.resolve()
+
+	def photo_download_by_url(
+		self, url: str, filename: str = "", folder: Path = ""
+	) -> Path:
+		fname = urlparse(url).path.rsplit("/", 1)[1]
+		filename = f"{filename}.{(filename, fname.rsplit('.', 1)[1]) if filename else fname}"
+		path = Path(folder) / filename
+		response = requests.get(url, stream=True, timeout=self.request_timeout)
+		response.raise_for_status()
+
+		content_length = 0
+		try:
+			content_length = int(response.headers.get("Content-Length", 0))
+		except (TypeError, ValueError):
+			logging.warning("Content-Length header is missing or invalid.")
+
+		downloaded = 0
+		with open(path, "wb") as f:
+			response.raw.decode_content = True
+			for chunk in response.iter_content(chunk_size=4096):
+				if chunk:
+					f.write(chunk)
+					downloaded += len(chunk)
+					if self.progress_callback:
+						try:
+							self.progress_callback(
+								total=content_length or None,
+								bytes_transferred=downloaded,
+								path=path
+							)
+						except Exception as e:
+							logging.warning("Progress callback raised an exception!", exc_info=e)
 		return path.resolve()

{warp_beacon-2.6.71.dist-info → warp_beacon-2.6.73.dist-info}/METADATA

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

{warp_beacon-2.6.71.dist-info → warp_beacon-2.6.73.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=uGt3g_P9WpNr2EbbSgiCpFoZBN4pgUob2az4Jfl2tIE,24
+warp_beacon/__version__.py,sha256=pcqEX20h5-OvfcFaXCw9T_RvxXbCfPLtg2HQoD0TDBI,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
@@ -31,8 +31,8 @@ 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=2LfBmVdClSp1AdbJFGu_9CYjVeErGdurUvpz0JhAngk,17160
-warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=oN8re-17F43TEf6hdu8wC5QGUCiTsTFpdifvZwx3w7o,1854
+warp_beacon/scraper/instagram/instagram.py,sha256=c_7E0z1m728n9hOqWR3SXbGLW61a_wxG-GZsoue64tM,17153
+warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=1YMU6_PUa4g6usKU1EQPaWVw3c3ljxgoSh8BuhI8bsg,2911
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=sU1inNjg0dv96ae8pZennYfczE4u227RcpgulOtTNLw,13132
 warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
@@ -52,9 +52,9 @@ warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDH
 warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.71.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.71.dist-info/METADATA,sha256=8Z1QMYMn_-QEZYJvAu7PRVwwqFWxiSR3gjJ-hmZGW6E,22706
-warp_beacon-2.6.71.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-warp_beacon-2.6.71.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.71.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.6.71.dist-info/RECORD,,
+warp_beacon-2.6.73.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.73.dist-info/METADATA,sha256=R8mOW5t3RDBo1pFPLHjZmuHpaaTcv_4NooU2gCGPRps,22706
+warp_beacon-2.6.73.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+warp_beacon-2.6.73.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.73.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.6.73.dist-info/RECORD,,