Skip to content

Commit

Permalink
telegram: delete() on leave=False
Browse files Browse the repository at this point in the history
- also misc minor tidy
  • Loading branch information
casperdcl committed Jun 20, 2021
1 parent f1071d7 commit c36a011
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
20 changes: 11 additions & 9 deletions tqdm/contrib/telegram.py
Expand Up @@ -63,17 +63,15 @@ def write(self, s):
return future

def delete(self):
"""Deletes internal `message_id`."""
try:
res = self.submit(
self.session.post,
self.API + '%s/deleteMessage' % self.token,
data=dict(
chat_id=self.chat_id,
message_id=self.message_id))
future = self.submit(
self.session.post, self.API + '%s/deleteMessage' % self.token,
data={'chat_id': self.chat_id, 'message_id': self.message_id})
except Exception as e:
tqdm_auto.write(str(e))
else:
return res
return future


class tqdm_telegram(tqdm_auto):
Expand Down Expand Up @@ -125,8 +123,12 @@ def clear(self, *args, **kwargs):
if not self.disable:
self.tgio.write("")

def delete(self):
self.tgio.delete()
def close(self):
if self.disable:
return
super(tqdm_telegram, self).close()
if not (self.leave or (self.leave is None and self.pos == 0)):
self.tgio.delete()


def ttgrange(*args, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions tqdm/rich.py
Expand Up @@ -113,10 +113,10 @@ def __init__(self, *args, **kwargs):
self._prog.__enter__()
self._task_id = self._prog.add_task(self.desc or "", **d)

def close(self, *args, **kwargs):
def close(self):
if self.disable:
return
super(tqdm_rich, self).close(*args, **kwargs)
super(tqdm_rich, self).close()
self._prog.__exit__(None, None, None)

def clear(self, *_, **__):
Expand Down

0 comments on commit c36a011

Please sign in to comment.