warp-beacon 2.3.50__tar.gz → 2.3.52__tar.gz

{warp_beacon-2.3.50/warp_beacon.egg-info → warp_beacon-2.3.52}/PKG-INFO

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

warp_beacon-2.3.52/warp_beacon/__version__.py

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

{warp_beacon-2.3.50 → warp_beacon-2.3.52}/warp_beacon/scraper/__init__.py

@@ -121,6 +121,11 @@ class AsyncDownloader(object):
 							if job.job_origin is Origin.INSTAGRAM:
 								from warp_beacon.scraper.instagram.instagram import InstagramScraper
 								actor = InstagramScraper(selector.get_current(), proxy)
+								selector.inc_ig_request_count()
+								if selector.get_ig_request_count() >= int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="20")):
+									logging.info("The account request limit has been reached. Selecting the next account.")
+									selector.reset_ig_request_count()
+									selector.next()
 							elif job.job_origin is Origin.YT_SHORTS:
 								from warp_beacon.scraper.youtube.shorts import YoutubeShortsScraper
 								actor = YoutubeShortsScraper(selector.get_current(), proxy)

{warp_beacon-2.3.50 → warp_beacon-2.3.52}/warp_beacon/scraper/account_selector.py

@@ -23,6 +23,7 @@ class AccountSelector(object):
 	manager = None
 	account_index = {}
 	current_proxy = None
+	ig_request_count = None
 
 	def __init__(self, manager: multiprocessing.managers.SyncManager, acc_file_path: str, proxy_file_path: str=None) -> None:
 		self.manager = manager
@@ -31,6 +32,7 @@ class AccountSelector(object):
 			with open(acc_file_path, 'r', encoding="utf-8") as f:
 				self.accounts = json.loads(f.read())
 			if self.accounts:
+				self.ig_request_count = self.manager.Value('i', 0)
 				self.__init_meta_data()
 				#self.load_yt_sessions()
 				for acc_type, _ in self.accounts.items():
@@ -170,4 +172,13 @@ class AccountSelector(object):
 		module_name = 'youtube' if next((s for s in ("yt", "youtube", "youtu_be") if s in mod_name.value), None) else 'instagram'
 		if module_name not in self.accounts:
 			return 0
-		return len(self.accounts[module_name])
+		return len(self.accounts[module_name])
+	
+	def inc_ig_request_count(self) -> None:
+		self.ig_request_count.value += 1
+
+	def reset_ig_request_count(self) -> None:
+		self.ig_request_count.value = 0
+
+	def get_ig_request_count(self) -> int:
+		return self.ig_request_count.value

{warp_beacon-2.3.50 → warp_beacon-2.3.52}/warp_beacon/scraper/youtube/abstract.py

@@ -212,14 +212,15 @@ class YoutubeAbstract(ScraperAbstract):
 				# do noting, not interested
 				pass
 			#except http.client.IncompleteRead as e:
+			except KeyError:
+				raise Unavailable("Library failed")
 			except (socket.timeout,
 					ssl.SSLError,
 					http.client.IncompleteRead,
 					http.client.HTTPException,
 					requests.RequestException,
 					urllib.error.URLError,
-					urllib.error.HTTPError,
-					KeyError) as e:
+					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))
 				logging.warning("Youtube read timeout! Retrying in '%d' seconds ...", pause_secs)

{warp_beacon-2.3.50 → warp_beacon-2.3.52}/warp_beacon/scraper/youtube/shorts.py

@@ -42,4 +42,24 @@ class YoutubeShortsScraper(YoutubeAbstract):
 			"media_type": JobType.VIDEO
 		})
 
+		return res
+
+	def _download_yt_dlp(self, url: str, timeout: int = 60) -> list:
+		res = []
+		thumbnail = None
+		video_id = self.get_video_id(url)
+		if video_id:
+			thumbnail = self.download_hndlr(self.download_thumbnail, video_id)
+		with self.build_yt_dlp(timeout) as ydl:
+			info = ydl.extract_info(url, download=True)
+			local_file = ydl.prepare_filename(info)
+			logging.debug("Temp filename: '%s'", local_file)
+			res.append({
+				"local_media_path": local_file,
+				"performer": info.get("uploader", "Unknown"),
+				"thumb": thumbnail,
+				"canonical_name": info.get("title", ''),
+				"media_type": JobType.VIDEO
+			})
+
 		return res

{warp_beacon-2.3.50 → warp_beacon-2.3.52/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.3.50/warp_beacon/__version__.py

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