warp-beacon 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.0.4"
+__version__ = "2.0.6"
 

warp_beacon/scraper/__init__.py

@@ -5,7 +5,7 @@ from typing import Optional
 import multiprocessing
 from queue import Empty
 
-from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, FileTooBig
+from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, Unavailable, FileTooBig, YotubeLiveError
 from warp_beacon.mediainfo.video import VideoInfo
 from warp_beacon.mediainfo.audio import AudioInfo
 from warp_beacon.mediainfo.silencer import Silencer
@@ -115,6 +115,14 @@ class AsyncDownloader(object):
 											job_failed_msg="Unfortunately this file has exceeded the Telegram limits. A file cannot be larger than 2 gigabytes.")
 										)
 										break
+									except YotubeLiveError as e:
+										logging.warning("Youtube Live videos are not supported. Skipping.")
+										logging.exception(e)
+										self.uploader.queue_task(job.to_upload_job(
+											job_failed=True,
+											job_failed_msg="Youtube Live videos are not supported. Please wait until the live broadcast ends.")
+										)
+										break
 									except (UnknownError, Exception) as e:
 										logging.warning("UnknownError occurred!")
 										logging.exception(e)

warp_beacon/scraper/abstract.py

@@ -5,6 +5,7 @@ from abc import ABC, abstractmethod
 from typing import Callable, Union
 
 from PIL import Image
+from pillow_heif import register_heif_opener
 
 import logging
 
@@ -41,4 +42,21 @@ class ScraperAbstract(ABC):
 
 		return ''
 
+	@staticmethod
+	def convert_heic_to_png(src_file: str) -> str:
+		try:
+			if os.path.exists(src_file):
+				register_heif_opener()
+				path_info = pathlib.Path(src_file)
+				old_filename = path_info.stem
+				new_filename = "%s_converted.%s" % (old_filename, "png")
+				new_filepath = "%s/%s" % (os.path.dirname(src_file), new_filename)
+				with Image.open(src_file).convert('RGB') as img:
+					img.save(new_filepath, 'png')
+				os.unlink(src_file)
+				return new_filepath
+		except Exception as e:
+			logging.error("Failed to convert webp file to png!")
+			logging.exception(e)
 
+		return ''

warp_beacon/scraper/exceptions.py

@@ -28,6 +28,9 @@ class NotFound(ScraperError):
 class Unavailable(ScraperError):
 	pass
 
+class YotubeLiveError(ScraperError):
+	pass
+
 class UnknownError(ScraperError):
 	pass
 

warp_beacon/scraper/instagram.py

@@ -126,8 +126,11 @@ class InstagramScraper(ScraperAbstract):
 
 	def download_photo(self, url: str) -> dict:
 		path = str(self._download_hndlr(self.cl.photo_download_by_url, url, folder='/tmp'))
-		if ".webp" in path:
+		path_lowered = path.lower()
+		if ".webp" in path_lowered:
 			path = InstagramScraper.convert_webp_to_png(path)
+		if ".heic" in path_lowered:
+			path = InstagramScraper.convert_heic_to_png(path)
 		return {"local_media_path": path, "media_type": JobType.IMAGE}
 	
 	def download_story(self, story_info: Story) -> dict:
@@ -142,8 +145,10 @@ class InstagramScraper(ScraperAbstract):
 		effective_url = "https://www.instagram.com/stories/%s/%s/" % (story_info.user.username, effective_story_id)
 		if story_info.media_type == 1: # photo
 			path = str(self._download_hndlr(self.cl.story_download_by_url, url=story_info.thumbnail_url, folder='/tmp'))
-			if ".webp" in path:
+			if ".webp" in path_lowered:
 				path = InstagramScraper.convert_webp_to_png(path)
+			if ".heic" in path_lowered:
+				path = InstagramScraper.convert_heic_to_png(path)
 			media_type = JobType.IMAGE
 		elif story_info.media_type == 2: # video
 			path = str(self._download_hndlr(self.cl.story_download_by_url, url=story_info.video_url, folder='/tmp'))

warp_beacon/scraper/youtube/youtube.py

@@ -1,5 +1,6 @@
 from warp_beacon.jobs.types import JobType
 from warp_beacon.scraper.youtube.abstract import YoutubeAbstract
+from warp_beacon.scraper.exceptions import YotubeLiveError, NotFound
 
 from pytubefix import YouTube
 
@@ -11,29 +12,53 @@ class YoutubeScraper(YoutubeAbstract):
 	YT_TIMEOUT_DEFAULT = 2
 	YT_TIMEOUT_INCREMENT_DEFAULT = 60
 
+	def is_live(self, data: dict) -> bool:
+		'''
+		x.contents.twoColumnWatchNextResults.results.results.contents[0].videoPrimaryInfoRenderer.viewCount.videoViewCountRenderer.isLive
+		'''
+		try:
+			contents = data.get("contents", {}).get("twoColumnWatchNextResults", {}).get("results", {}).get("results", {}).get("contents", [])
+			for i in contents:
+				video_view_count_renderer = i.get("videoPrimaryInfoRenderer", {}).get("viewCount", {}).get("videoViewCountRenderer", {})
+				if video_view_count_renderer:
+					return video_view_count_renderer.get("isLive", False)
+		except Exception as e:
+			logging.warning("Failed to check if stream is live!")
+			logging.exception(e)
+
+		return False
+
 	def _download(self, url: str, timeout: int = 0) -> list:
 		res = []
 		thumbnail = None
 		yt = YouTube(url)
