Add to 33c9b73: Used fStrings.

Author: YuvrajRaghuvanshiS

helpers/adb_device_serial_id.py

@@ -20,14 +20,14 @@ def init():
     curr_dir = os.path.dirname(os.path.realpath(__file__))
     root_dir = os.path.abspath(os.path.join(curr_dir, '..'))
     if(is_windows):
-        adb = root_dir + '\\bin\\adb.exe'
+        adb = f'{root_dir}\\bin\\adb.exe'
     else:
         adb = 'adb'
 
-    cmd = adb + ' devices'
+    cmd = f'{adb} devices'
     # Kill server before getting list to avoid daemon texts.
-    os.system(adb + ' kill-server')
-    os.system(adb + ' start-server')
+    os.system(f'{adb} kill-server')
+    os.system(f'{adb} start-server')
     proc = sp.Popen(cmd.split(), stdin=sp.PIPE, stdout=sp.PIPE,
                     stderr=sp.PIPE, shell=False)
     output, error = proc.communicate()
@@ -62,12 +62,10 @@ def init():
     custom_print(output[0])
     custom_print('\n', is_get_time=False)
     if device_to_connect is None:
-        for device in output[1:]:
-            name = adb + ' -s ' + \
-                device.split()[0] + ' shell getprop ro.product.model'
-            custom_print(str(i) + '. ' + device.split()
-                         [0] + '  ' + device.split()[1] + '  ' + sp.getoutput(name).strip())
-            i += 1
+        for index, device in enumerate(output[1:]):
+            name = f'{adb} -s {device.split()[0]} shell getprop ro.product.model'
+            custom_print(
+                f'{index}. {device.split()[0]} {device.split()[1]} {sp.getoutput(name).strip()}')
 
     while device_to_connect is None:
         device_index = int(custom_input('Enter device number (for ex: 2): '))

helpers/custom_ci.py

@@ -20,11 +20,11 @@
 
 def custom_input(text_to_input, color='green', attr=[], is_get_time=True, is_log=True):
     time = get_time() if is_get_time else ''
-    data = input(colored(time + text_to_input, color, attrs=attr))
+    data = input(colored(f'{time}{text_to_input}', color, attrs=attr))
     if(is_log):
-        logging.debug(time + text_to_input + data)
+        logging.debug(f'{time}{text_to_input}{data}')
     else:
-        logging.debug(time + text_to_input + '********')
+        logging.debug(f'{time}{text_to_input}********')
         # Add that password in list, and mask that while printing also.
         masked.append(data)
     return data
