- Roll up MacOS related changes. #187 and #190

- Logging improvements
- When Magisk delta is installed, automatically set the package to: `io.github.huskydg.magisk`

Author: badabing2005

Main.py

@@ -2184,9 +2184,11 @@ def _refresh_ui(self):
     def _print_device_details(self, device):
         m_version = 0
         m_app_version = 0
-        message = ''
+
         print('')
+        message = '=======================================\n'
         message += f"Selected Device on {datetime.now():%Y-%m-%d %H:%M:%S}:\n"
+        message += '=======================================\n'
         message += f"    Device ID:                       {device.id}\n"
         message += f"    Device Model:                    {device.hardware}\n"
         message += f"    Device Active Slot:              {device.active_slot}\n"
@@ -2656,7 +2658,7 @@ def update_widget_states(self):
                 self.pif_info_menu_item:                ['device_attached'],
                 self.props_as_json_menu_item:           ['device_attached'],
                 self.xml_view_menu_item:                ['device_attached'],
-                self.cancel_ota_menu_item:              ['device_attached'],
+                self.cancel_ota_menu_item:              ['device_attached', 'device_mode_adb'],
                 self.push_menu:                         ['device_attached'],
                 self.push_file_to_tmp_menu:             ['device_attached'],
                 self.push_file_to_download_menu:        ['device_attached'],

build-on-mac.spec

@@ -28,6 +28,6 @@ exe = EXE(pyz,
           icon='images/icon-dark-256.icns')
 app = BUNDLE(exe,
              name='PixelFlasher.app',
-             version='6.9.2.4',
+             version='6.9.2.5',
              icon='./images/icon-dark-256.icns',
              bundle_identifier='com.badabing.pixelflasher')

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 rm -rf build dist
-VERSION=6.9.2.4
+VERSION=6.9.2.5
 NAME="PixelFlasher"
 DIST_NAME="PixelFlasher"
 

constants.py

@@ -2,7 +2,7 @@
 
 APPNAME = 'PixelFlasher'
 CONFIG_FILE_NAME = 'PixelFlasher.json'
-VERSION = '6.9.2.4'
+VERSION = '6.9.2.5'
 SDKVERSION = '33.0.3'
 MAIN_WIDTH = 1400
 MAIN_HEIGHT = 1040

modules.py

@@ -1787,6 +1787,10 @@ def patch_magisk_script(patch_method):
                 magisk_path = f"{self.config.phone_path}/Magisk-Uploaded.apk"
             else:
                 magisk_path = device.magisk_path
+            if not magisk_path:
+                print("ERROR: Magisk path is empty!\nAborting ...")
+                puml("#red:Magisk path is empty;\n")
+                return -1
             data += f"MAGISK_PATH={magisk_path}\n"
 
             if patch_method in ["app", "other"]:
@@ -4095,7 +4099,7 @@ def flash_phone(self):
     os.chdir(package_dir_full)
     theCmd = f"\"{theCmd}\""
     debug(theCmd)
-    res = run_shell2(theCmd, env=get_env_variables())
+    res = run_shell2(theCmd)
     if res.returncode != 0:
         print(f"\n❌ {datetime.now():%Y-%m-%d %H:%M:%S} ERROR: Encountered an error while running flash script.")
         print(f"theCmd: {theCmd}")

phone.py

@@ -751,6 +751,7 @@ def get_verity_verification(self, item):
     # ----------------------------------------------------------------------------
     def reset_ota_update(self):
         if self.mode != 'adb':
+            print(f"\n❌ {datetime.now():%Y-%m-%d %H:%M:%S} ERROR: reset_ota_update function is only available in adb mode.\nAborting ...")
             return -1
         if not self.rooted:
             return -1
@@ -2476,7 +2477,7 @@ def get_magisk_apk_details(self, channel):
             note_link = data['magisk']['note']
             setattr(ma, 'note_link', note_link)
             setattr(ma, 'package', MAGISK_PKG_NAME)
-            if channel in ['delta canary', 'delta debug']:
+            if channel in ['Magisk Delta Canary', 'Magisk Delta Debug']:
                 setattr(ma, 'package', MAGISK_DELTA_PKG_NAME)
             # Get the note contents
             headers = {}
@@ -3363,12 +3364,12 @@ def scrcpy(self):
                 if sys.platform.startswith("win"):
                     # subprocess.Popen(theCmd, cwd=scrcpy_folder, start_new_session=True, creationflags=subprocess.CREATE_NEW_CONSOLE)
                     debug(theCmd)
-                    res = run_shell2(theCmd, directory=scrcpy_folder, detached=True, creationflags=subprocess.CREATE_NEW_CONSOLE)
+                    res = run_shell3(theCmd, directory=scrcpy_folder, detached=True, creationflags=subprocess.CREATE_NEW_CONSOLE)
                 elif sys.platform.startswith("linux") and config.linux_shell:
                     # subprocess.Popen([get_linux_shell(), "--", "/bin/bash", "-c", theCmd], start_new_session=True)
                     theCmd = f"{get_linux_shell()} -- /bin/bash -c {theCmd}"
                     debug(theCmd)
-                    res = run_shell2(theCmd, detached=True)
+                    res = run_shell3(theCmd, detached=True)
                 elif sys.platform.startswith("darwin"):
                     script_file = tempfile.NamedTemporaryFile(delete=False, suffix='.sh')
                     script_file_content = f'#!/bin/bash\n{theCmd}\nrm "{script_file.name}"'
