warp-beacon 2.1.2__tar.gz → 2.1.4__tar.gz

{warp_beacon-2.1.2/warp_beacon.egg-info → warp_beacon-2.1.4}/PKG-INFO

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

{warp_beacon-2.1.2 → warp_beacon-2.1.4}/etc/warp_beacon.conf

@@ -5,7 +5,7 @@ TG_API_ID=""
 TG_API_HASH=""
 TG_BOT_NAME=""
 IG_MAX_RETRIES=10
-IG_REQUEST_TIMEOUT=60
+IG_REQUEST_TIMEOUT=30
 MONGODB_HOST="mongodb"
 MONGODB_PORT="27017"
 MONGODB_USER="root"

warp_beacon-2.1.4/warp_beacon/__version__.py

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

{warp_beacon-2.1.2 → warp_beacon-2.1.4}/warp_beacon/jobs/abstract.py

@@ -35,6 +35,7 @@ class JobSettings(TypedDict):
 	unvailable_error_count: int
 	geoblock_error_count: int
 	account_switches: int
+	yt_auth: bool
 
 class AbstractJob(ABC):
 	job_id: uuid.UUID = None
@@ -64,6 +65,7 @@ class AbstractJob(ABC):
 	unvailable_error_count: int = 0
 	geoblock_error_count: int = 0
 	account_switches: int = 0
+	yt_auth: bool = False
 
 	def __init__(self, **kwargs: Unpack[JobSettings]) -> None:
 		if kwargs:

{warp_beacon-2.1.2 → warp_beacon-2.1.4}/warp_beacon/scraper/__init__.py

@@ -328,8 +328,9 @@ class AsyncDownloader(object):
 	def notify_task_failed(self, job: DownloadJob) -> None:
 		self.uploader.queue_task(job.to_upload_job(job_failed=True))
 
-	def send_message_to_admin(self, text: str) -> None:
+	def send_message_to_admin(self, text: str, yt_auth: bool = False) -> None:
 		self.uploader.queue_task(UploadJob.build(
 			is_message_to_admin=True,
-			message_text=text
+			message_text=text,
+			yt_auth=yt_auth
 		))

{warp_beacon-2.1.2 → warp_beacon-2.1.4}/warp_beacon/scraper/instagram/instagram.py

@@ -37,7 +37,7 @@ class InstagramScraper(ScraperAbstract):
 		#
 		self.inst_session_file = INST_SESSION_FILE_TPL % self.account_index
 		self.cl = Client()
-		self.cl.request_timeout = int(os.environ.get("IG_REQUEST_TIMEOUT", default=60))
+		#self.cl.logger.setLevel(logging.DEBUG)
 		self.setup_device()
 		self.cl.challenge_code_handler = self.challenge_code_handler
 		self.cl.change_password_handler = self.change_password_handler
@@ -164,6 +164,7 @@ class InstagramScraper(ScraperAbstract):
 		return ret_val
 
 	def download_video(self, url: str, media_info: dict) -> dict:
+		self.cl.request_timeout = int(os.environ.get("IG_REQUEST_TIMEOUT", default=60))
 		path = self._download_hndlr(self.cl.video_download_by_url, url, folder='/tmp')
 		return {"local_media_path": str(path), "media_type": JobType.VIDEO, "media_info": {"duration": round(media_info.video_duration)}}
 

{warp_beacon-2.1.2 → warp_beacon-2.1.4}/warp_beacon/uploader/__init__.py

@@ -84,7 +84,7 @@ class AsyncUploader(object):
 					if job is self.__JOE_BIDEN_WAKEUP:
 						continue
 					if job.is_message_to_admin and job.message_text and self.admin_message_callback:
-						asyncio.ensure_future(self.admin_message_callback(job.message_text), loop=self.loop)
+						asyncio.ensure_future(self.admin_message_callback(job.message_text, job.yt_auth), loop=self.loop)
 						continue
 					path = ""
 					if job.media_type == JobType.COLLECTION:

{warp_beacon-2.1.2 → warp_beacon-2.1.4/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.1.2/warp_beacon/__version__.py

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