@@ -34,18 +34,18 @@ def custom_print(text_to_print, color='green', attr=[], is_get_time=True, is_log
     time = get_time() if is_get_time else ''
     text_to_print = str(text_to_print)
     if(is_print):
-        cprint(time + text_to_print, color, attrs=attr, end=end)
+        cprint(f'{time}{text_to_print}', color, attrs=attr, end=end)
     else:
         pass
     if(is_log):
-        logging.debug(time + text_to_print)
+        logging.debug(f'{time}{text_to_print}')
     else:
         # Search for password and mask.
         for i in masked:
             if i in text_to_print:
-                logging.debug(time + text_to_print.replace(i, '********'))
+                logging.debug(f'{time}{text_to_print.replace(i, "********")}')
 
-    # cprint((time + textToPrint).center(shutil.get_terminal_size().columns), color, attrs = attr) to print in center. Later.
+    # cprint((f{time}{textToPrint}').center(shutil.get_terminal_size().columns), color, attrs = attr) to print in center. Later.
 
 
 def get_time():

helpers/handler.py

@@ -1,3 +1,4 @@
+from curses.ascii import isprint
 import os
 import re
 import shutil
@@ -23,14 +24,14 @@
 def after_connect(adb):
     custom_print(
         f'>>> I am in handler.after_connect({adb=!s})', is_print=False)
-    sdk_version = int(getoutput(adb + ' shell getprop ro.build.version.sdk'))
+    sdk_version = int(getoutput(f'{adb} shell getprop ro.build.version.sdk'))
     if (sdk_version <= 13):
         custom_print(
             'Unsupported device. This method only works on Android v4.0 or higher.', 'red')
         custom_print('Cleaning up \"tmp\" folder.', 'red')
         shutil.rmtree('tmp')
         kill_me()
-    _wa_path_text = adb + ' shell pm path com.whatsapp'
+    _wa_path_text = f'{adb} shell pm path com.whatsapp'
     whatsapp_apk_path_in_device = subprocess.getoutput(_wa_path_text)
     if(not whatsapp_apk_path_in_device):
         custom_print('Looks like WhatsApp is not installed on device.', 'red')
@@ -41,16 +42,22 @@ def after_connect(adb):
     try:
         resp = requests.head(
             'https://web.archive.org/web/20141111030303if_/http://www.whatsapp.com/android/current/WhatsApp.apk', timeout=5)
-        content_length = resp.headers['content_length']
+        try:
+            content_length = resp.headers['content-length']
+        except KeyError as e:
+            custom_print(e, is_print=False)
+            custom_print(
+                'No \"content-length\" field in header, defaulting to 0.')
+            content_length = 0
     except requests.exceptions.RequestException as e:
         custom_print(e, is_print=False)
         custom_print(
             'An exception has occured while checking for LegacyWhatsApp existence at web.archive.org, defaulting to whatscrypt.com, check log for futher details.', 'yellow')
         content_length = 0
-    _version_name_text = adb + ' shell dumpsys package com.whatsapp'
+    _version_name_text = f'{adb} shell dumpsys package com.whatsapp'
     version_name = re.findall(
         "(?<=versionName=)(.*?)(?=\n)", getoutput(_version_name_text))[0]
-    custom_print('WhatsApp V' + version_name + ' installed on device')
+    custom_print(f'WhatsApp v{version_name} installed on device')
     download_app_from = app_url_whatsapp_cdn if(
         content_length == 18329558) else app_url_whatscrypt_cdn
     if (version.parse(version_name) > version.parse('2.11.431')):
@@ -86,10 +93,10 @@ def download_apk(url, file_name):
         custom_print(
             '\aFor some reason I could not download Legacy WhatsApp, you need to download it on your own now from either of the links given below: ', 'red')
         custom_print('\n', is_get_time=False)
-        custom_print('1. \"' + app_url_whatsapp_cdn +
-                     '\" (official\'s archive)', 'red')
-        custom_print('2. \"' + app_url_whatscrypt_cdn +
-                     '\" unofficial website.', 'red')
+        custom_print(
+            f'1. \"{app_url_whatsapp_cdn}\" (official\'s archive)', 'red')
+        custom_print(
+            f'2. \"{app_url_whatscrypt_cdn}\" unofficial website.', 'red')
         custom_print('\n', is_get_time=False)
         custom_print(
             'Once downloaded rename it to \"LegacyWhatsApp.apk\" exactly and put in \"helpers\" folder.', 'red')
@@ -122,6 +129,6 @@ def kill_me():
 def handler(adb):
     custom_print(
         f'>>> I am in handler.handler({adb=!s})', is_print=False)
-    custom_print('Connected to ' + getoutput(adb +
-                                             ' shell getprop ro.product.model'))
+    custom_print(
+        f'Connected to {getoutput(adb + " shell getprop ro.product.model")}')
     return after_connect(adb)

helpers/tcp_device_serial_id.py

@@ -21,14 +21,14 @@ def init(tcp_ip, tcp_port):
     root_dir = os.path.abspath(os.path.join(curr_dir, '..'))
 
     if(is_windows):
-        adb = root_dir + '\\bin\\adb.exe'
+        adb = f'{root_dir}\\bin\\adb.exe'
     else:
         adb = 'adb'
 
-    combo = tcp_ip + ':' + tcp_port
-    cmd = adb + ' connect ' + combo
-    os.system(adb + ' kill-server')
-    os.system(adb + ' start-server')
+    combo = f'{tcp_ip}:{tcp_port}'
+    cmd = f'{adb} connect {combo}'
+    os.system(f'{adb} kill-server')
+    os.system(f'{adb} start-server')
     proc = sp.Popen(cmd.split(), stdin=sp.PIPE, stdout=sp.PIPE,
                     stderr=sp.PIPE, shell=False)
     output, error = proc.communicate()

protect.py

@@ -50,27 +50,26 @@ def main():
 def compress(user_folder):
     custom_print(
         f'>>> I am in protect.compress({user_folder=!s})', is_print=False)
-    if(not os.path.isdir(extracted + user_folder)):
-        custom_print('Could not find directory \"' +
-                     extracted + user_folder + '\"')
+    if(not os.path.isdir(f'{extracted}{user_folder}')):
+        custom_print(f'Could not find directory \"{extracted}{user_folder}\"')
         kill_me()
-    elif(len(os.listdir(extracted + user_folder)) == 0):
+    elif(len(os.listdir(f'{extracted}{user_folder}')) == 0):
         custom_print('User folder is empty.')
         kill_me()
     else:
         password = custom_input('Choose a password for zip: ', is_log=False)
         if(password):
-            password = ' -p' + password
-        os.system(seven_zip + ' a -t7z -mhe ' + extracted +
-                  user_folder + ' ' + extracted + user_folder + '/* ' + password)
+            password = f' -p{password}'
+        os.system(
+            f'{seven_zip} a -t7z -mhe {extracted}{user_folder} {extracted}{user_folder}/* {password}')
         custom_print('\n', is_get_time=False)
         custom_print(
             'If you see \"Everything is OK\" in above line then it is recommended to delete user folder.')
         is_delete_user_folder = custom_input(
-            'Delete \"' + user_folder + '\" folder? (default y): ') or 'Y'
+            f'Delete \"{user_folder}\" folder? (default y): ') or 'Y'
         custom_print('\n', is_get_time=False)
