Refactor: Split into multiple small scripts

stuffs/android_id.py

@@ -0,0 +1,18 @@
+import os
+import sys
+from tools.helper import run
+from tools.logger import Logger
+
+
+class Android_id:
+   def get_id(self):
+        if not os.path.isfile("/var/lib/waydroid/data/data/com.google.android.gsf/databases/gservices.db"):
+            Logger.error("Cannot access gservices.db, make sure gapps is installed and waydroid was started at least once after installation and make sure waydroid is running !")
+            sys.exit(1)
+        sqs = """
+                SELECT * FROM main WHERE name='android_id'
+            """
+        queryout = run(["sqlite3", "/var/lib/waydroid/data/data/com.google.android.gsf/databases/gservices.db", sqs.strip()])
+        print(queryout.stdout.decode().replace("android_id|", "").strip())
+        print("   ^----- Open https://google.com/android/uncertified/?pli=1")
+        print("          Login with your google id then submit the form with id shown above")

stuffs/gapps.py

@@ -0,0 +1,59 @@
+import os
+import shutil
+from stuffs.general import General
+from tools.helper import host, run
+from tools.logger import Logger
+
+class Gapps(General):
+    partition = "system"
+    dl_links = {
+            "x86_64": ["https://master.dl.sourceforge.net/project/opengapps/x86_64/20220121/open_gapps-x86_64-10.0-pico-20220121.zip?viasf=1", "e8c9a7412f5712eea7948957a62a7d66"],
+            "x86": ["https://udomain.dl.sourceforge.net/project/opengapps/x86/20220122/open_gapps-x86-10.0-pico-20220122.zip", "9e39e45584b7ade4529e6be654af7b81"],
+            "arm64-v8a": ["https://liquidtelecom.dl.sourceforge.net/project/opengapps/arm64/20220122/open_gapps-arm64-10.0-pico-20220122.zip", "8dfa6e76aeb2d1d5aed40b058e8a852c"],
+            "armeabi-v7a": ["https://nav.dl.sourceforge.net/project/opengapps/arm/20220122/open_gapps-arm-10.0-pico-20220122.zip", "a48ccbd25eb0a3c5e30f5db5435f5536"]
+        }
+    arch = host()
+    dl_link = dl_links[arch[0]][0]
+    dl_file_name = "open_gapps.zip"
+    act_md5 = dl_links[arch[0]][1]
+    extract_to = "/tmp/ogapps/extract"
+    non_apks = [
+        "defaultetc-common.tar.lz",
+        "defaultframework-common.tar.lz",
+        "googlepixelconfig-common.tar.lz"
+        ]
+    skip = [
+        "setupwizarddefault-x86_64.tar.lz",
+        "setupwizardtablet-x86_64.tar.lz"
+        ]
+
+    def download(self):
+        Logger.info("Downloading OpenGapps now to {} .....".format(self.download_loc))
+        super().download()
+
+    def copy(self):
+        if not os.path.exists(self.extract_to):
+            os.makedirs(self.extract_to)
+        if not os.path.exists(os.path.join(self.extract_to, "appunpack")):
+            os.makedirs(os.path.join(self.extract_to, "appunpack"))
+
+        for lz_file in os.listdir(os.path.join(self.extract_to, "Core")):
+            for d in os.listdir(os.path.join(self.extract_to, "appunpack")):
+                shutil.rmtree(os.path.join(self.extract_to, "appunpack", d))
+            if lz_file not in self.skip:
+                if lz_file not in self.non_apks:
+                    print("    Processing app package : "+os.path.join(self.extract_to, "Core", lz_file))
+                    run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core", lz_file), "-C", os.path.join(self.extract_to, "appunpack")])
+                    app_name = os.listdir(os.path.join(self.extract_to, "appunpack"))[0]
+                    xx_dpi = os.listdir(os.path.join(self.extract_to, "appunpack", app_name))[0]
+                    app_priv = os.listdir(os.path.join(self.extract_to, "appunpack", app_name, "nodpi"))[0]
+                    app_src_dir = os.path.join(self.extract_to, "appunpack", app_name, xx_dpi, app_priv)
+                    for app in os.listdir(app_src_dir):
+                        shutil.copytree(os.path.join(app_src_dir, app), os.path.join(self.copy_dir, self.partition, "priv-app", app), dirs_exist_ok=True)
+                else:
+                    print("    Processing extra package : "+os.path.join(self.extract_to, "Core", lz_file))
+                    run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core", lz_file), "-C", os.path.join(self.extract_to, "appunpack")])
+                    app_name = os.listdir(os.path.join(self.extract_to, "appunpack"))[0]
+                    common_content_dirs = os.listdir(os.path.join(self.extract_to, "appunpack", app_name, "common"))
+                    for ccdir in common_content_dirs:
+                        shutil.copytree(os.path.join(self.extract_to, "appunpack", app_name, "common", ccdir), os.path.join(self.copy_dir, self.partition, ccdir), dirs_exist_ok=True)

