warp-beacon 2.2.40__tar.gz → 2.2.42__tar.gz

{warp_beacon-2.2.40/warp_beacon.egg-info → warp_beacon-2.2.42}/PKG-INFO

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

warp_beacon-2.2.42/warp_beacon/__version__.py

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

{warp_beacon-2.2.40 → warp_beacon-2.2.42}/warp_beacon/scheduler/scheduler.py

@@ -15,7 +15,7 @@ class IGScheduler(object):
 	running = True
 	thread = None
 	event = None
-	state = {"remaining": randrange(6800, 20800)}
+	state = {"remaining": randrange(8400, 26200)}
 
 	def __init__(self, downloader: warp_beacon.scraper.AsyncDownloader) -> None:
 		self.downloader = downloader
@@ -82,7 +82,7 @@ class IGScheduler(object):
 		while self.running:
 			try:
 				if self.state["remaining"] <= 0:
-					self.state["remaining"] = randrange(6800, 20800)
+					self.state["remaining"] = randrange(8400, 26200)
 					logging.info("Next scheduler activity in '%s' seconds", self.state["remaining"])
 
 				start_time = time.time()

{warp_beacon-2.2.40 → warp_beacon-2.2.42}/warp_beacon/scraper/instagram/instagram.py

@@ -240,7 +240,6 @@ class InstagramScraper(ScraperAbstract):
 		wait_timeout = int(os.environ.get("IG_WAIT_TIMEOUT", default=60))
 		timeout_increment = int(os.environ.get("IG_TIMEOUT_INCREMENT", default=30))
 		ratelimit_threshold = int(os.environ.get("IG_RATELIMIT_TRESHOLD", default=3))
-		please_wait_few_minutes_count = 1
 		while True:
 			try:
 				scrap_type, media_id = self.scrap(url)
@@ -262,27 +261,9 @@ class InstagramScraper(ScraperAbstract):
 					res.append(self.download_stories(self.scrap_stories(media_id)))
 				break
 			except PleaseWaitFewMinutes as e:
-				please_wait_few_minutes_count += 1
-				logging.warning("Please wait a few minutes error. Trying to relogin ...")
+				logging.warning("Please wait a few minutes error.")
 				logging.exception(e)
-				if please_wait_few_minutes_count >= ratelimit_threshold:
-					logging.warning("IG ratelimit occurred")
-					raise IGRateLimitOccurred()
-				wait_timeout += timeout_increment
-				logging.info("Waiting %d seconds according configuration option `IG_WAIT_TIMEOUT` with `IG_TIMEOUT_INCREMENT`", wait_timeout)
-				if res:
-					for i in res:
-						if i["media_type"] == JobType.COLLECTION:
-							for j in i["items"]:
-								if os.path.exists(j["local_media_path"]):
-									os.unlink(j["local_media_path"])
-						else:
-							if os.path.exists(i["local_media_path"]):
-								os.unlink(i["local_media_path"])
-				if os.path.exists(self.inst_session_file):
-					os.unlink(self.inst_session_file)
-				self.login()
-				time.sleep(wait_timeout)
+				raise IGRateLimitOccurred("Instagram ratelimit")
 			except (MediaNotFound, ClientNotFoundError, UserNotFound) as e:
 				raise NotFound(extract_exception_message(e))
 			except IGUnknownError as e:

{warp_beacon-2.2.40 → warp_beacon-2.2.42}/warp_beacon/scraper/youtube/abstract.py

@@ -13,7 +13,7 @@ import http.client
 from PIL import Image
 
 from warp_beacon.scraper.abstract import ScraperAbstract
-#from warp_beacon.mediainfo.abstract import MediaInfoAbstract
+from warp_beacon.mediainfo.abstract import MediaInfoAbstract
 from warp_beacon.scraper.exceptions import TimeOut, Unavailable, extract_exception_message
 
 from pytubefix import YouTube
@@ -132,7 +132,7 @@ class YoutubeAbstract(ScraperAbstract):
 		return size[0] // gcd, size[1] // gcd
 
 	def download_thumbnail(self, video_id: str, timeout: int) -> Optional[io.BytesIO]:
-		for i in ("https://img.youtube.com/vi/{VIDEO_ID}/maxresdefault.jpg",
+		for i in (#"https://img.youtube.com/vi/{VIDEO_ID}/maxresdefault.jpg",
 				"https://img.youtube.com/vi/{VIDEO_ID}/hqdefault.jpg",
 				"https://img.youtube.com/vi/{VIDEO_ID}/sddefault.jpg"):
 			try:
@@ -145,7 +145,7 @@ class YoutubeAbstract(ScraperAbstract):
 						logging.info("thumb ratio: '%s'", ratio)
 						new_image = None
 						if ratio[1] > 4:
-							new_image = image.thumbnail((320, 320), Image.Resampling.LANCZOS)
+							new_image = MediaInfoAbstract.shrink_image_to_fit(image)
 						else:
 							new_image = self.calculate_size_with_padding(image, ratio[0], ratio[1])
 						logging.info("thumb size: '%s'", new_image.size)

{warp_beacon-2.2.40 → warp_beacon-2.2.42/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.40/warp_beacon/__version__.py

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