fixed downloading smartdock

README.md

@@ -166,7 +166,7 @@ chmod 777 -R /mnt/*/*/*/*/Android/obb
 ![](assets/7.png)
 
 ```
-sudo venv/bin/python3 main.py install microg
+sudo python main.py install microg
 ```
 
 ## Hide Status Bar

default.nix

@@ -1,4 +1,22 @@
-let
+with (import <nixpkgs> {});
-  pkgs = import <nixpkgs> {};
+
-in
+stdenv.mkDerivation {
-  pkgs.callPackage ./package.nix { }
+  name = "waydroid_script";
+
+  buildInputs = [
+    (python3.withPackages(ps: with ps; [ tqdm requests inquirerpy ]))
+  ];
+
+  src = ./.;
+
+  postPatch = ''
+    patchShebangs main.py
+  '';
+
+  installPhase = ''
+    mkdir -p $out/libexec
+    cp -r . $out/libexec/waydroid_script
+    mkdir -p $out/bin
+    ln -s $out/libexec/waydroid_script/main.py $out/bin/waydroid_script
+  '';
+}

flake.lock

@@ -1,41 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1707650010,
-        "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,21 +0,0 @@
-{
-  description = "Waydroid Extras Script";
-  inputs = {
-    systems.url = "github:nix-systems/default";
-  };
-  outputs = { self, nixpkgs, systems }:
-  let
-    inherit (nixpkgs) lib;
-    eachSystem = lib.genAttrs (import systems);
-    mkApp = program: { type = "app"; inherit program; };
-  in {
-    packages = eachSystem (system: rec {
-      waydroid_script = nixpkgs.legacyPackages."${system}".callPackage ./package.nix { };
-      default = waydroid_script;
-    });
-    apps = eachSystem (system: rec {
-      waydroid_script = mkApp "${self.outputs.packages.${system}.waydroid_script}/bin/waydroid_script";
-      default = waydroid_script;
-    });
-  };
-}

main.py

@@ -210,7 +210,7 @@ def interact():
             Choice(name="Android 13", value="13"),
             Choice(name="Exit", value=None)
         ],
-        default="13",
+        default="11",
     ).execute()
     if not android_version:
         exit()
@@ -229,9 +229,10 @@ def interact():
     if not action:
         exit()
 
-    install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine",]
+    install_choices = ["gapps", "microg", "libndk", "magisk", "smartdock", "fdroidpriv",]
     hack_choices = []
     if android_version=="11":
+        install_choices.extend(["libhoudini", "widevine"])
         hack_choices.extend(["nodataperm", "hidestatusbar"])
 
     if action == "Install":
@@ -287,7 +288,7 @@ def main():
     parser.add_argument('-a', '--android-version',
                         dest='android_version',
                         help='Specify the Android version',
-                        default="13",
+                        default="11",
                         choices=["11", "13"])
 
     # android command

package.nix

@@ -1,32 +0,0 @@
-{ lib,
-  stdenvNoCC,
-  lzip,
-  python3,
-  makeWrapper }:
-let
-  wrappedPath = lib.makeBinPath [ lzip ];
-in stdenvNoCC.mkDerivation {
-  name = "waydroid_script";
-
-  buildInputs = [
-    (python3.withPackages(ps: with ps; [ tqdm requests inquirerpy ]))
-  ];
-
-  nativeBuildInputs = [
-    makeWrapper
-  ];
-
-  src = ./.;
-
-  postPatch = ''
-    patchShebangs main.py
-  '';
-
-  installPhase = ''
-    mkdir -p $out/libexec
-    cp -r . $out/libexec/waydroid_script
-    mkdir -p $out/bin
-    makeShellWrapper $out/libexec/waydroid_script/main.py $out/bin/waydroid_script \
-      --prefix PATH : "${wrappedPath}"
-  '';
-}

stuff/fdroidpriv.py

@@ -6,8 +6,6 @@ from stuff.general import General
 class FDroidPriv(General):
     id = "fdroid priv"
     dl_links = {"11": ["https://f-droid.org/repo/org.fdroid.fdroid.privileged.ota_2130.zip",
-                       "6242cab56d197d80c598593a46da62e4"],
-               "13": ["https://f-droid.org/repo/org.fdroid.fdroid.privileged.ota_2130.zip",
                        "6242cab56d197d80c598593a46da62e4"]}
     partition = "system"
     dl_file_name = "org.fdroid.fdroid.privileged.ota_2130.zip"

stuff/houdini.py

@@ -10,7 +10,7 @@ class Houdini(General):
     partition = "system"
     dl_links = {
         "11": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/81f2a51ef539a35aead396ab7fce2adf89f46e88.zip", "fbff756612b4144797fbc99eadcb6653"],
-        "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/9e77896350caccd228b36b2e1b4a994aa4bd48da.zip", "3807fe029559db3037efe245d9e74270"]
+        # "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/978d8cba061a08837b7e520cd03b635af643ba08.zip", "1e139054c05034648fae58a1810573b4"]
     }
     act_md5 = ...
     dl_link = ...

stuff/ndk.py

@@ -9,12 +9,12 @@ class Ndk(General):
     partition = "system"
     dl_links = {
         "11": ["https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/9324a8914b649b885dad6f2bfd14a67e5d1520bf.zip", "c9572672d1045594448068079b34c350"],
-        "13": ["https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/68734c52556d3d7a6db34c603dd9276915c29f2f.zip", "0b2207c490fcb400aa5c87fcf0d52d38"]
+        "13": ["https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/a090003c60df53a9eadb2df09bd4fd2fa86ea629.zip", "e6f0d9fc28ebc427b59a3942a9a4ffc0"]
     }
     dl_file_name = "libndktranslation.zip"
     extract_to = "/tmp/libndkunpack"
     apply_props = {
-        "ro.product.cpu.abilist": "x86_64,x86,arm64-v8a,armeabi-v7a,armeabi",
+        "ro.product.cpu.abilist": "x86_64,x86,armeabi-v7a,armeabi,arm64-v8a",
         "ro.product.cpu.abilist32": "x86,armeabi-v7a,armeabi",
         "ro.product.cpu.abilist64": "x86_64,arm64-v8a",
         "ro.dalvik.vm.native.bridge": "libndk_translation.so",
@@ -49,4 +49,4 @@ class Ndk(General):
         Logger.info("Copying libndk library files ...")
         name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
         shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_ndk_translation-prebuilt-" + name,
-                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
+                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)

stuff/nodataperm.py

@@ -10,23 +10,19 @@ from tools import container
 class Nodataperm(General):
     id = "nodataperm"
     dl_links = {
-        "11": {
+        "11":
-            "x86_64": [
+        {
-                "https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
-                "b0e3908ffcf5df8ea62f4929aa680f1a"
-            ],
-        },
-        "13": {
             "x86_64": [
                 "https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
                 "b0e3908ffcf5df8ea62f4929aa680f1a"
             ],
         },
+        "13": {}
     }
     dl_file_name = "nodataperm.zip"
     extract_to = "/tmp/nodataperm"
-    dl_link = None
+    dl_link = ...
-    act_md5 = None
+    act_md5 = ...
     partition = "system"
     files = [
         "etc/nodataperm.sh",
@@ -40,15 +36,11 @@ class Nodataperm(General):
         super().__init__()
         print("ok")
         arch = self.arch[0]
-        if android_version not in self.dl_links:
-            raise KeyError(f"No download links for Android version '{android_version}'")
-        if arch not in self.dl_links[android_version]:
-            raise KeyError(f"No download links for architecture '{arch}' in Android version '{android_version}'")
         self.dl_link = self.dl_links[android_version][arch][0]
         self.act_md5 = self.dl_links[android_version][arch][1]
 
     def copy(self):
-        name = re.findall(r"([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
+        name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
         extract_path = os.path.join(
             self.extract_to, f"hack_full_data_permission-{name}")
         if not container.use_overlayfs():

stuff/smartdock.py

@@ -4,32 +4,32 @@ from stuff.general import General
 
 class Smartdock(General):
     id = "smartdock"
-    dl_link = "https://f-droid.org/repo/cu.axel.smartdock_1100.apk"
+    dl_link = "https://f-droid.org/repo/cu.axel.smartdock_1121.apk"
     partition = "system"
     dl_file_name = "smartdock.apk"
-    act_md5 = "f4087d34218eac902a5cca98ee03d215"
+    act_md5 = "dde94e2babc5f78bf7279e60a98eef05"
     apply_props = { "qemu.hw.mainkeys" : "1" }
     skip_extract = True
     permissions = """<?xml version="1.0" encoding="utf-8"?>
 <permissions>
     <privapp-permissions package="cu.axel.smartdock">
-	    <permission name="android.permission.SYSTEM_ALERT_WINDOW" />
+        <permission name="android.permission.SYSTEM_ALERT_WINDOW" />
-	    <permission name="android.permission.GET_TASKS"/>
+	    <permission name="android.permission.GET_TASKS" />
-	    <permission name="android.permission.REORDER_TASKS"/>
+	    <permission name="android.permission.REORDER_TASKS" />
-        <permission name="android.permission.REMOVE_TASKS" />
+	    <permission name="android.permission.ACCESS_WIFI_STATE" />
-        <permission name="android.permission.ACCESS_WIFI_STATE"/>
+	    <permission name="android.permission.CHANGE_WIFI_STATE" />
-	    <permission name="android.permission.CHANGE_WIFI_STATE"/>
+	    <permission name="android.permission.ACCESS_NETWORK_STATE" />
-        <permission name="android.permission.ACCESS_NETWORK_STATE"/>
+	    <permission name="android.permission.READ_EXTERNAL_STORAGE" />
-        <permission name="android.permission.ACCESS_FINE_LOCATION"/>
+	    <permission name="android.permission.MANAGE_USERS" />
-        <permission name="android.permission.READ_EXTERNAL_STORAGE"/>
+	    <permission name="android.permission.BLUETOOTH_ADMIN" />
-        <permission name="android.permission.MANAGE_USERS"/>
+	    <permission name="android.permission.BLUETOOTH" />
-        <permission name="android.permission.BLUETOOTH_ADMIN"/>
+	    <permission name="android.permission.BLUETOOTH_CONNECT" />
-        <permission name="android.permission.BLUETOOTH_CONNECT"/>
+	    <permission name="android.permission.REQUEST_DELETE_PACKAGES" />
-        <permission name="android.permission.BLUETOOTH"/>
+	    <permission name="android.permission.ACCESS_SUPERUSER" />
-	    <permission name="android.permission.REQUEST_DELETE_PACKAGES"/>
+	    <permission name="android.permission.PACKAGE_USAGE_STATS" />
-        <permission name="android.permission.ACCESS_SUPERUSER"/>
+	    <permission name="android.permission.QUERY_ALL_PACKAGES" />
-        <permission name="android.permission.PACKAGE_USAGE_STATS" />
+	    <permission name="android.permission.WRITE_SECURE_SETTINGS" />
-        <permission name="android.permission.QUERY_ALL_PACKAGES" />
+	    <permission name="android.permission.WRITE_SETTINGS" />
     </privapp-permissions>
 </permissions>
     """

stuff/widevine.py

@@ -13,8 +13,8 @@ class Widevine(General):
         "x86_64": {
             "11": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/48d1076a570837be6cdce8252d5d143363e37cc1.zip",
                    "f587b8859f9071da4bca6cea1b9bed6a"],
-            "13": ["https://github.com/WayDroid-ATV/vendor_google_proprietary_widevine-prebuilt/archive/679552343d8b2e8d7a19b6df61c7a03963d0c75b.zip",
+            "13": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a8524d608431573ef1c9313822d271f78728f9a6.zip",
-                   "80ab79ea85c7b2556baedb371a54e01c"]
+                   "5c55df61da5c012b4e43746547ab730f"]
         },
         # "armeabi-v7a": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip", "fed6898b5cfd2a908cb134df97802554"],
         "arm64-v8a": {
@@ -30,10 +30,7 @@ class Widevine(General):
         "etc/init/*widevine.rc",
         "etc/vintf/manifest/*widevine.xml",
         "lib/libwvhidl.so",
-        "lib/libwvaidl.so",
         "lib/mediadrm",
-        "lib64/libwvhidl.so",
-        "lib64/libwvaidl.so",
         "lib64/mediadrm"
     ]
 
@@ -41,17 +38,9 @@ class Widevine(General):
         super().__init__()
         self.dl_link = self.dl_links[self.arch[0]][android_version][0]
         self.act_md5 = self.dl_links[self.arch[0]][android_version][1]
-        self.android_version = android_version
-        self.libdir = "lib64" if self.arch[1] == 64 else "lib"
 
     def copy(self):
         name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
         Logger.info("Copying widevine library files ...")
         shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_widevine-prebuilt-"+name,
                         "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
-        if self.android_version == "13":
-            try:
-                os.symlink("libprotobuf-cpp-lite-3.9.1.so",
-                           os.path.join(self.copy_dir, self.partition, self.libdir, "libprotobuf-cpp-lite.so"))
-            except FileExistsError:
-                pass

tools/container.py

@@ -1,9 +1,23 @@
 import configparser
 import os
 import sys
+# import dbus
 from tools.helper import run
 from tools.logger import Logger
 
+# def DBusContainerService(object_path="/ContainerManager", intf="id.waydro.ContainerManager"):
+#     return dbus.Interface(dbus.SystemBus().get_object("id.waydro.Container", object_path), intf)
+
+# def DBusSessionService(object_path="/SessionManager", intf="id.waydro.SessionManager"):
+#     return dbus.Interface(dbus.SessionBus().get_object("id.waydro.Session", object_path), intf)
+
+# def use_dbus():
+#     try:
+#         DBusContainerService()
+#     except:
+#         return False
+#     return True
+
 def use_overlayfs():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
@@ -20,14 +34,20 @@ def use_overlayfs():
     return False
 
 
+# def get_session():
+#     return DBusContainerService().GetSession()
+
 def stop():
+    # if use_dbus():
+    #     session = DBusContainerService().GetSession()
+    #     if session:
+    #         DBusContainerService().Stop(False)
+    # else:
         run(["waydroid", "container", "stop"])
 
+
 def is_running():
         return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
 
 def upgrade():
-    try:
+    run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
-        run(["waydroid", "upgrade"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
-    except subprocess.CalledProcessError:
-        Logger.warning("Waydroid upgrade reported an error (likely system_ota), but we are continuing...")

tools/helper.py

@@ -2,6 +2,7 @@ import gzip
 import os
 import re
 import platform
+import re
 import subprocess
 import sys
 import requests
@@ -10,24 +11,27 @@ from tqdm import tqdm
 import hashlib
 from typing import Optional
 
+
 def get_download_dir():
-    if os.environ.get("XDG_CACHE_HOME"):
+    download_loc = ""
+    if os.environ.get("XDG_CACHE_HOME", None) is None:
+        download_loc = os.path.join('/', "home", os.environ.get(
+            "SUDO_USER", os.environ["USER"]), ".cache", "waydroid-script", "downloads"
+        )
+    else:
         download_loc = os.path.join(
             os.environ["XDG_CACHE_HOME"], "waydroid-script", "downloads"
         )
-    else:
-        user = os.environ.get("SUDO_USER", os.environ.get("USER", "root"))
-        download_loc = os.path.join("/", "home", user, ".cache", "waydroid-script", "downloads")
-        
     if not os.path.exists(download_loc):
-        os.makedirs(download_loc, exist_ok=True)
+        os.makedirs(download_loc)
     return download_loc
 
+# not good
 def get_data_dir():
-    user = os.environ.get("SUDO_USER", os.environ.get("USER", "root"))
+    return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid", "data")
-    return os.path.join("/", "home", user, ".local", "share", "waydroid", "data")
 
-def run(args: list, env: Optional[dict] = None, ignore: Optional[str] = None):
+# execute on host
+def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
     result = subprocess.run(
         args=args, 
         env=env, 
@@ -35,12 +39,11 @@ def run(args: list, env: Optional[dict] = None, ignore: Optional[str] = None):
         stderr=subprocess.PIPE
     )
 
+    # print(result.stdout.decode())
     if result.stderr:
-        error = result.stderr.decode("utf-8").strip()
+        error = result.stderr.decode("utf-8")
-        
+        if ignore and re.match(ignore, error):
-        if (ignore and re.search(ignore, error)) or "system_ota" in error:
             return result
-        
         Logger.error(error)
         raise subprocess.CalledProcessError(
             returncode=result.returncode,
@@ -49,58 +52,64 @@ def run(args: list, env: Optional[dict] = None, ignore: Optional[str] = None):
         )
     return result
 
+# execute on waydroid shell
 def shell(arg: str, env: Optional[str] = None):
-    cmd = ["sudo", "waydroid", "shell"]
+    a = subprocess.Popen(
-    process = subprocess.Popen(
+        args=["sudo", "waydroid", "shell"],
-        args=cmd,
         stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        stderr=subprocess.PIPE
-        text=True
     )
+    subprocess.Popen(
+        args=["echo", "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"],
+        stdout=a.stdin,
+        stdin=subprocess.PIPE
+    ).communicate()
 
-    boot_classpath = "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"
-    
-    full_script = f"{boot_classpath}\n"
     if env:
-        full_script += f"{env}\n"
+        subprocess.Popen(
-    full_script += f"{arg}\n"
+            args=["echo", env],
+            stdout=a.stdin,
+            stdin=subprocess.PIPE
+        ).communicate()
 
-    stdout, stderr = process.communicate(input=full_script)
+    subprocess.Popen(
+        args=["echo", arg],
+        stdout=a.stdin,
+        stdin=subprocess.PIPE
+    ).communicate()
 
-    if process.returncode != 0 and stderr:
+    a.stdin.close()
-        Logger.error(stderr.strip())
+    if a.stderr.read():
+        Logger.error(a.stderr.read().decode('utf-8'))
         raise subprocess.CalledProcessError(
-            returncode=process.returncode,
+            returncode=a.returncode,
-            cmd=cmd,
+            cmd=a.args,
-            stderr=stderr.encode()
+            stderr=a.stderr
         )
-    return stdout
+    return a.stdout.read().decode("utf-8")
 
 def download_file(url, f_name):
+    md5 = ""
     response = requests.get(url, stream=True)
     total_size_in_bytes = int(response.headers.get('content-length', 0))
-    block_size = 1024 
+    block_size = 1024  # 1 Kibibyte
-    
     progress_bar = tqdm(total=total_size_in_bytes, unit='iB', unit_scale=True)
     with open(f_name, 'wb') as file:
         for data in response.iter_content(block_size):
             progress_bar.update(len(data))
             file.write(data)
     progress_bar.close()
-
-    hash_md5 = hashlib.md5()
     with open(f_name, "rb") as f:
-        for chunk in iter(lambda: f.read(4096), b""):
+        bytes = f.read()
-            hash_md5.update(chunk)
+        md5 = hashlib.md5(bytes).hexdigest()
-    
     if total_size_in_bytes != 0 and progress_bar.n != total_size_in_bytes:
-        raise ValueError("Download incomplete or corrupted")
+        raise ValueError("Something went wrong while downloading")
-    
+    return md5
-    return hash_md5.hexdigest()
 
 def host():
     machine = platform.machine()
+
     mapping = {
         "i686": ("x86", 32),
         "x86_64": ("x86_64", 64),
@@ -108,37 +117,30 @@ def host():
         "armv7l": ("armeabi-v7a", 32),
         "armv8l": ("armeabi-v7a", 32)
     }
-    
     if machine in mapping:
-        if machine == "x86_64":
+        if mapping[machine] == "x86_64":
-            try:
+            with open("/proc/cpuinfo") as f:
-                with open("/proc/cpuinfo", "r") as f:
+                if "sse4_2" not in f.read():
-                    if "sse4_2" not in f.read():
+                    Logger.warning("x86_64 CPU does not support SSE4.2, falling back to x86...")
-                        Logger.warning("CPU does not support SSE4.2, falling back to x86...")
+                    return ("x86", 32)
-                        return ("x86", 32)
-            except Exception:
-                pass
         return mapping[machine]
-    
+    raise ValueError("platform.machine '" + machine + "'"
-    raise ValueError(f"Architecture '{machine}' is not supported")
+                     " architecture is not supported")
+
 
 def check_root():
     if os.geteuid() != 0:
-        Logger.error("This script must be run as root (sudo). Aborting.")
+        Logger.error("This script must be run as root. Aborting.")
         sys.exit(1)
 
 def backup(path):
-    if not os.path.exists(path):
+    gz_filename = path+".gz"
-        return
+    with gzip.open(gz_filename, 'wb') as f_gz:
-    gz_filename = path + ".gz"
+        with open(path, "rb") as f:
-    with open(path, "rb") as f_in:
+            f_gz.write(f.read())
-        with gzip.open(gz_filename, "wb") as f_out:
-            f_out.writelines(f_in)
 
 def restore(path):
-    gz_filename = path + ".gz"
+    gz_filename = path+".gz"
-    if not os.path.exists(gz_filename):
+    with gzip.GzipFile(gz_filename) as f_gz:
-        return
+        with open(path, "wb") as f:
-    with gzip.open(gz_filename, "rb") as f_in:
+            f.writelines(f_gz)
-        with open(path, "wb") as f_out:
-            f_out.write(f_in.read())

tools/images.py

@@ -28,6 +28,7 @@ def resize(img_file, size):
     run(["sudo", "resize2fs", img_file, size], ignore="^resize2fs \d+\.\d+\.\d (.+)\n$")
 
 def get_image_dir():
+    # Read waydroid config to get image location
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
     if not os.path.isfile(cfg_file):
@@ -35,6 +36,6 @@ def get_image_dir():
         sys.exit(1)
     cfg.read(cfg_file)
     if "waydroid" not in cfg:
-        Logger.error("Required entry in config was not found, Cannot continue!")
+        Logger.error("Required entry in config was not found, Cannot continue!") #magisk
         sys.exit(1)
-    return cfg["waydroid"]["images_path"]
+    return cfg["waydroid"]["images_path"]