stuffs/general.py

@@ -0,0 +1,132 @@
+import os
+import re
+import zipfile
+import hashlib
+from tools import images
+from tools.helper import download_file, get_download_dir, run
+from tools.container import DBusContainerService
+from tools.logger import Logger
+
+class General:
+    @property
+    def download_loc(self):
+        return os.path.join(get_download_dir(), self.dl_file_name)
+
+    @property
+    def copy_dir(self):
+        if self.use_overlayfs:
+            return "/var/lib/waydroid/overlay"
+        else:
+            return "/tmp/waydroid"
+
+    @property
+    def use_dbus(self):
+        try:
+            DBusContainerService()
+        except:
+            return False
+        return 
+
+    @property
+    def use_overlayfs(self):
+        return os.path.isdir("/var/lib/waydroid/overlay")
+        # return False
+
+    def download(self):
+        loc_md5 = ""
+        if os.path.isfile(self.download_loc):
+            with open(self.download_loc, "rb") as f:
+                bytes = f.read()
+                loc_md5 = hashlib.md5(bytes).hexdigest()
+        while not os.path.isfile(self.download_loc) or loc_md5 != self.act_md5:
+            if os.path.isfile(self.download_loc):
+                os.remove(self.download_loc)
+                Logger.warning(
+                    "md5 mismatches, redownloading now ....")
+            loc_md5 = download_file(self.dl_link, self.download_loc)
+
+    def extract(self):
+        Logger.info("Extracting archive...")
+        with zipfile.ZipFile(self.download_loc) as z:
+            z.extractall(self.extract_to)
+
+    def add_props(self):
+        with open(os.path.join("/var/lib/waydroid/waydroid_base.prop"), "r") as propfile:
+            prop_content = propfile.read()
+            for key in self.apply_props:
+                if key not in prop_content:
+                    prop_content = prop_content+"\n{key}={value}".format(key=key, value=self.apply_props[key])
+                else:
+                    p = re.compile(r"^{key}=.*$".format(key=key), re.M)
+                    prop_content = re.sub(p, "{key}={value}".format(key=key, value=self.apply_props[key]), prop_content)
+        with open(os.path.join("/var/lib/waydroid/waydroid_base.prop"), "w") as propfile:
+            propfile.write(prop_content)        
+
+    def mount(self):
+        img = os.path.join(images.get_image_dir(), self.partition+".img")
+        mount_point = ""
+        if self.partition == "system":
+            mount_point = os.path.join(self.copy_dir)
+        else:
+            mount_point = os.path.join(self.copy_dir, self.partition)
+        Logger.info("Mounting {} to {}".format(img, mount_point))
+        images.mount(img, mount_point)
+
+    def resize(self):
+        img = os.path.join(images.get_image_dir(), self.partition+".img")
+        img_size = int(os.path.getsize(img)/(1024*1024))
+        new_size = "{}M".format(img_size+500)
+        Logger.info("Resizing {} to {}".format(img, new_size))
+        images.resize(img, new_size)
+
+    def umount(self):
+        mount_point = ""
+        if self.partition == "system":
+            mount_point = os.path.join(self.copy_dir)
+        else:
+            mount_point = os.path.join(self.copy_dir, self.partition)
+        Logger.info("Umounting {}".format(mount_point))
+        images.umount(mount_point)
+
+    def stop(self):
+        if self.use_dbus:
+            self.session = DBusContainerService().GetSession()
+            if self.session:
+                    DBusContainerService().Stop(False)
+        else:
+            run(["waydroid", "container", "stop"])
+
+    def start(self):
+        if self.use_dbus:
+            DBusContainerService().Start(self.session)
+        else:
+            run(["systemctl", "restart", "waydroid-container.service"])
+
+    def restart(self):
+        if DBusContainerService().GetSession():
+            self.stop()
+            self.start()
+
+    def copy(self):
+        pass
+
+    def install(self):
+        if self.use_overlayfs:
+            self.download()
+            self.extract()
+            self.copy()
+            if hasattr(self, "apply_props"):
+                self.add_props()
+            self.restart()
+        else:
+            self.stop()
+            self.download()
+            self.extract()
+            self.resize()
+            self.mount()
+            self.copy()
+            if hasattr(self, "apply_props"):
+                self.add_props()
+            self.umount()
+            self.start()
+        Logger.info("Installation finished")

stuffs/houdini.py

