warp-beacon 2.7.10__py3-none-any.whl → 2.7.12__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 (10) hide show
  1. warp_beacon/__version__.py +1 -1
  2. warp_beacon/scraper/instagram/instagram.py +1 -1
  3. warp_beacon/scraper/youtube/abstract.py +2 -2
  4. warp_beacon/telegram/progress_bar.py +8 -13
  5. {warp_beacon-2.7.10.dist-info → warp_beacon-2.7.12.dist-info}/METADATA +1 -1
  6. {warp_beacon-2.7.10.dist-info → warp_beacon-2.7.12.dist-info}/RECORD +10 -10
  7. {warp_beacon-2.7.10.dist-info → warp_beacon-2.7.12.dist-info}/WHEEL +1 -1
  8. {warp_beacon-2.7.10.dist-info → warp_beacon-2.7.12.dist-info}/entry_points.txt +0 -0
  9. {warp_beacon-2.7.10.dist-info → warp_beacon-2.7.12.dist-info}/licenses/LICENSE +0 -0
  10. {warp_beacon-2.7.10.dist-info → warp_beacon-2.7.12.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.7.10"
1
+ __version__ = "2.7.12"
2
2
 
warp_beacon/scraper/instagram/instagram.py CHANGED
@@ -475,7 +475,7 @@ class InstagramScraper(ScraperAbstract):
475
475
  "report_type": ReportType.PROGRESS
476
476
  }
477
477
  self.status_pipe.send(msg)
478
- self._download_progress_threshold += 10
478
+ self._download_progress_threshold += 20
479
479
 
480
480
  def report_seen(self, items: dict) -> None:
481
481
  try:
warp_beacon/scraper/youtube/abstract.py CHANGED
@@ -245,7 +245,7 @@ class YoutubeAbstract(ScraperAbstract):
245
245
  self.status_pipe.send(msg)
246
246
  logging.debug("[Download worker] Downloaded %d%%", percentage_of_completion)
247
247
  if total_size > 0:
248
- self._download_progress_threshold += 10
248
+ self._download_progress_threshold += 20
249
249
 
250
250
  def build_proxies(self, proxy_dsn: str) -> dict:
251
251
  if not proxy_dsn:
@@ -310,7 +310,7 @@ class YoutubeAbstract(ScraperAbstract):
310
310
  self.status_pipe.send(msg)
311
311
  logging.debug("[Download worker][yt_dlp] Downloaded %d%%", percentage_of_completion)
312
312
  if total_size > 0:
313
- self._download_progress_threshold += 10
313
+ self._download_progress_threshold += 20
314
314
 
315
315
  def build_yt_dlp(self, timeout: int = 60) -> yt_dlp.YoutubeDL:
316
316
  auth_data = {}
warp_beacon/telegram/progress_bar.py CHANGED
@@ -98,39 +98,34 @@ class ProgressBar(object):
98
98
  percent = 0
99
99
  if total:
100
100
  percent = round(current * 100 / (total or 1))
101
- if percent > 100:
102
- return
103
- if percent >= 100 and operation == "Uploading":
101
+ if percent >= 100:
104
102
  return
105
103
  if total == 0 or percent == 0 or percent >= self._next_threshold:
106
104
  #pbar = self.make_progress_bar(percent, 100, 25)
107
105
  pbar = self.make_emoji_progress_bar(percent, 10)
108
106
  logging.info("[Progress bar]: Operation: %s %d%%", operation, percent)
109
107
  try:
110
- fomatted_size = self.format_size_si(total)
108
+ formatted_size = self.format_size_si(total)
111
109
  text = f"{pbar}\n{operation}"
112
110
  if label:
113
111
  text += f"\n<code>{label}</code>"
114
112
  if total:
115
- text += f" <b>{fomatted_size}</b>"
113
+ text += f" <b>{formatted_size}</b>"
116
114
 
117
115
  # avoid duplicate render
118
- if text == f"{chat_id}:{message_id}:{operation}:{label}:{fomatted_size}:{percent}":
116
+ if text == f"{chat_id}:{message_id}:{operation}:{label}:{formatted_size}:{percent}":
119
117
  return
120
118
 
121
- await self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
122
- self.rendered_text = f"{chat_id}:{message_id}:{operation}:{label}:{fomatted_size}:{percent}"
123
- #task = self.client.loop.create_task(
124
- # self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
125
- #)
126
- #task.add_done_callback(self._on_edit_done)
119
+ message = await self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
120
+ logging.debug("Updated caption for message id '%d'", message.id)
121
+ self.rendered_text = f"{chat_id}:{message_id}:{operation}:{label}:{formatted_size}:{percent}"
127
122
  except MessageNotModified:
128
123
  logging.warning("bad_request_400.MessageNotModified")
