From d194c27e0f44d06ccf72b460c6d22d0134bd3eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=91?= =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=BE=D0=B2?= Date: Wed, 10 Jul 2019 05:09:27 +0300 Subject: [PATCH] Check if block has already uploaded --- download_service.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/download_service.py b/download_service.py index acfc18c..4ebac0a 100644 --- a/download_service.py +++ b/download_service.py @@ -6,11 +6,11 @@ from __future__ import unicode_literals import os import time + from telethon.tl.types import DocumentAttributeFilename -from telethon.telegram_client import TelegramClient -from telegram_client_x import TelegramClientX from secret import * +from telegram_client_x import TelegramClientX path_home = './' # os.path.abspath('.') client = TelegramClientX(entity, api_id, api_hash, update_workers=None, spawn_read_thread=True) @@ -64,9 +64,9 @@ def download_block(hash_uid, filename): # if oe.errno != errno.EEXIST: # raise # outbuf = open(FIFO, "wb"): - # os.unlink(FIFO) + # os.unlink(FIFO) client.download_media(msg, file=filename, progress_callback=on_download_progress) - # outbuf.flush() + # outbuf.flush() return 0 except Exception as e: return -1 @@ -86,7 +86,10 @@ def upload_block(hash_uid): except OSError as oe: if oe.errno != errno.EEXIST: raise + messages = client.get_messages(entity, limit=1, search=hash_uid) with open(FIFO, 'rb') as bytesin: + if messages: + return 0 message = client.send_file(entity, file=bytesin, caption=f'{hash_uid}', @@ -107,8 +110,8 @@ def main(argv): service = str(argv[1]) if service == 'download': uid = str(argv[2]) - filename = str (argv[3]) - download_block(hash_uid=uid,filename=filename) + filename = str(argv[3]) + download_block(hash_uid=uid, filename=filename) return 0 elif service == 'upload': uid = str(argv[2])