warp-beacon 2.4.6__tar.gz → 2.4.8__tar.gz

{warp_beacon-2.4.6/warp_beacon.egg-info → warp_beacon-2.4.8}/PKG-INFO

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

warp_beacon-2.4.8/warp_beacon/__version__.py

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

{warp_beacon-2.4.6 → warp_beacon-2.4.8}/warp_beacon/scraper/__init__.py

@@ -116,14 +116,13 @@ class AsyncDownloader(object):
 									time.sleep(2)
 									self.job_queue.put(job)
 									continue
-							actor = None
 							self.acc_selector.set_module(job.job_origin)
 							proxy = selector.get_current_proxy()
 							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")):
+								if selector.get_ig_request_count() >= int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="10")):
 									logging.info("The account request limit has been reached. Selecting the next account.")
 									selector.reset_ig_request_count()
 									selector.next()
@@ -379,6 +378,9 @@ class AsyncDownloader(object):
 						logging.error("Error inside download worker!")
 						logging.exception(e)
 						self.notify_task_failed(job)
+					finally:
+						if actor:
+							actor.restore_gai()
 				except Empty:
 					pass
 			except Exception as e:

{warp_beacon-2.4.6 → warp_beacon-2.4.8}/warp_beacon/scraper/abstract.py

@@ -92,5 +92,7 @@ class ScraperAbstract(ABC):
 		urllib3_cn.allowed_gai_family = allowed_gai_family
 
 	def restore_gai(self) -> None:
-		logging.info("Restoring normal IP stack ...")
-		urllib3_cn.allowed_gai_family = self.original_gai_family
+		if self.original_gai_family:
+			logging.info("Restoring normal IP stack ...")
+			urllib3_cn.allowed_gai_family = self.original_gai_family
+			self.original_gai_family = None

{warp_beacon-2.4.6 → warp_beacon-2.4.8}/warp_beacon/scraper/instagram/instagram.py

@@ -14,6 +14,7 @@ import urllib3
 from urllib.parse import urljoin, urlparse
 
 from instagrapi import exceptions
+from instagrapi.exceptions import UnknownError as IGUnknownError
 from instagrapi.mixins.story import Story
 from instagrapi.types import Media
 from instagrapi import Client
@@ -301,13 +302,13 @@ class InstagramScraper(ScraperAbstract):
 					logging.info("Stories download mode")
 					res.append(self.download_stories(self.scrap_stories(media_id)))
 				break
-			except PleaseWaitFewMinutes as e:
+			except exceptions.PleaseWaitFewMinutes as e:
 				logging.warning("Please wait a few minutes error.")
 				logging.exception(e)
 				if os.path.exists(self.inst_session_file):
 					os.unlink(self.inst_session_file)
 				raise IGRateLimitOccurred("Instagram ratelimit")
-			except (MediaNotFound, ClientNotFoundError, UserNotFound) as e:
+			except (exceptions.MediaNotFound, exceptions.ClientNotFoundError, exceptions.UserNotFound) as e:
 				raise NotFound(extract_exception_message(e))
 			except IGUnknownError as e:
 				raise UnknownError(extract_exception_message(e))

{warp_beacon-2.4.6 → warp_beacon-2.4.8/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.4.6/warp_beacon/__version__.py

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