@@ -3379,7 +3380,7 @@ def scrcpy(self):
                     theCmd = f"osascript -e 'tell application \"Terminal\" to do script \"{script_file.name}\"'"
                     debug(theCmd)
                     # subprocess.Popen(['osascript', '-e', f'tell application "Terminal" to do script "{script_file.name}"'], start_new_session=True, env=get_env_variables())
-                    res = run_shell2(theCmd, detached=True, env=get_env_variables())
+                    res = run_shell3(theCmd, detached=True, env=get_env_variables())
                 return 0
             else:
                 print(f"\n❌ {datetime.now():%Y-%m-%d %H:%M:%S} ERROR: The Device: {self.id} is not in adb mode.")

runtime.py

@@ -3504,7 +3504,46 @@ def run_shell(cmd, timeout=None, encoding='ISO-8859-1'):
 #                               Function run_shell2
 # ============================================================================
 # This one pipes the stdout and stderr to Console text widget in realtime,
-def run_shell2(cmd, timeout=None, detached=False, directory=None, encoding='ISO-8859-1', creationflags=0, env=None):
+def run_shell2(cmd, timeout=None, detached=False, directory=None, encoding='ISO-8859-1'):
+    try:
+        flush_output()
+        if directory is None:
+            proc = subprocess.Popen(f"{cmd}", shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, encoding=encoding, errors="replace", start_new_session=detached, env=get_env_variables())
+        else:
+            proc = subprocess.Popen(f"{cmd}", cwd=directory, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, encoding=encoding, errors="replace", start_new_session=detached, env=get_env_variables())
+
+        print
+        while True:
+            line = proc.stdout.readline()
+            wx.YieldIfNeeded()
+            if line.strip() != "":
+                print(line.strip())
+            if not line:
+                break
+            if timeout is not None and time.time() > timeout:
+                proc.terminate()
+                print(f"\n❌ {datetime.now():%Y-%m-%d %H:%M:%S} ERROR: Command {cmd} timed out after {timeout} seconds")
+                puml("#red:Command timed out;\n", True)
+                puml(f"note right\nCommand {cmd} timed out after {timeout} seconds\nend note\n")
+                return subprocess.CompletedProcess(args=cmd, returncode=-1, stdout='', stderr='')
+        proc.wait()
+        # Wait for the process to complete and capture the output
+        stdout, stderr = proc.communicate()
+        return subprocess.CompletedProcess(args=cmd, returncode=proc.returncode, stdout=stdout, stderr=stderr)
+    except Exception as e:
+        print(f"\n❌ {datetime.now():%Y-%m-%d %H:%M:%S} ERROR: Encountered an error while executing run_shell2 {cmd}")
+        traceback.print_exc()
+        puml("#red:Encountered an error;\n", True)
+        puml(f"note right\n{e}\nend note\n")
+        raise e
+        # return subprocess.CompletedProcess(args=cmd, returncode=-2, stdout='', stderr='')
+
+
+# ============================================================================
+#                               Function run_shell3
+# ============================================================================
+# This one pipes the stdout and stderr to Console text widget in realtime,
+def run_shell3(cmd, timeout=None, detached=False, directory=None, encoding='ISO-8859-1', creationflags=0, env=None):
     try:
         flush_output()
         proc_args = {
@@ -3551,7 +3590,7 @@ def read_output():
         return proc
 
     except Exception as e:
-        print(f"\n❌ {datetime.now():%Y-%m-%d %H:%M:%S} ERROR: Encountered an error while executing run_shell2 {cmd}")
+        print(f"\n❌ {datetime.now():%Y-%m-%d %H:%M:%S} ERROR: Encountered an error while executing run_shell3 {cmd}")
         traceback.print_exc()
         puml("#red:Encountered an error;\n", True)
         puml(f"note right\n{e}\nend note\n")

windows-metadata.yaml

@@ -1,6 +1,6 @@
 # https://github.com/DudeNr33/pyinstaller-versionfile
 # create-version-file windows-metadata.yaml --outfile windows-version-info.txt
-Version: 6.9.2.4
+Version: 6.9.2.5
 FileDescription: PixelFlasher
 InternalName: PixelFlasher
 OriginalFilename: PixelFlasher.exe

windows-version-info.txt

@@ -7,8 +7,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0. Must always contain 4 elements.
-    filevers=(6,9,2,4),
-    prodvers=(6,9,2,4),
+    filevers=(6,9,2,5),
+    prodvers=(6,9,2,5),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -32,12 +32,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u''),
         StringStruct(u'FileDescription', u'PixelFlasher'),
-        StringStruct(u'FileVersion', u'6.9.2.4'),
+        StringStruct(u'FileVersion', u'6.9.2.5'),
         StringStruct(u'InternalName', u'PixelFlasher'),
         StringStruct(u'LegalCopyright', u''),
         StringStruct(u'OriginalFilename', u'PixelFlasher.exe'),
         StringStruct(u'ProductName', u'PixelFlasher'),
-        StringStruct(u'ProductVersion', u'6.9.2.4')])
+        StringStruct(u'ProductVersion', u'6.9.2.5')])
       ]),
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]