Minor Code cleanup

.gitignore

@@ -7,3 +7,4 @@ latest
 *.egg-info
 build
 dist
+/.idea

asahi_firmware/bluetooth.py

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: MIT
-import logging, os, os.path, re, sys
+import logging
+import os
+import os.path
+import re
+import sys
 from collections import namedtuple, defaultdict
 
 from .core import FWFile

asahi_firmware/core.py

@@ -1,7 +1,10 @@
 # SPDX-License-Identifier: MIT
-import tarfile, io, logging
+import io
+import logging
+import tarfile
 from hashlib import sha256
 
+
 class FWFile(object):
     def __init__(self, name, data):
         self.name = name
@@ -19,6 +22,7 @@ def __eq__(self, other):
     def __hash__(self):
         return hash(self.sha)
 
+
 class FWPackage(object):
     def __init__(self, target):
         self.path = target

asahi_firmware/img4.py

@@ -2,6 +2,7 @@
 
 from . import asn1
 
+
 def img4p_extract(data):
     decoder = asn1.Decoder()
     decoder.start(data)

asahi_firmware/multitouch.py

@@ -1,15 +1,21 @@
 # SPDX-License-Identifier: MIT
+import logging
+import os
+import plistlib
+import struct
 import xml.etree.ElementTree as ET
-import plistlib, base64, struct, os, logging
-from .img4 import img4p_extract
+
 from .core import FWFile
+from .img4 import img4p_extract
 
 log = logging.getLogger("asahi_firmware.multitouch")
 
+
 def load_plist_xml(d):
     root = ET.fromstring(d.decode("ascii"))
 
     idmap = {}
+
     def unmunge(el, idmap):
         if "ID" in el.attrib:
             idmap[el.attrib["ID"]] = el
@@ -29,6 +35,7 @@ def unmunge(el, idmap):
 
     return plistlib.loads(ET.tostring(pl))
 
+
 def plist_to_bin(plist):
     iface_offset = None
 
@@ -123,6 +130,7 @@ def add_padding(l):
 
     return hdr + blob
 
+
 class MultitouchFWCollection(object):
     def __init__(self, source_path):
         self.fwfiles = []

asahi_firmware/update.py

@@ -1,10 +1,13 @@
 # SPDX-License-Identifier: MIT
-import pathlib, tempfile, subprocess
+import pathlib
+import subprocess
+import tempfile
 
-from .core import FWPackage
-from .wifi import WiFiFWCollection
 from .bluetooth import BluetoothFWCollection
+from .core import FWPackage
 from .multitouch import MultitouchFWCollection
+from .wifi import WiFiFWCollection
+
 
 def update_firmware(source, dest, manifest):
     raw_fw = source.joinpath("all_firmware.tar.gz")
@@ -30,6 +33,7 @@ def update_firmware(source, dest, manifest):
 
     pkg.save_manifest(manifest)
 
+
 if __name__ == "__main__":
     import argparse
     import logging

asahi_firmware/wifi.py

@@ -1,9 +1,14 @@
 # SPDX-License-Identifier: MIT
-import sys, os, os.path, pprint, statistics, logging
+import logging
+import os
+import os.path
+import sys
+
 from .core import FWFile
 
 log = logging.getLogger("asahi_firmware.wifi")
 
+
 class FWNode(object):
     def __init__(self, this=None, leaves=None):
         if leaves is None:
@@ -25,6 +30,7 @@ def print(self, depth=0, tag=""):
         for k, v in self.leaves.items():
             v.print(depth + 1, k)
 
+
 class WiFiFWCollection(object):
     EXTMAP = {
         "trx": "bin",
@@ -33,6 +39,7 @@ class WiFiFWCollection(object):
         "txcb": "txcap_blob",
     }
     DIMS = ["C", "s", "P", "M", "V", "m", "A"]
+
     def __init__(self, source_path):
         self.root = FWNode()
         self.load(source_path)
@@ -138,6 +145,7 @@ def process_nvram(self, data):
     def print(self):
         self.root.print()
 
+
 if __name__ == "__main__":
     col = WiFiFWCollection(sys.argv[1])
     if len(sys.argv) > 2:

src/diskutil.py

@@ -1,7 +1,11 @@
 # SPDX-License-Identifier: MIT
-import plistlib, subprocess, sys, logging
+import logging
+import plistlib
+import subprocess
+import sys
 from dataclasses import dataclass
 
+
 @dataclass
 class Partition:
     name: str
@@ -16,8 +20,10 @@ class Partition:
     container: object = None
     os: object = None
 
+
 class DiskUtil:
     FREE_THRESHOLD = 16 * 1024 * 1024
+
     def __init__(self):
         self.verbose = "-v" in sys.argv
 

src/main.py

@@ -1,9 +1,20 @@
 #!/usr/bin/python3
 # SPDX-License-Identifier: MIT