+
+		if self.is_live(yt.initial_data):
+			raise YotubeLiveError("Youtube Live is not supported")
+
 		if yt and yt.thumbnail_url:
 			thumbnail = self.download_thumbnail(yt.thumbnail_url)
+
 		stream = yt.streams.get_highest_resolution()
-		if stream:
-			local_file = stream.download(
-				output_path=self.DOWNLOAD_DIR,
-				max_retries=0,
-				timeout=timeout,
-				skip_existing=False,
-				filename_prefix="yt_download_"
-			)
-			logging.debug("Temp filename: '%s'", local_file)
-			res.append({
-				"local_media_path": self.rename_local_file(local_file),
-				"performer": yt.author,
-				"thumb": thumbnail,
-				"canonical_name": stream.title,
-				"media_type": JobType.VIDEO
-			})
+
+		if not stream:
+			raise NotFound("No suitable video stream found")
+
+		local_file = stream.download(
+			output_path=self.DOWNLOAD_DIR,
+			max_retries=0,
+			timeout=timeout,
+			skip_existing=False,
+			filename_prefix="yt_download_"
+		)
+		logging.debug("Temp filename: '%s'", local_file)
+		res.append({
+			"local_media_path": self.rename_local_file(local_file),
+			"performer": yt.author,
+			"thumb": thumbnail,
+			"canonical_name": stream.title,
+			"media_type": JobType.VIDEO
+		})
 
 		return res
 