-        custom_print('\aYour \"' + user_folder + '.7z\" file is in \"' + os.path.realpath(extracted) + '\" folder. Password is: ' +
-                     password.replace(' -p', ''), 'yellow', is_log=False)
+        custom_print(
+            f'\aYour \"{user_folder}.7z\" file is in \"{os.path.realpath(extracted)}\" folder. Password is: {password.replace(" -p", "")}', 'yellow', is_log=False)
         custom_print('\n', is_get_time=False)
         custom_input('Hit \"Enter\" key to continue.')
         if(is_delete_user_folder.upper() == 'Y'):
@@ -84,7 +83,7 @@ def delete_user_folder(user_folder):
         f'>>> I am in protect.delete_user_folder({user_folder=!s})', is_print=False)
     custom_print('Deleting...')
     try:
-        shutil.rmtree(extracted + user_folder)
+        shutil.rmtree(f'{extracted}{user_folder}')
     except Exception as e:
         custom_print(e, 'red')
         custom_print('Please manually delete it.', 'red')
@@ -96,7 +95,7 @@ def delete_user_zip(user_zip):
         f'>>> I am in protect.delete_user_zip({user_zip=!s})', is_print=False)
     custom_print('Deleting...')
     try:
-        os.remove(extracted + user_zip)
+        os.remove(f'{extracted}{user_zip}')
     except Exception as e:
         custom_print(e, 'red')
         custom_print('Please manually delete it.', 'red')
@@ -111,10 +110,10 @@ def kill_me():
         if(is_windows):
             os.startfile(os.path.realpath(extracted))
         elif(is_linux):
-            os.system('xdg-open ' + os.path.realpath(extracted))
+            os.system(f'xdg-open {os.path.realpath(extracted)}')
         else:
             try:
-                os.system('open ' + os.path.realpath(extracted))
+                os.system(f'open {os.path.realpath(extracted)}')
             except Exception as e:
                 custom_print(e, is_print=False)
     except Exception as e:
@@ -131,9 +130,8 @@ def list_user_files():
     custom_print('Available user files in extracted directory.')
     custom_print('\n', is_get_time=False)
     all_files = next(os.walk(extracted))[2]
-    if(len(all_files) == 1 and os.path.isfile(extracted + '.placeholder')):
-        custom_print('No user files found in \"' +
-                     extracted + '\" folder.', 'red')
+    if(len(all_files) == 1 and os.path.isfile(f'{extracted}.placeholder')):
+        custom_print(f'No user files found in \"{extracted}\" folder.', 'red')
         kill_me()
     for f in all_files:
         if(f != '.placeholder'):