129
124
  except Exception as e:
130
125
  logging.warning("An error occurred while setup task to update progress bar")
131
126
  logging.exception(e)
132
127
  if total > 0 and percent != 0:
133
- self._next_threshold += 15
128
+ self._next_threshold += 20
134
129
 
135
130
  @staticmethod
136
131
  def make_hash(chat_id: str | int, message_id: int, algorithm: str = 'sha256') -> str:
{warp_beacon-2.7.10.dist-info → warp_beacon-2.7.12.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.7.10
3
+ Version: 2.7.12
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.7.10.dist-info → warp_beacon-2.7.12.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=zbwrBWsm8-2p3TRaPY6g_QIfJekI6i1P8FGNjWhziq8,24
7
+ warp_beacon/__version__.py,sha256=fmDPRrhg7swPQM39gTcuUdHQiY9U-FSActIV5FAD_lQ,24
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
@@ -31,10 +31,10 @@ warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5
31
31
  warp_beacon/scraper/utils.py,sha256=yL-nrdCOAXNZgmIFPurIYFHfPsxHDl8pqif6BYKrzJI,1218
32
32
  warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
33
33
  warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
34
- warp_beacon/scraper/instagram/instagram.py,sha256=qypIbRLPiOn98n9DOFlkU7X2Ux-cOSu7skJAO2JudIQ,18629
34
+ warp_beacon/scraper/instagram/instagram.py,sha256=oVXP6VweJCeffhyDU-GZLa66ESW06GvfuGcW2V6YdQ4,18629
35
35
  warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=M5NCtLwdUvByjmDBZMWljgB275R0LSBFblsGpapluD0,5968
36
36
  warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
37
- warp_beacon/scraper/youtube/abstract.py,sha256=yQCJzi5YCEJFr365uPnMzKB8Rmi_zKVIlxw9-DI3sKE,15278
37
+ warp_beacon/scraper/youtube/abstract.py,sha256=dCvNoXX4B7cY-gLNqF3LfYJQ855CBS4SFCehw9JjK6U,15278
38
38
  warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
39
39
  warp_beacon/scraper/youtube/shorts.py,sha256=1GtoYUlxAwcgSQcn80u5ehNJytH5AN5dPOicmX-XD8E,1705
40
40
  warp_beacon/scraper/youtube/youtube.py,sha256=x9v9p1coA9TvBhxjNAofGu4UBkAEdYPE2ePRnU-5tK0,7233
@@ -47,14 +47,14 @@ warp_beacon/telegram/download_status.py,sha256=N-Qg13LVcPskyQNKG1lw50K1lhFtXu003
47
47
  warp_beacon/telegram/edit_message.py,sha256=6DX8eJV70MG_b79WbuJG55qLBs66boElzYdCr8zpMeI,5380
48
48
  warp_beacon/telegram/handlers.py,sha256=PaO90370v-S90nwr4PYMzrlHRFBU0VBO6YkqDqTbnjw,9634
49
49
  warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
50
- warp_beacon/telegram/progress_bar.py,sha256=_REQdzRx3lne8TFb6nfKtA-BPib9B652y0oyKa-mfxM,5169
50
+ warp_beacon/telegram/progress_bar.py,sha256=IP4xtvLtdJtqdr2C-0YaU428iQGrKurbP4Npr31iW74,5014
51
51
  warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
52
52
  warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
53
53
  warp_beacon/telegram/utils.py,sha256=S1N_JbHM_ExiM5tS0CeYKWIlvaJMlyq85TQNbK_GVds,5029
54
54
  warp_beacon/uploader/__init__.py,sha256=ewvR60k9osJxw_kb5U-TlZkCGR_574biq3w_aR1tjIU,5689
55
- warp_beacon-2.7.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
56
- warp_beacon-2.7.10.dist-info/METADATA,sha256=HOkF4Lis09tYvjcO7nUQ9oUU8j7A9NRy4LHp9m_BsrY,23215
57
- warp_beacon-2.7.10.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
58
- warp_beacon-2.7.10.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
59
- warp_beacon-2.7.10.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
60
- warp_beacon-2.7.10.dist-info/RECORD,,
55
+ warp_beacon-2.7.12.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
56
+ warp_beacon-2.7.12.dist-info/METADATA,sha256=HvkC9EFodqkA0lHCM0mihERU8p1v4G-Nf-iooEA6I4o,23215
57
+ warp_beacon-2.7.12.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
58
+ warp_beacon-2.7.12.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
59
+ warp_beacon-2.7.12.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
60
+ warp_beacon-2.7.12.dist-info/RECORD,,
{warp_beacon-2.7.10.dist-info → warp_beacon-2.7.12.dist-info}/WHEEL RENAMED
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (80.7.1)
2
+ Generator: setuptools (80.8.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5