warp-beacon 2.8.7__py3-none-any.whl → 2.8.9__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.8.7"
+__version__ = "2.8.9"
 

warp_beacon/scheduler/scheduler.py

@@ -156,8 +156,8 @@ class IGScheduler(object):
 				self.state["remaining"] -= elapsed
 
 				if self.running:
-					if self.state["remaining"] <= 0:
-						self.validate_ig_session()
+					#if self.state["remaining"] <= 0:
+					#	self.validate_ig_session()
 					if yt_expires <= time.time() + 60:
 						self.validate_yt_session()
 				self.save_state()

warp_beacon/scraper/instagram/instagram.py

@@ -135,6 +135,7 @@ class InstagramScraper(ScraperAbstract):
 		return inst_human.operations_count
 	
 	def scroll_content(self, last_pk: int) -> None:
+		return
 		from warp_beacon.scheduler.instagram_human import InstagramHuman
 		self.load_session()
 		inst_human = InstagramHuman(self)

warp_beacon/telegram/bot.py

@@ -195,23 +195,24 @@ class Bot(object):
 
 		return []
 
-	def build_signature_caption(self, job: UploadJob) -> str:
+	def build_signature_caption(self, job: UploadJob, override_canonical_name: str = None) -> str:
 		caption = ""
 		is_group = job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP)
 		is_youtube = job.job_origin in (Origin.YOUTUBE, Origin.YT_SHORTS)
-		if job.canonical_name:
-			if is_group and not is_youtube and CaptionShortner.need_short(job.canonical_name):
-				caption = f"{html.escape(CaptionShortner.smart_truncate_html(job.canonical_name))} ..."
+		effective_canonical_name = override_canonical_name or job.canonical_name
+		if effective_canonical_name:
+			if is_group and not is_youtube and CaptionShortner.need_short(effective_canonical_name):
+				caption = f"{html.escape(CaptionShortner.smart_truncate_html(effective_canonical_name))} ..."
 				job.short_text = True
 			elif is_group:
 				# short enough
-				caption = html.escape(job.canonical_name)
+				caption = html.escape(effective_canonical_name)
 			# Captions only for YouTube in groups; empty otherwise.
 			# Might be too long for Telegram, so we skip them.
 			if is_youtube and is_group:
-				caption = f"<b>{html.escape(job.canonical_name)}</b>"
+				caption = f"<b>{html.escape(effective_canonical_name)}</b>"
 		if is_group:
-			if job.canonical_name:
+			if effective_canonical_name:
 				caption += "\n—\n"
 			if job.message_leftover:
 				caption += job.message_leftover
@@ -371,20 +372,20 @@ class Bot(object):
 								height=j.media_info["height"],
 								duration=round(j.media_info["duration"]),
 								thumb=j.media_info["thumb"],
-								caption=self.build_signature_caption(j)
+								caption=self.build_signature_caption(job, j.canonical_name)
 							)
 							tg_chunk.append(vid)
 						elif j.media_type == JobType.IMAGE:
 							photo = InputMediaPhoto(
 								media=j.local_media_path,
-								caption=self.build_signature_caption(j)
+								caption=self.build_signature_caption(job, j.canonical_name)
 							)
 							tg_chunk.append(photo)
 						elif j.media_type == JobType.ANIMATION:
 							anim = InputMediaAnimation(
 								media=j.local_media_path,
 								thumb=j.media_info["thumb"],
-								caption=self.build_signature_caption(j),
+								caption=self.build_signature_caption(job, j.canonical_name),
 								width=j.media_info["width"],
 								height=j.media_info["height"],
 								duration=round(j.media_info["duration"])

warp_beacon/telegram/handlers.py

@@ -99,6 +99,17 @@ class Handlers(object):
 								origin=job.job_origin.value,
 								canonical_name=job.canonical_name
 							)
+				elif job.media_type == JobType.COLLECTION:
+					common_canonical_name = job.canonical_name
+					if not common_canonical_name and job.media_collection:
+						common_canonical_name = job.media_collection[0].canonical_name
+					self.storage.add_media(
+						tg_file_ids=[','.join(tg_file_ids)],
+						media_url=job.url,
+						media_type=job.media_type.value,
+						origin=job.job_origin.value,
+						canonical_name=common_canonical_name
+					)
 				else:
 					self.storage.add_media(
 						tg_file_ids=[','.join(tg_file_ids)],
@@ -196,7 +207,8 @@ class Handlers(object):
 								user_id=message.from_user.id,
 								chat_type=message.chat.type,
 								source_username=Utils.extract_message_author(message),
-								message_leftover=msg_leftover
+								message_leftover=msg_leftover,
+								canonical_name=entities[0]["canonical_name"]
 							)
 						)
 					elif ent_len:

{warp_beacon-2.8.7.dist-info → warp_beacon-2.8.9.dist-info}/METADATA

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

