warp-beacon 2.6.56__py3-none-any.whl → 2.6.58__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 (9) hide show
  1. warp_beacon/__version__.py +1 -1
  2. warp_beacon/telegram/edit_message.py +6 -6
  3. warp_beacon/telegram/progress_bar.py +8 -8
  4. {warp_beacon-2.6.56.dist-info → warp_beacon-2.6.58.dist-info}/METADATA +1 -1
  5. {warp_beacon-2.6.56.dist-info → warp_beacon-2.6.58.dist-info}/RECORD +9 -9
  6. {warp_beacon-2.6.56.dist-info → warp_beacon-2.6.58.dist-info}/WHEEL +0 -0
  7. {warp_beacon-2.6.56.dist-info → warp_beacon-2.6.58.dist-info}/entry_points.txt +0 -0
  8. {warp_beacon-2.6.56.dist-info → warp_beacon-2.6.58.dist-info}/licenses/LICENSE +0 -0
  9. {warp_beacon-2.6.56.dist-info → warp_beacon-2.6.58.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.6.56"
1
+ __version__ = "2.6.58"
2
2
 
warp_beacon/telegram/edit_message.py CHANGED
@@ -106,18 +106,18 @@ class EditMessage(object):
106
106
 
107
107
  raw_media = None
108
108
  if isinstance(media, types.InputMediaVideo):
109
- progress_bar_thumb = ProgressBar(self.client)
110
- raw_file_thumb = await self.client.save_file(path=media.thumb, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "Uploaded", "thumbnail",))
109
+ #progress_bar_thumb = ProgressBar(self.client)
110
+ raw_file_thumb = await self.client.save_file(path=media.thumb)
111
111
  raw_media = self.get_wrapped_video(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
112
112
  elif isinstance(media, types.InputMediaPhoto):
113
113
  raw_media = self.get_wrapped_photo(raw_file=raw_file, media=media)
114
114
  elif isinstance(media, types.InputMediaAudio):
115
- progress_bar_thumb = ProgressBar(self.client)
116
- raw_file_thumb = await self.client.save_file(path=media.thumb, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "Uploaded", "thumbnail",))
115
+ #progress_bar_thumb = ProgressBar(self.client)
116
+ raw_file_thumb = await self.client.save_file(path=media.thumb)
117
117
  raw_media = self.get_wrapped_audio(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
118
118
  elif isinstance(media, types.InputMediaAnimation):
119
- progress_bar_thumb = ProgressBar(self.client)
120
- raw_file_thumb = await self.client.save_file(path=media.thumb, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "Uploaded", "thumbnail",))
119
+ #progress_bar_thumb = ProgressBar(self.client)
120
+ raw_file_thumb = await self.client.save_file(path=media.thumb)
121
121
  raw_media = self.get_wrapped_animation(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
122
122
 
123
123
  peer = await self.client.resolve_peer(chat_id)
warp_beacon/telegram/progress_bar.py CHANGED
@@ -61,22 +61,22 @@ class ProgressBar(object):
61
61
  logging.exception("Error in edit_message_caption", exc_info=exc)
62
62
 
63
63
  async def progress_callback(self, current: int, total: int, chat_id: int | str, message_id: int, operation: str, label: str = "") -> None:
64
- if self.complete:
65
- return
66
64
  percent = 0
67
65
  if total:
68
66
  percent = round(current * 100 / (total or 1))
67
+ if percent >= 100:
68
+ return
69
69
  if total == 0 or percent >= self._next_threshold:
70
70
  #pbar = self.make_progress_bar(percent, 100, 25)
71
71
  pbar = self.make_emoji_progress_bar(percent, 14)
72
- logging.info("[%s] Operation: %s %d%%", label or operation, operation, round(percent))
72
+ logging.info("[Progress bar]: Operation: %s %d%%", operation, percent)
73
73
  try:
74
- await self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>{operation}</b> {label}", ParseMode.HTML)
74
+ #await self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>{operation}</b> {label}", ParseMode.HTML)
75
75
  # we don't need to wait completion, waste of time and resources
76
- #task = self.client.loop.create_task(
77
- # self.client.edit_message_caption(chat_id, message_id, f"{pbar} <b>{operation}</b> {label}", ParseMode.HTML)
78
- #)
79
- #task.add_done_callback(self._on_edit_done)
76
+ task = self.client.loop.create_task(
77
+ self.client.edit_message_caption(chat_id, message_id, f"{pbar}\n<b>{operation}</b> {label}", ParseMode.HTML)
78
+ )
79
+ task.add_done_callback(self._on_edit_done)
80
80
  except MessageNotModified:
81
81
  logging.warning("bad_request_400.MessageNotModified")
82
82
  except Exception as e:
{warp_beacon-2.6.56.dist-info → warp_beacon-2.6.58.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.6.56
3
+ Version: 2.6.58
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.6.56.dist-info → warp_beacon-2.6.58.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=AdfnWlDMAuzaQu721-Vo_OBbQvxz9el6tXYNoDcyzz4,24
7
+ warp_beacon/__version__.py,sha256=UdOojPCXvflYfka72bfD9SzlY-PU8HA5hCVvjpcLQPM,24
8
8
  warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
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
@@ -43,16 +43,16 @@ warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
43
43
  warp_beacon/telegram/bot.py,sha256=W13hyJD89ozZallLq0NIb9c3uh1Hov8Axi7ab7LkE3A,19128
44
44
  warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
45
45
  warp_beacon/telegram/download_status.py,sha256=dV0mRIOkA8dU0ECsmC_rZ33XQhVnkW2nZBNTxQ0Y6x4,1342
46
- warp_beacon/telegram/edit_message.py,sha256=_452kXWn65qj9iPSvSmORbKXXTjJ0z6kBCxPcmKDrlM,5742
46
+ warp_beacon/telegram/edit_message.py,sha256=SB3qKLCfO5mgeeASKVf9VY21JG0SuwuX8okQXPYA2Dk,5415
47
47
  warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
48
48
  warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
49
- warp_beacon/telegram/progress_bar.py,sha256=F9pbCaUJqXzfqB8NJDU3LdvlS2hVtXk1_CRQKRdaRHU,3206
49
+ warp_beacon/telegram/progress_bar.py,sha256=xgu54EfB5hJTtk7AillpsVr1fxTpd9s63MMu2aUtWpE,3189
50
50
  warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
51
51
  warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
52
52
  warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
53
- warp_beacon-2.6.56.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
54
- warp_beacon-2.6.56.dist-info/METADATA,sha256=-bxVw_NVY79M0_YzOyIZf7lvMKnsL1GugCUXdfz90wc,22706
55
- warp_beacon-2.6.56.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
56
- warp_beacon-2.6.56.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
57
- warp_beacon-2.6.56.dist-info/top_level.txt,sha256=2x4wBJ_HeeBt6Bsdu9C4tItXWqH8spX8jGSHpoL0IMw,1334
58
- warp_beacon-2.6.56.dist-info/RECORD,,
53
+ warp_beacon-2.6.58.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
54
+ warp_beacon-2.6.58.dist-info/METADATA,sha256=o_Bu7ozVrlCqNB-FOx_Gr5WnnzsOR-WimUeL3Wtuufg,22706
55
+ warp_beacon-2.6.58.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
56
+ warp_beacon-2.6.58.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
57
+ warp_beacon-2.6.58.dist-info/top_level.txt,sha256=2x4wBJ_HeeBt6Bsdu9C4tItXWqH8spX8jGSHpoL0IMw,1334
58
+ warp_beacon-2.6.58.dist-info/RECORD,,