warp-beacon 2.8.6__py3-none-any.whl → 2.8.8__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. warp_beacon/__version__.py +1 -1
  2. warp_beacon/scheduler/scheduler.py +2 -2
  3. warp_beacon/scraper/X/X.py +3 -3
  4. warp_beacon/scraper/instagram/instagram.py +1 -0
  5. warp_beacon/telegram/bot.py +20 -9
  6. {warp_beacon-2.8.6.dist-info → warp_beacon-2.8.8.dist-info}/METADATA +1 -1
  7. {warp_beacon-2.8.6.dist-info → warp_beacon-2.8.8.dist-info}/RECORD +11 -11
  8. {warp_beacon-2.8.6.dist-info → warp_beacon-2.8.8.dist-info}/WHEEL +0 -0
  9. {warp_beacon-2.8.6.dist-info → warp_beacon-2.8.8.dist-info}/entry_points.txt +0 -0
  10. {warp_beacon-2.8.6.dist-info → warp_beacon-2.8.8.dist-info}/licenses/LICENSE +0 -0
  11. {warp_beacon-2.8.6.dist-info → warp_beacon-2.8.8.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.8.6"
1
+ __version__ = "2.8.8"
2
2
 
warp_beacon/scheduler/scheduler.py CHANGED
@@ -156,8 +156,8 @@ class IGScheduler(object):
156
156
  self.state["remaining"] -= elapsed
157
157
 
158
158
  if self.running:
159
- if self.state["remaining"] <= 0:
160
- self.validate_ig_session()
159
+ #if self.state["remaining"] <= 0:
160
+ # self.validate_ig_session()
161
161
  if yt_expires <= time.time() + 60:
162
162
  self.validate_yt_session()
163
163
  self.save_state()
warp_beacon/scraper/X/X.py CHANGED
@@ -100,7 +100,7 @@ class XScraper(XAbstract):
100
100
  chunk = []
101
101
  for media in media_chunk:
102
102
  chunk.append({
103
- "local_media_path": media,
103
+ "local_media_path": self.rename_local_file(media),
104
104
  "canonical_name": post_text,
105
105
  "media_type": JobType.IMAGE
106
106
  })
@@ -112,7 +112,7 @@ class XScraper(XAbstract):
112
112
  else:
113
113
  if local_file:
114
114
  res.append({
115
- "local_media_path": local_file,
115
+ "local_media_path": self.rename_local_file(local_file),
116
116
  "performer": media_info.get("uploader", "Unknown"),
117
117
  "canonical_name": post_text,
118
118
  "media_type": job_type
@@ -225,7 +225,7 @@ class XScraper(XAbstract):
225
225
  return " ".join(tweet_texts).strip()
226
226
  except Exception as e:
227
227
  logging.warning("Failed to extract tweet text.", exc_info=e)
228
-
228
+
229
229
  return ""
230
230
 
231
231
  def extract_image_urls_from_x_post(self, url: str, timeout: int = 60) -> tuple[list[str], str]:
warp_beacon/scraper/instagram/instagram.py CHANGED
@@ -135,6 +135,7 @@ class InstagramScraper(ScraperAbstract):
135
135
  return inst_human.operations_count
136
136
 
137
137
  def scroll_content(self, last_pk: int) -> None:
138
+ return
138
139
  from warp_beacon.scheduler.instagram_human import InstagramHuman
139
140
  self.load_session()
140
141
  inst_human = InstagramHuman(self)
warp_beacon/telegram/bot.py CHANGED
@@ -195,23 +195,24 @@ class Bot(object):
195
195
 
196
196
  return []
197
197
 
198
- def build_signature_caption(self, job: UploadJob) -> str:
198
+ def build_signature_caption(self, job: UploadJob, override_canonical_name: str = None) -> str:
199
199
  caption = ""
200
200
  is_group = job.chat_type in (ChatType.GROUP, ChatType.SUPERGROUP)
201
201
  is_youtube = job.job_origin in (Origin.YOUTUBE, Origin.YT_SHORTS)
202
- if job.canonical_name:
203
- if is_group and not is_youtube and CaptionShortner.need_short(job.canonical_name):
204
- caption = f"{html.escape(CaptionShortner.smart_truncate_html(job.canonical_name))} ..."
202
+ effective_canonical_name = override_canonical_name or job.canonical_name
203
+ if effective_canonical_name:
204
+ if is_group and not is_youtube and CaptionShortner.need_short(effective_canonical_name):
205
+ caption = f"{html.escape(CaptionShortner.smart_truncate_html(effective_canonical_name))} ..."
205
206
  job.short_text = True
206
207
  elif is_group:
207
208
  # short enough
208
- caption = html.escape(job.canonical_name)
209
+ caption = html.escape(effective_canonical_name)
209
210
  # Captions only for YouTube in groups; empty otherwise.
210
211
  # Might be too long for Telegram, so we skip them.
211
212
  if is_youtube and is_group:
212
- caption = f"<b>{html.escape(job.canonical_name)}</b>"
213
+ caption = f"<b>{html.escape(effective_canonical_name)}</b>"
213
214
  if is_group:
214
- if job.canonical_name:
215
+ if effective_canonical_name:
215
216
  caption += "\n—\n"
216
217
  if job.message_leftover:
217
218
  caption += job.message_leftover
@@ -371,15 +372,25 @@ class Bot(object):
371
372
  height=j.media_info["height"],
372
373
  duration=round(j.media_info["duration"]),
373
374
  thumb=j.media_info["thumb"],
374
- caption=self.build_signature_caption(job)
375
+ caption=self.build_signature_caption(job, j.canonical_name)
375
376
  )
376
377
  tg_chunk.append(vid)
377
378
  elif j.media_type == JobType.IMAGE:
378
379
  photo = InputMediaPhoto(
379
380
  media=j.local_media_path,
380
- caption=self.build_signature_caption(job)
381
+ caption=self.build_signature_caption(job, j.canonical_name)
381
382
  )
382
383
  tg_chunk.append(photo)
384
+ elif j.media_type == JobType.ANIMATION:
385
+ anim = InputMediaAnimation(
386
+ media=j.local_media_path,
387
+ thumb=j.media_info["thumb"],
388
+ caption=self.build_signature_caption(job, j.canonical_name),
389
+ width=j.media_info["width"],
390
+ height=j.media_info["height"],
391
+ duration=round(j.media_info["duration"])
392
+ )
393
+ tg_chunk.append(anim)
383
394
  mediafs.append(tg_chunk)
384
395
  args["media"] = mediafs
385
396
 
{warp_beacon-2.8.6.dist-info → warp_beacon-2.8.8.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.8.6
3
+ Version: 2.8.8
4
4
  Summary: Telegram bot for expanding external media links
5
5
  Home-page: https://github.com/sb0y/warp_beacon
6
6
  Author: Andrey Bagrintsev
{warp_beacon-2.8.6.dist-info → warp_beacon-2.8.8.dist-info}/RECORD RENAMED
@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
4
4
  var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
5
5
  var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
6
6
  warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
7
- warp_beacon/__version__.py,sha256=Hm_e9QMByvoNNxgb1GLg8_JIDnCEz-Y05F0A2SJvVNM,23
7
+ warp_beacon/__version__.py,sha256=-sLtn6YPlPCl7oDjSMXIrvHZucWARtGfeoqlL-266b0,23
8
8
  warp_beacon/warp_beacon.py,sha256=ADCR30uGXIsDrt9WoiI9Ghu2QtWs0qZIK6x3pQKM_B4,1109
9
9
  warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
10
10
  warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,7 +21,7 @@ warp_beacon/mediainfo/silencer.py,sha256=qxMuViOoVwUYb60uCVvqHiGrqByR1_4_rqMT-Xd
21
21
  warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tEI,2480
22
22
  warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
23
23
  warp_beacon/scheduler/instagram_human.py,sha256=lOytnonvqtB_8z6TVzrVJ1prqqgE4fktZZl-xpn7SOA,12951
24
- warp_beacon/scheduler/scheduler.py,sha256=Bf4sGXjX75Dox3q-yzUHhagtzUAj3hl5GzfnZya-_io,4995
24
+ warp_beacon/scheduler/scheduler.py,sha256=0u9AIr9fTBmjU1GpOwKlPuNLskeJ4A-S2uAUzb-qO6w,4997
25
25
  warp_beacon/scraper/__init__.py,sha256=o9-HQEf4yQVNtWuJN4NcLUovejiHhP_KkQ1Xf5EaQvU,20670
26
26
  warp_beacon/scraper/abstract.py,sha256=pWbaTu-gDZgi-iFjqMR_uGzPl5KLv-4gTdJ9w6cD4sk,3802
27
27
  warp_beacon/scraper/account_selector.py,sha256=n-466AiTXZ8o5cgcNkNwNiWLoi-EkLC7bHh6El1eIF8,10274
@@ -29,13 +29,13 @@ warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlc
29
29
  warp_beacon/scraper/fail_handler.py,sha256=5ODu4b8ndZWAcHIXrcUufsWFihetzNUoAi8IgAkreyQ,998
30
30
  warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
31
31
  warp_beacon/scraper/utils.py,sha256=AOZmDki2Pbr84IG-j_wN2UghKCiWFVDYdx6HJl0JTBs,1258
32
- warp_beacon/scraper/X/X.py,sha256=N9-nbqBv2aNNEUd-QtZa-sBsCog-wek85Zdw1i0Q_lM,7907
32
+ warp_beacon/scraper/X/X.py,sha256=KSAXBqIbm5gMbYHYcIXjc7dx3ZW_Qkz2mV-kQ6CrrfM,7953
33
33
  warp_beacon/scraper/X/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
34
34
  warp_beacon/scraper/X/abstract.py,sha256=pCzZPTCtn8pRbBx2SeuBUpMkEHqnOLtwLBAHYceL12Q,5475
35
35
  warp_beacon/scraper/X/types.py,sha256=i36Nu2cHpHCkvoeobBQC3B13Ke_N40tgCCApcm_FBFY,76
36
36
  warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
37
37
  warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
38
- warp_beacon/scraper/instagram/instagram.py,sha256=1U6uupfFQZSEQQxg3nEq3WR1P9Bv1d6sfUYjoiIJMj4,18740
38
+ warp_beacon/scraper/instagram/instagram.py,sha256=5rD8kPBk6j59a7Wi1TL6W04KHX6zNO1QYMo3H1OsJHQ,18749
39
39
  warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=TgpCjFudeEf2VN0qKgaurFcHECsAlqDc1vM4t7tMScs,9202
40
40
  warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
41
41
  warp_beacon/scraper/youtube/abstract.py,sha256=7CVR2fW6bpWYYKcveRddd6XlgDsfV_Pp3dqV2LpefSc,16088
@@ -45,7 +45,7 @@ warp_beacon/scraper/youtube/youtube.py,sha256=uYR7XpfP6ZnSvw1Gc4qG_M8jkCyv3maEyt
45
45
  warp_beacon/storage/__init__.py,sha256=NaKKPXjwa8LvWsqnVJVz0riXj765lGswG9piKgI2lkY,3389
46
46
  warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
47
47
  warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
48
- warp_beacon/telegram/bot.py,sha256=HJxouCxc85EzC8lTaqnP-5agvkdvlxKR6Etg5LjYcoA,19212
48
+ warp_beacon/telegram/bot.py,sha256=N4Gswpw-U8Z6yPAKMe7zVfDQSRAgvm6Sx6k5_Y7WWoI,19780
49
49
  warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
50
50
  warp_beacon/telegram/download_status.py,sha256=N-Qg13LVcPskyQNKG1lw50K1lhFtXu003muCRzZ7wiE,1561
51
51
  warp_beacon/telegram/edit_message.py,sha256=6DX8eJV70MG_b79WbuJG55qLBs66boElzYdCr8zpMeI,5380
@@ -56,9 +56,9 @@ warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDH
56
56
  warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
57
57
  warp_beacon/telegram/utils.py,sha256=zTF8VQfAWetBSjAPbmNe_Zi_LN5fAcWptJKjLaFNHaE,5073
58
58
  warp_beacon/uploader/__init__.py,sha256=1enK6qMWaTZEaK456JwaKOfvCvznHA8cjgceOsrF6Po,5732
59
- warp_beacon-2.8.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
60
- warp_beacon-2.8.6.dist-info/METADATA,sha256=8MtpB3yYJK75N8q1spUukoa6qbeBImLIPhDsxalL8YQ,23214
61
- warp_beacon-2.8.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
62
- warp_beacon-2.8.6.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
63
- warp_beacon-2.8.6.dist-info/top_level.txt,sha256=RraB0PWGvRK2zPYkuICKNgStLG1C5s7rPHHJEHJbkgA,1510
64
- warp_beacon-2.8.6.dist-info/RECORD,,
59
+ warp_beacon-2.8.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
60
+ warp_beacon-2.8.8.dist-info/METADATA,sha256=OGZIRj-7WsSTExcK-GiaUMA4kSEs5DOgu0bGwDW2jJ0,23214
61
+ warp_beacon-2.8.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
62
+ warp_beacon-2.8.8.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
63
+ warp_beacon-2.8.8.dist-info/top_level.txt,sha256=RraB0PWGvRK2zPYkuICKNgStLG1C5s7rPHHJEHJbkgA,1510
64
+ warp_beacon-2.8.8.dist-info/RECORD,,