{warp_beacon-2.8.7.dist-info → warp_beacon-2.8.9.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=00A1M6wv0dduOTCIML8mGO3RbFgrzMpBdelbbE01C5s,23
+warp_beacon/__version__.py,sha256=md0YBDrhdUgt8TcwgCc67iunpMONlJmrCV_qz4eMXhQ,23
 warp_beacon/warp_beacon.py,sha256=ADCR30uGXIsDrt9WoiI9Ghu2QtWs0qZIK6x3pQKM_B4,1109
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,7 +21,7 @@ warp_beacon/mediainfo/silencer.py,sha256=qxMuViOoVwUYb60uCVvqHiGrqByR1_4_rqMT-Xd
 warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tEI,2480
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scheduler/instagram_human.py,sha256=lOytnonvqtB_8z6TVzrVJ1prqqgE4fktZZl-xpn7SOA,12951
-warp_beacon/scheduler/scheduler.py,sha256=Bf4sGXjX75Dox3q-yzUHhagtzUAj3hl5GzfnZya-_io,4995
+warp_beacon/scheduler/scheduler.py,sha256=0u9AIr9fTBmjU1GpOwKlPuNLskeJ4A-S2uAUzb-qO6w,4997
 warp_beacon/scraper/__init__.py,sha256=o9-HQEf4yQVNtWuJN4NcLUovejiHhP_KkQ1Xf5EaQvU,20670
 warp_beacon/scraper/abstract.py,sha256=pWbaTu-gDZgi-iFjqMR_uGzPl5KLv-4gTdJ9w6cD4sk,3802
 warp_beacon/scraper/account_selector.py,sha256=n-466AiTXZ8o5cgcNkNwNiWLoi-EkLC7bHh6El1eIF8,10274
@@ -35,7 +35,7 @@ warp_beacon/scraper/X/abstract.py,sha256=pCzZPTCtn8pRbBx2SeuBUpMkEHqnOLtwLBAHYce
 warp_beacon/scraper/X/types.py,sha256=i36Nu2cHpHCkvoeobBQC3B13Ke_N40tgCCApcm_FBFY,76
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
-warp_beacon/scraper/instagram/instagram.py,sha256=1U6uupfFQZSEQQxg3nEq3WR1P9Bv1d6sfUYjoiIJMj4,18740
+warp_beacon/scraper/instagram/instagram.py,sha256=5rD8kPBk6j59a7Wi1TL6W04KHX6zNO1QYMo3H1OsJHQ,18749
 warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=TgpCjFudeEf2VN0qKgaurFcHECsAlqDc1vM4t7tMScs,9202
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=7CVR2fW6bpWYYKcveRddd6XlgDsfV_Pp3dqV2LpefSc,16088
@@ -45,20 +45,20 @@ warp_beacon/scraper/youtube/youtube.py,sha256=uYR7XpfP6ZnSvw1Gc4qG_M8jkCyv3maEyt
 warp_beacon/storage/__init__.py,sha256=NaKKPXjwa8LvWsqnVJVz0riXj765lGswG9piKgI2lkY,3389
 warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/telegram/bot.py,sha256=ZuHHTvyL_9OVcmS_Xm2YIwjot6nd-3JTOMex9sfLQd8,19572
+warp_beacon/telegram/bot.py,sha256=N4Gswpw-U8Z6yPAKMe7zVfDQSRAgvm6Sx6k5_Y7WWoI,19780
 warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
 warp_beacon/telegram/download_status.py,sha256=N-Qg13LVcPskyQNKG1lw50K1lhFtXu003muCRzZ7wiE,1561
 warp_beacon/telegram/edit_message.py,sha256=6DX8eJV70MG_b79WbuJG55qLBs66boElzYdCr8zpMeI,5380
-warp_beacon/telegram/handlers.py,sha256=MjferRTVEjBvVQBbIs3Usuxbc-tFtCA5TL1YQSgSy58,9945
+warp_beacon/telegram/handlers.py,sha256=swJdQuCDaHkdTpyOWd6JlZoMZJRb_qN7sJYyT72cjzw,10444
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/progress_bar.py,sha256=IP4xtvLtdJtqdr2C-0YaU428iQGrKurbP4Npr31iW74,5014
 warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
 warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
 warp_beacon/telegram/utils.py,sha256=zTF8VQfAWetBSjAPbmNe_Zi_LN5fAcWptJKjLaFNHaE,5073
 warp_beacon/uploader/__init__.py,sha256=1enK6qMWaTZEaK456JwaKOfvCvznHA8cjgceOsrF6Po,5732
-warp_beacon-2.8.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.8.7.dist-info/METADATA,sha256=girgsQc8A85LcGI1wMhVKoQkhKUaO4gHsWtQApuHZy0,23214
-warp_beacon-2.8.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-warp_beacon-2.8.7.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.8.7.dist-info/top_level.txt,sha256=RraB0PWGvRK2zPYkuICKNgStLG1C5s7rPHHJEHJbkgA,1510
-warp_beacon-2.8.7.dist-info/RECORD,,
+warp_beacon-2.8.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.8.9.dist-info/METADATA,sha256=hqGuFzg88wH_rVpMb1vUm-uUEiHH-ZbycnTRMA8Bx9M,23214
+warp_beacon-2.8.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+warp_beacon-2.8.9.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.8.9.dist-info/top_level.txt,sha256=RraB0PWGvRK2zPYkuICKNgStLG1C5s7rPHHJEHJbkgA,1510
+warp_beacon-2.8.9.dist-info/RECORD,,