@@ -0,0 +1,49 @@
+import os
+import re
+import shutil
+from stuffs.general import General
+from tools.helper import run
+from tools.logger import Logger
+
+
+class Houdini(General):
+    partition = "system"
+    dl_link =  "https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/81f2a51ef539a35aead396ab7fce2adf89f46e88.zip"
+    act_md5 = "fbff756612b4144797fbc99eadcb6653"
+    dl_file_name = "libhoudini.zip"
+    extract_to = "/tmp/houdiniunpack"
+    init_rc_component = """
+on early-init
+    mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
+
+on property:ro.enable.native.bridge.exec=1
+    exec -- /system/bin/sh -c "echo ':arm_exe:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x01\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x02\\\\x00\\\\x28::/system/bin/houdini:P' > /proc/sys/fs/binfmt_misc/register"
+    exec -- /system/bin/sh -c "echo ':arm_dyn:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x01\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x03\\\\x00\\\\x28::/system/bin/houdini:P' >> /proc/sys/fs/binfmt_misc/register"
+    exec -- /system/bin/sh -c "echo ':arm64_exe:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x02\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x02\\\\x00\\\\xb7::/system/bin/houdini64:P' >> /proc/sys/fs/binfmt_misc/register"
+    exec -- /system/bin/sh -c "echo ':arm64_dyn:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x02\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x03\\\\x00\\\\xb7::/system/bin/houdini64:P' >> /proc/sys/fs/binfmt_misc/register"
+"""
+    apply_props = {
+        "ro.product.cpu.abilist": "x86_64,x86,arm64-v8a,armeabi-v7a,armeabi",
+        "ro.product.cpu.abilist32": "x86,armeabi-v7a,armeabi",
+        "ro.product.cpu.abilist64": "x86_64,arm64-v8a",
+        "ro.dalvik.vm.native.bridge": "libhoudini.so",
+        "ro.enable.native.bridge.exec": "1",
+        "ro.dalvik.vm.isa.arm": "x86",
+        "ro.dalvik.vm.isa.arm64": "x86_64"
+    }
+
+    def download(self):
+        Logger.info("Downloading libhoudini to {}now .....".format(self.download_loc))
+        super().download()
+
+    def copy(self):
+        run(["chmod", "+x", self.extract_to, "-R"])
+        Logger.info("Copying libhoudini library files ...")
+        name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
+        shutil.copytree(os.path.join(self.extract_to, "vendor_intel_proprietary_houdini-" + name,
+                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
+        init_path = os.path.join(self.copy_dir, self.partition, "etc", "init", "houdini.rc")
+        if not os.path.isfile(init_path):
+            os.makedirs(os.path.dirname(init_path), exist_ok=True)
+        with open(init_path, "w") as initfile:
+            initfile.write(self.init_rc_component)        

stuffs/magisk.py

@@ -0,0 +1,89 @@
+import gzip
+import os
+import shutil
+import re
+from stuffs.general import General
+from tools.helper import download_file, host, run
+from tools.logger import Logger
+
+class Magisk(General):
+    partition = "system"
+    dl_link = "https://huskydg.github.io/magisk-files/app-release.apk"
+    dl_file_name = "magisk.apk"
+    extract_to = "/tmp/magisk_unpack"
+    magisk_dir = os.path.join(partition, "etc", "init", "magisk")
+    machine = host()
+    oringinal_bootanim = """
+service bootanim /system/bin/bootanimation
+    class core animation
+    user graphics
+    group graphics audio
+    disabled
+    oneshot
+    ioprio rt 0
+    task_profiles MaxPerformance
+    
+"""
+    bootanim_component = """
+on post-fs-data
+    start logd
+    exec u:r:su:s0 root root -- /system/etc/init/magisk/magisk{arch} --auto-selinux --setup-sbin /system/etc/init/magisk
+    exec u:r:su:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk "allow * magisk_file lnk_file *"
+    mkdir /sbin/.magisk 700
+    mkdir /sbin/.magisk/mirror 700
+    mkdir /sbin/.magisk/block 700
+    copy /system/etc/init/magisk/config /sbin/.magisk/config
+    rm /dev/.magisk_unblock
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --post-fs-data
+    wait /dev/.magisk_unblock 40
+    rm /dev/.magisk_unblock
+
+on zygote-start
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --service
+
+on property:sys.boot_completed=1
+    mkdir /data/adb/magisk 755
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --boot-complete
+    exec -- /system/bin/sh -c "if [ ! -e /data/data/io.github.huskydg.magisk ] ; then pm install /system/etc/init/magisk/magisk.apk ; fi"
+   
+on property:init.svc.zygote=restarting
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
+   
+on property:init.svc.zygote=stopped
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
+    """.format(arch=machine[1])
+
+    def download(self):
+        if os.path.isfile(self.download_loc):
+            os.remove(self.download_loc)
+        Logger.info("Downloading latest Magisk-Delta to {} now ...".format(self.download_loc))
+        download_file(self.dl_link, self.download_loc)    
+
+    def copy(self):
+        magisk_absolute_dir = os.path.join(self.copy_dir, self.magisk_dir)
+        if not os.path.exists(magisk_absolute_dir):
+            os.makedirs(magisk_absolute_dir, exist_ok=True)
+
+        if not os.path.exists(os.path.join(self.copy_dir, "sbin")):
+            os.makedirs(os.path.join(self.copy_dir, "sbin"), exist_ok=True)
+
+        Logger.info("Copying magisk libs now ...")
+        
+        lib_dir = os.path.join(self.extract_to, "lib", self.machine[0])
+        for parent, dirnames, filenames in os.walk(lib_dir):
+            for filename in filenames:
+                o_path = os.path.join(lib_dir, filename)  
+                filename = re.search('lib(.*)\.so', filename)
+                n_path = os.path.join(magisk_absolute_dir, filename.group(1))
+                shutil.copyfile(o_path, n_path)
+                run(["chmod", "+x", n_path])
+        shutil.copyfile(self.download_loc, os.path.join(magisk_absolute_dir,"magisk.apk") )
+
+        # Updating Magisk from Magisk manager will modify bootanim.rc, 
+        # So it is necessary to backup the original bootanim.rc.
+        bootanim_path = os.path.join(self.copy_dir, self.partition, "etc", "init", "bootanim.rc")
+        gz_filename = os.path.join(bootanim_path)+".gz"
+        with gzip.open(gz_filename,'wb') as f_gz:
+            f_gz.write(self.oringinal_bootanim.encode('utf-8'))
+        with open(bootanim_path, "w") as initfile:
+            initfile.write(self.oringinal_bootanim+self.bootanim_component)

stuffs/ndk.py

@@ -0,0 +1,48 @@
+import os
+import shutil
+from stuffs.general import General
+from tools.helper import run
+from tools.logger import Logger
+
+class Ndk(General):
+    partition = "system"
+    dl_link = "https://www.dropbox.com/s/eaf4dj3novwiccp/libndk_translation_Module-c6077f3398172c64f55aad7aab0e55fad9110cf3.zip?dl=1"
+    dl_file_name = "libndktranslation.zip"
+    extract_to = "/tmp/libndkunpack"
+    act_md5 = "4456fc1002dc78e544e8d9721bb24398"
+    apply_props = {
+        "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",
+        "ro.enable.native.bridge.exec": "1",
+      #  "ro.ndk_translation.version": "0.2.2",
+        "ro.dalvik.vm.isa.arm": "x86",
+        "ro.dalvik.vm.isa.arm64": "x86_64"
+    }
+    init_rc_component = """
+# Enable native bridge for target executables
+on early-init
+    mount binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
+
+on property:ro.enable.native.bridge.exec=1
+    copy /system/etc/binfmt_misc/arm_exe /proc/sys/fs/binfmt_misc/register
+    copy /system/etc/binfmt_misc/arm_dyn /proc/sys/fs/binfmt_misc/register
+    copy /system/etc/binfmt_misc/arm64_exe /proc/sys/fs/binfmt_misc/register
+    copy /system/etc/binfmt_misc/arm64_dyn /proc/sys/fs/binfmt_misc/register
+"""
+    
+    def download(self):
+        Logger.info("Downloading libndk to {} now .....".format(self.download_loc))
+        super().download()
+
+    def copy(self):
+        run(["chmod", "+x", self.extract_to, "-R"])
+        Logger.info("Copying libndk library files ...")
+        shutil.copytree(os.path.join(self.extract_to, "libndk_translation_Module-c6077f3398172c64f55aad7aab0e55fad9110cf3", "system"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
+
+        init_path = os.path.join(self.copy_dir, self.partition, "etc", "init", "libndk.rc")
+        if not os.path.isfile(init_path):
+            os.makedirs(os.path.dirname(init_path), exist_ok=True)
+        with open(init_path, "w") as initfile:
+            initfile.write(self.init_rc_component)

stuffs/widevine.py

@@ -0,0 +1,23 @@
+import os
+import shutil
+from stuffs.general import General
+from tools.helper import run
+from tools.logger import Logger
+
+
+class Widevine(General):
+    partition = "vendor"
+    dl_link = "https://codeload.github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/zip/94c9ee172e3d78fecc81863f50a59e3646f7a2bd"
+    dl_file_name = "widevine.zip"
+    extract_to = "/tmp/widevineunpack"
+    act_md5 = "a31f325453c5d239c21ecab8cfdbd878"
+
+    def download(self):
+        Logger.info("Downloading widevine to {} now .....".format(self.download_loc))
+        super().download()
+
+    def copy(self):
+        run(["chmod", "+x", self.extract_to, "-R"])
+        Logger.info("Copying widevine library files ...")
+        shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_widevine-prebuilt-94c9ee172e3d78fecc81863f50a59e3646f7a2bd",
+                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)