@@ -147,8 +145,7 @@ def list_user_folders():
     custom_print('\n', is_get_time=False)
     all_folders = next(os.walk(extracted))[1]
     if(len(all_folders) == 0):
-        custom_print('No folders found in \"' +
-                     extracted + '\" folder.', 'red')
+        custom_print(f'No folders found in \"{extracted}\" folder.', 'red')
         kill_me()
     for folder in all_folders:
         custom_print(folder)
@@ -177,28 +174,28 @@ def uncompress(user_zip):
     custom_print(
         f'>>> I am in protect.uncompress({user_zip=!s})', is_print=False)
     if(not str(user_zip).endswith('7z')):
-        user_zip = user_zip + '.7z'
-    if(not os.path.isfile(extracted + user_zip)):
-        custom_print('Could not find ' + extracted + user_zip)
+        user_zip = f'{user_zip}.7z'
+    if(not os.path.isfile(f'{extracted}{user_zip}')):
+        custom_print(f'Could not find {extracted}{user_zip}')
         kill_me()
-    elif(os.path.getsize(extracted + user_zip) <= 0):
-        custom_print(extracted + user_zip + ' is empty.')
+    elif(os.path.getsize(f'{extracted}{user_zip}') <= 0):
+        custom_print(f'{extracted}{user_zip} is empty.')
         kill_me()
     else:
         password = custom_input(
             'Enter password, leave empty for none: ', is_log=False)
         if(password):
-            password = ' -p' + password
-        os.system(seven_zip + ' e -aot ' + extracted + user_zip +
-                  ' -o' + extracted + user_zip.replace('.7z', '') + password)
+            password = f' -p{password}'
+        os.system(
+            f'{seven_zip} e -aot {extracted}{user_zip} -o{extracted}{user_zip.replace(".7z", "")} {password}')
         custom_print('\n', is_get_time=False)
         custom_print(
             'If you see \"Everything is OK\" in above line then you can delete user zip file.')
         is_delete_user_zip = custom_input(
-            'Delete ' + user_zip + ' ? (default n): ') or 'N'
+            f'Delete {user_zip} ? (default n): ') or 'N'
         custom_print('\n', is_get_time=False)
-        custom_print('\aYour extracted \"' + user_zip.replace('.7z',
-                                                              '') + '\" folder is in \"' + os.path.realpath(extracted + user_zip.replace('.7z', '')) + '\" folder.', 'yellow')
+        custom_print(
+            f'\aYour extracted \"{user_zip.replace(".7z","")}\" folder is in \"{os.path.realpath(extracted + user_zip.replace(".7z", ""))}\" folder.', 'yellow')
         custom_print('\n', is_get_time=False)
         custom_input('Hit \"Enter\" key to continue.')
         if(is_delete_user_zip.upper() == 'Y'):

restore_whatsapp.py

@@ -33,10 +33,10 @@ def reinstall_whatsapp(adb):
     custom_print(
         f'>>> I am in restore_whatsapp.restore_whatsapp({adb=!s})', is_print=False)
     custom_print('Reinstalling original WhatsApp.')
-    if('/data/local/tmp/WhatsAppbackup.apk' in subprocess.getoutput(adb + ' shell ls /data/local/tmp/WhatsAppbackup.apk')):
+    if('/data/local/tmp/WhatsAppbackup.apk' in subprocess.getoutput(f'{adb} shell ls /data/local/tmp/WhatsAppbackup.apk')):
         try:
             reinstall_whatsapp_out = subprocess.getoutput(
-                adb + ' shell pm install /data/local/tmp/WhatsAppbackup.apk')
+                f'{adb} shell pm install /data/local/tmp/WhatsAppbackup.apk')
             if('Success' in reinstall_whatsapp_out):
                 custom_print('Reinstallation complete.')
                 kill_me()
@@ -102,9 +102,9 @@ def show_banner():
     # Global command line helpers
     helpers = 'helpers/'
     if(is_windows):
-        adb = 'bin\\adb.exe -s ' + adb_device_serial_id
+        adb = f'bin\\adb.exe -s {adb_device_serial_id}'
     else:
-        adb = 'adb -s ' + adb_device_serial_id
+        adb = f'adb -s {adb_device_serial_id}'
 
     os.system('cls' if os.name == 'nt' else 'clear')
     show_banner()