-import os, os.path, shlex, subprocess, sys, time, termios, json, getpass
+import getpass
+import json
+import os.path
+import shlex
+import subprocess
+import termios
+import time
 from dataclasses import dataclass
 
-import system, osenum, stub, diskutil, osinstall, asahi_firmware
+import asahi_firmware
+import diskutil
+import osenum
+import osinstall
+import stub
+import system
 from util import *
 
 PART_ALIGN = psize("1MiB")
@@ -21,6 +32,7 @@
 MIN_MACOS_VERSION = "12.3"
 MIN_MACOS_VERSION_EXPERT = "12.1"
 
+
 @dataclass
 class IPSW:
     version: str
@@ -31,11 +43,13 @@ class IPSW:
     expert_only: bool
     url: str
 
+
 @dataclass
 class Device:
     min_ver: str
     expert_only: bool
 
+
 CHIP_MIN_VER = {
     0x8103: "11.0",     # T8103, M1
     0x6000: "12.0",     # T6000, M1 Pro
@@ -85,6 +99,7 @@ class Device:
          "https://updates.cdn-apple.com/2022SpringFCS/fullrestores/071-08757/74A4F2A1-C747-43F9-A22A-C0AD5FB4ECB6/UniversalMac_12.3_21E230_Restore.ipsw"),
 ]
 
+
 class InstallerMain:
     def __init__(self):
         self.data = json.load(open("installer_data.json"))
@@ -828,6 +843,7 @@ def main_loop(self):
         elif act == "q":
             return False
 
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG,
                         format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',

src/osenum.py

@@ -1,12 +1,15 @@
 # SPDX-License-Identifier: MIT
-import os, os.path, plistlib, subprocess, logging
+import os.path
+import plistlib
+import subprocess
 from dataclasses import dataclass
 
 from util import *
 
 UUID_SROS = "3D3287DE-280D-4619-AAAB-D97469CA9C71"
 UUID_FROS = "C8858560-55AC-400F-BBB9-C9220A8DAC0D"
 
+
 @dataclass
 class OSInfo:
     partition: object
@@ -48,6 +51,7 @@ def __str__(self):
         else:
             return f"[{lbl}] {col(BRIGHT, RED)}incomplete install{col()} (macOS {self.version} stub) [{self.sys_volume}, {self.vgid}]"
 
+
 class OSEnum:
     def __init__(self, sysinfo, dutil, sysdsk):
         self.sysinfo = sysinfo

src/osinstall.py

@@ -1,10 +1,14 @@
 # SPDX-License-Identifier: MIT
-import os, shutil, sys, stat, subprocess, urlcache, zipfile, logging
+import subprocess
+import urlcache
+import zipfile
 
 from util import *
 
+
 class OSInstaller(PackageInstaller):
     PART_ALIGNMENT = 1024 * 1024
+
     def __init__(self, dutil, data, template):
         super().__init__()
         self.dutil = dutil
@@ -18,12 +22,15 @@ def __init__(self, dutil, data, template):
     @property
     def default_os_name(self):
         return self.template["default_os_name"]
+
     @property
     def min_size(self):
         return sum(self.align(psize(part["size"])) for part in self.template["partitions"])
+
     @property
     def expandable(self):
         return any(part.get("expand", False) for part in self.template["partitions"])
+
     @property
     def needs_firmware(self):
         return any(p.get("copy_firmware", False) for p in self.template["partitions"])

src/stub.py

@@ -1,11 +1,17 @@
 # SPDX-License-Identifier: MIT
-import os, os.path, plistlib, shutil, sys, stat, subprocess, urlcache, zipfile, logging, json
-import osenum
-from asahi_firmware.wifi import WiFiFWCollection
+import json
+import os.path
+import plistlib
+import subprocess
+import urlcache
+import zipfile
+
 from asahi_firmware.bluetooth import BluetoothFWCollection
 from asahi_firmware.multitouch import MultitouchFWCollection
+from asahi_firmware.wifi import WiFiFWCollection
 from util import *
 
+
 class StubInstaller(PackageInstaller):
     def __init__(self, sysinfo, dutil, osinfo, ipsw_info):
         super().__init__()

src/system.py

@@ -1,8 +1,11 @@
 # SPDX-License-Identifier: MIT
-import base64, plistlib, struct, subprocess, logging
+import plistlib
+import struct
+import subprocess
 
 from util import *
 
+
 class SystemInfo:
     def __init__(self):
         self.fetch()

src/urlcache.py

@@ -1,15 +1,18 @@
 # SPDX-License-Identifier: MIT
-import os, sys, os.path, time, logging
+import os.path
+import time
 from dataclasses import dataclass
-
 from urllib import request
+
 from util import *
 
+
 @dataclass
 class CacheBlock:
     idx: int
     data: bytes
 
+
 class URLCache:
     CACHESIZE = 128
     BLOCKSIZE = 1 * 1024 * 1024
@@ -137,6 +140,7 @@ def flush_progress(self):
         else:
             return False
 
+
 if __name__ == "__main__":
     import sys, zipfile