warp-beacon 2.2.41__py3-none-any.whl → 2.2.43__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.2.41"
+__version__ = "2.2.43"
 

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/scraper/instagram/instagram.py

@@ -237,10 +237,6 @@ class InstagramScraper(ScraperAbstract):
 
 	def download(self, url: str) -> Optional[list[dict]]:
 		res = []
-		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 +258,11 @@ 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/scraper/youtube/abstract.py

@@ -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:

{warp_beacon-2.2.41.dist-info → warp_beacon-2.2.43.dist-info}/METADATA

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

{warp_beacon-2.2.41.dist-info → warp_beacon-2.2.43.dist-info}/RECORD

@@ -3,7 +3,7 @@ lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuww
 var/warp_beacon/accounts.json,sha256=2QQMS9N_Z-TnfZq4U1vSUe4IKyZGmTFdgo8BoF4hQ7E,1710
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=v4sfYmD-qFoi7A84qOr_mEge3Stn2hH06dTMZM_o0pM,24
+warp_beacon/__version__.py,sha256=VYrKnMHcUgxAj080HTcp3pbxJOw9uuwy_WXL5wx3DHk,24
 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
@@ -18,15 +18,15 @@ warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-Z
 warp_beacon/mediainfo/silencer.py,sha256=MgUc9Ibbhjhg9GbJMNfJqrdDkMsQShZkQ1sCwvW_-qI,1647
 warp_beacon/mediainfo/video.py,sha256=DXHiWAOyJPSVXQ0OP7uOBikUFT7noFmMaMSIx04Mhs4,2506
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scheduler/scheduler.py,sha256=oKuDP3RqUQmNYBorKxnhz9QqA-eLTJHVTinWbsYB530,2585
+warp_beacon/scheduler/scheduler.py,sha256=F9jF6myIHOI0TmC0-rBt2Un8gVvuhBW9zL-nEAEj0Bc,2585
 warp_beacon/scraper/__init__.py,sha256=58zSy74g1LY02HLEwP497a3ABg7f_LGxR6peKSt8dpI,15808
 warp_beacon/scraper/abstract.py,sha256=aNZ9ypF9B8BjflcIwi-7wEzIqF-XPeF0xvfX9CP_iIw,2708
 warp_beacon/scraper/account_selector.py,sha256=MbDJRuHr-1ebWwzEg4tTXuEZWAuwpJsgo0lI-LXEzVM,3552
 warp_beacon/scraper/exceptions.py,sha256=fHywTm2-y2RkgM6hVz12CkDMBgHcEoN2a1TBLaVM2t4,1300
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/instagram/instagram.py,sha256=D_r6Kdpe4iBjCeGv-vVIodiVnZps6ZyBbaY0JC7mGWI,13782
+warp_beacon/scraper/instagram/instagram.py,sha256=m2bAqLu-_HchlF5CVZDlytB9cFGxrN7EEbQW-G1f5u4,12857
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=K3XPfY3IJ413Yo3AQIP_MFbWWdHHCcoE9yO1qlqLjLI,7857
+warp_beacon/scraper/youtube/abstract.py,sha256=4Le9xA0OF7yidpGXnhwT4bVdW04zlNUIDFPOgEgFjbo,7858
 warp_beacon/scraper/youtube/music.py,sha256=nbTDFdgXGbTNqttE828DEgvSc8-SuAsQAHeqUwU6yFM,1484
 warp_beacon/scraper/youtube/shorts.py,sha256=RqMYDq4XHChtp-LdlxXyHej4h3NI3Qi9T8USxwk-pIk,1177
 warp_beacon/scraper/youtube/youtube.py,sha256=JvN5pVz0jtxCY9FGMl1dIg5Ccr2Kulaoxtym0Vb1QwQ,2224
@@ -37,9 +37,9 @@ warp_beacon/telegram/handlers.py,sha256=xSNG_v4D4FaA5q1_5wXvJkjcDUhy5GaQnfpijJZp
 warp_beacon/telegram/placeholder_message.py,sha256=32U-R_IMPRJd-S5UwlpemLkArJOxCmO7whcynduSbMA,6418
 warp_beacon/telegram/utils.py,sha256=CeWXMwyzv2l4Af6I-wW2ySU490c-5k82sBhkjabv0n4,2452
 warp_beacon/uploader/__init__.py,sha256=rbfsm_eYcfsBRkiaG0glVgBNtQCEe7cVQTWEIAHz5aw,4763
-warp_beacon-2.2.41.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.2.41.dist-info/METADATA,sha256=IsoJnewU0KddA7kJBEbXoqvQS6kDPeJjEssoI1oj0jE,21251
-warp_beacon-2.2.41.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-warp_beacon-2.2.41.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.2.41.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
-warp_beacon-2.2.41.dist-info/RECORD,,
+warp_beacon-2.2.43.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.2.43.dist-info/METADATA,sha256=dnpjnar72HRXAR0g9DqYSljvgOqjO2JDy7YQ9SJ1hSI,21251
+warp_beacon-2.2.43.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+warp_beacon-2.2.43.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.2.43.dist-info/top_level.txt,sha256=ALb_Ft_eG-OY4_m0TWUifNUOZsrx483L-zw7G7vqXoc,971
+warp_beacon-2.2.43.dist-info/RECORD,,