warp-beacon 2.6.73__py3-none-any.whl → 2.6.75__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.
- warp_beacon/__version__.py +1 -1
- warp_beacon/scraper/youtube/abstract.py +2 -2
- warp_beacon/telegram/edit_message.py +1 -1
- warp_beacon/telegram/progress_bar.py +8 -4
- {warp_beacon-2.6.73.dist-info → warp_beacon-2.6.75.dist-info}/METADATA +1 -1
- {warp_beacon-2.6.73.dist-info → warp_beacon-2.6.75.dist-info}/RECORD +10 -10
- {warp_beacon-2.6.73.dist-info → warp_beacon-2.6.75.dist-info}/WHEEL +0 -0
- {warp_beacon-2.6.73.dist-info → warp_beacon-2.6.75.dist-info}/entry_points.txt +0 -0
- {warp_beacon-2.6.73.dist-info → warp_beacon-2.6.75.dist-info}/licenses/LICENSE +0 -0
- {warp_beacon-2.6.73.dist-info → warp_beacon-2.6.75.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
__version__ = "2.6.
|
1
|
+
__version__ = "2.6.75"
|
2
2
|
|
@@ -326,8 +326,8 @@ class YoutubeAbstract(ScraperAbstract):
|
|
326
326
|
logging.exception(e)
|
327
327
|
|
328
328
|
try:
|
329
|
-
self.status_pipe.send({"action": "report_download_status", "current": 0, "total": 0,
|
330
|
-
|
329
|
+
#self.status_pipe.send({"action": "report_download_status", "current": 0, "total": 0,
|
330
|
+
# "message_id": self.job.placeholder_message_id, "chat_id": self.job.chat_id})
|
331
331
|
ret = self.download_hndlr(self._download, job.url, session=True, thumbnail=thumbnail)
|
332
332
|
return ret
|
333
333
|
except (Unavailable, TimeOut, KeyError) as e:
|
@@ -93,7 +93,7 @@ class EditMessage(object):
|
|
93
93
|
file_name: str = None
|
94
94
|
) -> None:
|
95
95
|
progress_bar = ProgressBar(self.client)
|
96
|
-
await progress_bar.progress_callback(current=0, total=0, chat_id=chat_id, message_id=message_id, operation="Uploading", label=file_name, report_type=ReportType.PROGRESS)
|
96
|
+
#await progress_bar.progress_callback(current=0, total=0, chat_id=chat_id, message_id=message_id, operation="Uploading", label=file_name, report_type=ReportType.PROGRESS)
|
97
97
|
raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, "Uploading", ReportType.PROGRESS, file_name))
|
98
98
|
|
99
99
|
caption = media.caption
|
@@ -9,6 +9,8 @@ from pyrogram import Client
|
|
9
9
|
from warp_beacon.telegram.types import ReportType
|
10
10
|
|
11
11
|
class ProgressBar(object):
|
12
|
+
MAX_PROGRESS_RENDER_SIZE = 1_000_000 # 1 MB
|
13
|
+
|
12
14
|
def __init__(self, client: Client) -> None:
|
13
15
|
self._next_threshold = 20
|
14
16
|
self.client = client
|
@@ -57,8 +59,8 @@ class ProgressBar(object):
|
|
57
59
|
"""
|
58
60
|
filled = int(percent * length / 100 + 0.5)
|
59
61
|
empty = length - filled
|
60
|
-
|
61
|
-
return f"[{
|
62
|
+
pbar = "🟩" * filled + "⬜️" * empty
|
63
|
+
return f"[{pbar}] {percent}%"
|
62
64
|
|
63
65
|
def _on_edit_done(self, task: asyncio.Task) -> None:
|
64
66
|
exc = task.exception()
|
@@ -90,6 +92,8 @@ class ProgressBar(object):
|
|
90
92
|
logging.exception(e)
|
91
93
|
|
92
94
|
def render_progress_bar(self, current: int, total: int, chat_id: int | str, message_id: int, operation: str, label: str = "") -> None:
|
95
|
+
if total <= self.MAX_PROGRESS_RENDER_SIZE:
|
96
|
+
return
|
93
97
|
percent = 0
|
94
98
|
if total:
|
95
99
|
percent = round(current * 100 / (total or 1))
|
@@ -111,8 +115,8 @@ class ProgressBar(object):
|
|
111
115
|
self.client.edit_message_caption(chat_id, message_id, text, ParseMode.HTML)
|
112
116
|
)
|
113
117
|
task.add_done_callback(self._on_edit_done)
|
114
|
-
except MessageNotModified:
|
115
|
-
|
118
|
+
#except MessageNotModified:
|
119
|
+
# logging.warning("bad_request_400.MessageNotModified")
|
116
120
|
except Exception as e:
|
117
121
|
logging.warning("An error occurred while setup task to update progress bar")
|
118
122
|
logging.exception(e)
|
@@ -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=
|
7
|
+
warp_beacon/__version__.py,sha256=M-MgT7WAvO_WT9k_LlS0cxBTjlNgykAw0y19BGO0bAw,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
|
@@ -34,7 +34,7 @@ warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsX
|
|
34
34
|
warp_beacon/scraper/instagram/instagram.py,sha256=c_7E0z1m728n9hOqWR3SXbGLW61a_wxG-GZsoue64tM,17153
|
35
35
|
warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=1YMU6_PUa4g6usKU1EQPaWVw3c3ljxgoSh8BuhI8bsg,2911
|
36
36
|
warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
37
|
-
warp_beacon/scraper/youtube/abstract.py,sha256=
|
37
|
+
warp_beacon/scraper/youtube/abstract.py,sha256=K2ovycq1lkx0a2R1FddO3B0IcaVsVzni_fdXzajGdwg,13134
|
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
|
@@ -44,17 +44,17 @@ warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
|
|
44
44
|
warp_beacon/telegram/bot.py,sha256=W13hyJD89ozZallLq0NIb9c3uh1Hov8Axi7ab7LkE3A,19128
|
45
45
|
warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
|
46
46
|
warp_beacon/telegram/download_status.py,sha256=JNevX0VQh39fX98fjM9j_nm0Ribj8f3tfa6kxpeNapQ,1484
|
47
|
-
warp_beacon/telegram/edit_message.py,sha256=
|
47
|
+
warp_beacon/telegram/edit_message.py,sha256=y96-fkj5jKtEu68Bj5sGj7A06sFlXXfhfiyNdpPgqAU,5479
|
48
48
|
warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkgD2s,9559
|
49
49
|
warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
|
50
|
-
warp_beacon/telegram/progress_bar.py,sha256=
|
50
|
+
warp_beacon/telegram/progress_bar.py,sha256=csZYf7iU4xPHJ6SqfYy5gMeqMl1DdiPkqmA5wrklwWQ,4877
|
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=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
|
54
54
|
warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
|
55
|
-
warp_beacon-2.6.
|
56
|
-
warp_beacon-2.6.
|
57
|
-
warp_beacon-2.6.
|
58
|
-
warp_beacon-2.6.
|
59
|
-
warp_beacon-2.6.
|
60
|
-
warp_beacon-2.6.
|
55
|
+
warp_beacon-2.6.75.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
56
|
+
warp_beacon-2.6.75.dist-info/METADATA,sha256=-RsLE1pjhei63-cdfbDZVqOB1WaZMLh8wIW_7uvVLDM,22706
|
57
|
+
warp_beacon-2.6.75.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
|
58
|
+
warp_beacon-2.6.75.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
|
59
|
+
warp_beacon-2.6.75.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
|
60
|
+
warp_beacon-2.6.75.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|