{warp_beacon-2.0.4.dist-info → warp_beacon-2.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: warp_beacon
-Version: 2.0.4
+Version: 2.0.6
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev
@@ -228,6 +228,7 @@ Requires-Dist: ffmpeg-python
 Requires-Dist: uvloop
 Requires-Dist: tgcrypto
 Requires-Dist: pyrogram
+Requires-Dist: pillow-heif
 Requires-Dist: pytubefix
 Requires-Dist: av
 Requires-Dist: urlextract
@@ -242,7 +243,12 @@ Works with a links in personal messages and also with group chats.
 
 Just send a media link to the chat with bot and get a video or audio reply.
 
-<img width="549" alt="image" src="https://github.com/user-attachments/assets/6d1cf0d8-4aa9-4852-90c9-6817974a7dd9">
+| | | |
+|:-------------------------:|:-------------------------:|:-------------------------:|
+|<img width="700" alt="Yotube Video usage example" src="https://github.com/user-attachments/assets/280b058f-325b-4386-9556-f145f6db9cfa"> Yotube Video usage example |<img width="700" alt="Youtube Music usage example" src="https://github.com/user-attachments/assets/3a462a3b-8c80-460f-aa66-c39db24f7a24"> Youtube Music usage example|<img width="703" alt="image" src="https://github.com/user-attachments/assets/384206ea-1371-48d5-a717-92aff06fa339"> Instagram Reels usage example |
+|<img width="700" alt="Instagram Photo post usage example" src="https://github.com/user-attachments/assets/29324b94-7314-4a38-8790-3483011d355d"> Instagram Photo post usage example|<img width="700" alt="Instagram Photo Carousel usage" src="https://github.com/user-attachments/assets/2598e329-e16e-455e-91e9-a027e8994283"> Instagram Photo Carousel usage example|<img width="757" alt="Instagram Photo bulk Strories download usage example" src="https://github.com/user-attachments/assets/2c8c91ac-6ade-4d1d-a677-2b36bb40ff39"> Instagram Photo bulk Strories download usage example|
+|<img width="700" alt="Instagram specific Story download usage example" src="https://github.com/user-attachments/assets/03dc70c5-6933-4122-9c7c-5f7d734d117b"> Instagram specific Story download usage example|<img width="700" alt="Group chat usage example" src="https://github.com/user-attachments/assets/649fcb1e-785b-4efd-9153-69644c6d898b"> Group chat usage example|
+
 
 In order to setup your own instance, you will need:
 
@@ -320,6 +326,16 @@ Check logs
 ```bash
 sudo docker compose logs warp_beacon -f
 ```
+## Upgrading ##
+If you are using `image-prod` (set in `docker-compose.yml` by default), just rebuild your image:
+```bash
+cd your_warp_beacon_sources_directory/
+sudo docker compose build --no-cache
+```
+Recreate existing container:
+```bash
+sudo docker compose up -d
+```
 
 ## How to install from PIP ##
 

{warp_beacon-2.0.4.dist-info → warp_beacon-2.0.6.dist-info}/RECORD

@@ -2,7 +2,7 @@ etc/warp_beacon/warp_beacon.conf,sha256=xihOuNBqVXGNdmMO14wwYNrqSQ4Z1wlAjp-xJk5S
 lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuwwPfa2mDLUA,372
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/__version__.py,sha256=xiJvazFqLHY3NrizxeBtVSpbJqQHaThFbXg5e2xEE48,23
+warp_beacon/__version__.py,sha256=ycdCnd2XTie5w0oCnBhoWDLIIgj5v308ri5GainqujU,23
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -16,15 +16,15 @@ warp_beacon/mediainfo/abstract.py,sha256=ZR2JMuRpoh7nDNov9a8YkAfr6BI2HXnXzQtVrLg
 warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-ZM,651
 warp_beacon/mediainfo/silencer.py,sha256=yn9w1LVHG8JQy_D45_RzrlEWID1zbj3ecx7nYGUP4ZE,1647
 warp_beacon/mediainfo/video.py,sha256=AIRy_op_BvehsjarM1rvT5Qo0QWwf-Q6xVVd_aCnbJ4,2505
-warp_beacon/scraper/__init__.py,sha256=Ef24SqcD-dV12coPcSJaQC-fN2oOjH47S1nwsKTrtI4,9860
-warp_beacon/scraper/abstract.py,sha256=cxQxt5eQkieCZsgQwz425iF69pgCrWZ69ItlikPsWHc,1036
-warp_beacon/scraper/exceptions.py,sha256=9VJBK5ufokyUpT_q7XVFBYC8lK_BSBfo-S1pd6re9VY,1094
-warp_beacon/scraper/instagram.py,sha256=YDFdrSB1ghw9f43004lFyk2S5QTopFvpyoUYN-qOVdw,8335
+warp_beacon/scraper/__init__.py,sha256=zO6klAFVrA8z1HaYmSPZeN4ANI8phq7kwMF1zBw-QsA,10245
+warp_beacon/scraper/abstract.py,sha256=c4pjblhwnCdp_kGs0Zoq4k-VH_EpQBIqIGLN-PGdr60,1668
+warp_beacon/scraper/exceptions.py,sha256=9mXnk0sqnOJ3UmP-wc7dcKr_CuxRlrM6usXdQiQMzl8,1138
+warp_beacon/scraper/instagram.py,sha256=GCSuW5u77UUPIRAWDc8YtTO_kKNWsDAcNnh72tiEJjQ,8549
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=XnVhF1DVSYDMuZ34A6T9hyRlUhjJ7-_JPRF9TOaZ_eo,3358
 warp_beacon/scraper/youtube/music.py,sha256=Gg1J6QnvpplTOcT_KSiNFZAqZyMyy3Gjgo62e9VcRLM,1404
 warp_beacon/scraper/youtube/shorts.py,sha256=co4lpNTnncIEScVB9htAT2Hy4fvx56z5xgDo6scu6n4,1162
-warp_beacon/scraper/youtube/youtube.py,sha256=xIrGe2ElPo3889_w5128xCnkdgwG1u6lA-QoachMUfc,1104
+warp_beacon/scraper/youtube/youtube.py,sha256=oZGhQRNtQmx-PHzC5ZH8OvS4U7X_1U-eeoC68m5FXl0,2001
 warp_beacon/storage/__init__.py,sha256=8XsJXq9X7GDlTaWREF4W1PDX9PH5utwhjf5c5M8Bb7o,3378
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/telegram/bot.py,sha256=Jvude0RxL_-muB4uQtapeE2kNKxtWPdOuGgmBE7qSuA,12062
@@ -32,9 +32,9 @@ warp_beacon/telegram/handlers.py,sha256=7-uaRuUgOPAE0fX-fSbn0N02Pv5uELnEIBFxHPj3
 warp_beacon/telegram/placeholder_message.py,sha256=u5kVfTjGmVYkwA5opniRltHXGpsdSxI41WEde8J5os0,6418
 warp_beacon/telegram/utils.py,sha256=1tm_DH1F2snDxSqwZnKD4ijvTrobv_kscgt3w-bWa6g,2027
 warp_beacon/uploader/__init__.py,sha256=chX9oOrwO05O7DFmUfskTAnoKse66r3sY2s4NFF7bmM,4442
-warp_beacon-2.0.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.0.4.dist-info/METADATA,sha256=qLdBuZvEXCGX0a3ru-m965kk9rMxsQBFQg2N6RlZmBM,19287
-warp_beacon-2.0.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-warp_beacon-2.0.4.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.0.4.dist-info/top_level.txt,sha256=pu6xG8OO_nCGllnOfAZ6QpVfivtmHVxPlYK8SZzUDqA,840
-warp_beacon-2.0.4.dist-info/RECORD,,
+warp_beacon-2.0.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.0.6.dist-info/METADATA,sha256=eOmr5ABFh_1AwgLvi-qYyzt8b2BouniDzTfYVHd9cbY,20987
+warp_beacon-2.0.6.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+warp_beacon-2.0.6.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.0.6.dist-info/top_level.txt,sha256=pu6xG8OO_nCGllnOfAZ6QpVfivtmHVxPlYK8SZzUDqA,840
+warp_beacon-2.0.6.dist-info/RECORD,,