diff --git a/telegram_gcloner/utils/fire_save_files.py b/telegram_gcloner/utils/fire_save_files.py
index c61d112..79eccff 100644
--- a/telegram_gcloner/utils/fire_save_files.py
+++ b/telegram_gcloner/utils/fire_save_files.py
@@ -36,7 +36,7 @@ def run(self):
chat_id = update.effective_chat.id
user_id = update.effective_user.id
gd = GoogleDrive(user_id)
- message = '╭──────⌈ 📥 Copying In Progress ⌋──────╮\n│\n├ 📂 Target Directory:{}\n'.format(dest_folder['path'])
+ message = '╭──────⌈ 📥 Copying ⌋──────╮\n│\n├ 📂 Destination:{}\n'.format(dest_folder['path'])
inline_keyboard = InlineKeyboardMarkup(
[[InlineKeyboardButton(text=f'🚫 Stop', callback_data=f'stop_task,{thread_id}')]])
@@ -105,15 +105,15 @@ def run(self):
progress_file_percentage = 0
progress_file_percentage_10 = 0
progress_transferred_size = '0'
- progress_total_size = '0 Bytes'
+ progress_total_size = '0 B'
progress_speed = '-'
progress_speed_file = '-'
progress_eta = '-'
progress_size_percentage_10 = 0
regex_checked_files = r'Checks:\s+(\d+)\s+/\s+(\d+)'
regex_total_files = r'Transferred:\s+(\d+) / (\d+), (\d+)%(?:,\s*([\d.]+\sFiles/s))?'
- regex_total_size = r'Transferred:[\s]+([\d.]+\s*[kMGTP]?) / ([\d.]+[\s]?[kMGTP]?Bytes),' \
- r'\s*(?:\-|(\d+)\%),\s*([\d.]+\s*[kMGTP]?Bytes/s),\s*ETA\s*([\-0-9hmsdwy]+)'
+ regex_total_size = r'Transferred:[\s]+([\d.]+[\s]?[KMGTP]?B) / ([\d.]+[\s]?[KMGTP]?B),' \
+ r'\s*(?:\-|(\d+)\%),\s*([\d.]+\s*[KMGTP]?B/s),\s*ETA\s*([\-0-9hmsdwy]+)'
message_progress_last = ''
message_progress = ''
progress_update_time = datetime.datetime.now() - datetime.timedelta(minutes=5)
@@ -153,14 +153,12 @@ def run(self):
progress_checked_files = int(match_checked_files.group(1))
progress_total_check_files = int(match_checked_files.group(2))
progress_max_percentage_10 = max(progress_size_percentage_10, progress_file_percentage_10)
- message_progress = '├──────⌈ Made with Love by Dr.Caduceus & MsGsuite⌋──────' \
- '├ 🗂 Source : {}\n│\n' \
- '├ ✔️ Checks: {} / {}
\n' \
- '├ 📥 Transfers: {} / {}
\n' \
+ message_progress = '├ 🗂 Source:\n│\n' \
+ '├ ✔️ Check:{} / {}
\n' \
+ '├ ☑️ Transfer:{} / {}
\n' \
'├ 📦 Size:{} / {}
\n{}' \
- '├ ⚡️Speed:{}
\n├⏳ ETA: {}
\n' \
+ '├ ⚡️ Speed:{}
\n├ ⏳ ETA:{}
\n' \
'├ ⛩ Progress:[{}
] {: >2}%\n│\n' \
- '├──────⌈ CloneBot V2🔥 ⌋──────' \
.format(
folder_id,
html.escape(destination_path),
@@ -180,7 +178,7 @@ def run(self):
match = re.search(r'Failed to Copy: Failed to Make Directory in the Destination', output)
if match:
- message_progress = '{}\n│Destination Write Permission Error.\n Please ensure that you have rights to upload files to the Destination.
'.format(message_progress)
+ message_progress = '{}\n│\n├ ❌ Write permission error
'.format(message_progress)
temp_message = '{}{}'.format(message, message_progress)
# logger.info('Write permission error, please confirm permission'.format())
try:
@@ -197,7 +195,7 @@ def run(self):
match = re.search(r"Couldn't List Directory", output)
if match:
- message_progress = '{}\n│Source Read permission Error. \n Please ensure that you have rights to read files from the Source Link
'.format(message_progress)
+ message_progress = '{}\n│\n├ ❌ Read permission error
'.format(message_progress)
temp_message = '{}{}'.format(message, message_progress)
# logger.info('Read permission error, please confirm the permission:')
try:
@@ -228,17 +226,17 @@ def run(self):
progress_update_time = datetime.datetime.now()
if self.critical_fault:
- message_progress = '{}\n│\n│ You have terminated the Cloning Process'.format(message_progress)
+ message_progress = '{}\n│\n├ ❌ Process terminated'.format(message_progress)
process.terminate()
break
rc = process.poll()
- message_progress_heading, message_progress_content = message_progress.split('\n│', 1)
- link_text = 'Unable to fetch Google Drive Link.'
+ message_progress_heading, message_progress_content = message_progress.split('├ ', 1)
+ link_text = '❌ Unable to fetch drive link'
try:
link = gd.get_folder_link(dest_folder['folder_id'], destination_path)
if link:
- link_text = '\n│ \n│ 👉 Google Drive Link 👈'.format(link)
+ link_text = '├ 🔗 Link:Drive'.format(link)
except Exception as e:
logger.info(str(e))
@@ -246,9 +244,9 @@ def run(self):
message = '{}{} ❌\n│{}\n│{}\n│'.format(message, message_progress_heading, message_progress_content,
link_text)
elif progress_file_percentage == 0 and progress_checked_files > 0:
- message = '{}{} ✅\n│ File Already Exists in the Destination!\n│ {}\n│'.format(message, message_progress_heading, link_text)
+ message = '{}{}\n│\n├ ✅ File already exists in destination\n│\n{}\n│'.format(message, message_progress_heading, link_text)
else:
- message = '{}{}{}\n│{}\n│{}\n│\n│'.format(message,
+ message = '{}{}{}\n│{}\n│{}\n│'.format(message,
message_progress_heading,
'✅' if rc == 0 else '❌',
message_progress_content,
@@ -265,7 +263,9 @@ def run(self):
if self.critical_fault is True:
break
- message += '\n╰──────⌈ ✅ Cloning Process Finished ! ✅ ⌋──────╯'
+ message += '\n├ 🔥 CloneBot V2'
+ '\n├ ©️ Made with ❤️ by Dr.Caduceus\n│'
+ '\n╰──────⌈ ✅ Finished ⌋──────╯'
try:
context.bot.edit_message_text(chat_id=chat_id, message_id=message_id, text=message,
parse_mode=ParseMode.HTML, disable_web_page_preview=True)