NikGapps 3.30__tar.gz → 3.31__tar.gz

{nikgapps-3.30 → nikgapps-3.31}/NikGapps/build/Release.py

@@ -5,7 +5,7 @@ from NikGapps.helper import Config
 from niklibrary.helper.P import P
 from niklibrary.helper.Statics import Statics
 from niklibrary.helper.T import T
-from NikGapps.helper.compression.Modes import Modes
+from niklibrary.compression.Modes import Modes
 from NikGapps.helper.compression.Export import Export
 from niklibrary.web.Upload import Upload
 from niklibrary.web.TelegramApi import TelegramApi

{nikgapps-3.30 → nikgapps-3.31}/NikGapps/build_config.py

@@ -5,13 +5,13 @@ from NikGapps.build.Build import Build
 from NikGapps.config.NikGappsConfig import NikGappsConfig
 from NikGapps.helper.Args import Args
 from NikGapps.helper import Config
-from NikGapps.helper.B64 import B64
+from niklibrary.helper.B64 import B64
 from niklibrary.helper.F import F
 from niklibrary.helper.Statics import Statics
-from NikGapps.helper.SystemStat import SystemStat
+from niklibrary.helper.SystemStat import SystemStat
 from niklibrary.helper.T import T
 from NikGapps.helper.compression.Export import Export
-from NikGapps.helper.compression.Modes import Modes
+from niklibrary.compression.Modes import Modes
 from niklibrary.git.GitOp import GitOp
 
 

{nikgapps-3.30 → nikgapps-3.31}/NikGapps/cache.py

@@ -4,13 +4,13 @@ from NikGapps.build.Build import Build
 from NikGapps.config.NikGappsConfig import NikGappsConfig
 from niklibrary.helper.F import F
 from NikGapps.helper.Package import Package
-from NikGapps.helper.compression.Modes import Modes
+from niklibrary.compression.Modes import Modes
 from NikGapps.helper.compression.CompOps import CompOps
 from NikGapps.helper.AppSet import AppSet
 from NikGapps.helper import Config
 from niklibrary.helper.P import P
 from niklibrary.helper.T import T
-from NikGapps.helper.SystemStat import SystemStat
+from niklibrary.helper.SystemStat import SystemStat
 from NikGapps.helper.Args import Args
 from niklibrary.git.GitOp import GitOp
 from niklibrary.git.GitlabManager import GitLabManager

{nikgapps-3.30 → nikgapps-3.31}/NikGapps/copy_repos.py

@@ -2,7 +2,7 @@ import os
 from dotenv import load_dotenv
 from NikGapps.helper.Args import Args
 from NikGapps.helper import Config
-from NikGapps.helper.SystemStat import SystemStat
+from niklibrary.helper.SystemStat import SystemStat
 from niklibrary.git.GitlabManager import GitLabManager
 
 

{nikgapps-3.30 → nikgapps-3.31}/NikGapps/helper/Package.py

@@ -1,6 +1,6 @@
 from .Assets import Assets
 from niklibrary.helper.Statics import Statics
-from .XmlOp import XmlOp
+from niklibrary.helper.XmlOp import XmlOp
 from .overlay.Overlay import Overlay
 
 

{nikgapps-3.30 → nikgapps-3.31}/NikGapps/helper/compression/CompOps.py

@@ -1,7 +1,7 @@
 from niklibrary.helper.F import F
 from niklibrary.helper.Statics import Statics
 from NikGapps.helper.Package import Package
-from .Modes import Modes
+from niklibrary.compression.Modes import Modes
 
 
 class CompOps:
@@ -10,10 +10,10 @@ class CompOps:
     def get_compression_obj(file_name, compression_mode=Modes.ZIP):
         match compression_mode:
             case Modes.TAR_XZ:
-                from .Tar import Tar
+                from niklibrary.compression.Tar import Tar
                 return Tar(file_name)
             case _:
-                from .Zip import Zip
+                from niklibrary.compression.Zip import Zip
                 return Zip(file_name)
 
     @staticmethod

{nikgapps-3.30 → nikgapps-3.31}/NikGapps/helper/compression/Export.py

@@ -6,8 +6,8 @@ from multiprocessing import cpu_count
 from threading import Lock
 
 from .CompOps import CompOps
-from .Modes import Modes
-from .Zip import Zip
+from niklibrary.compression.Modes import Modes
+from niklibrary.compression.Zip import Zip
 from .. import Config
 from ..Assets import Assets
 from niklibrary.helper.Cmd import Cmd

{nikgapps-3.30 → nikgapps-3.31}/NikGapps/main.py

@@ -2,9 +2,9 @@
 from NikGapps.build.Release import Release
 from NikGapps.helper.Args import Args
 from NikGapps.helper import Config
-from NikGapps.helper.SystemStat import SystemStat
+from niklibrary.helper.SystemStat import SystemStat
 from niklibrary.helper.T import T
-from NikGapps.helper.compression.Modes import Modes
+from niklibrary.compression.Modes import Modes
 from niklibrary.git.GitOp import GitOp
 
 

{nikgapps-3.30 → nikgapps-3.31/NikGapps.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.30
+Version: 3.31
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani

{nikgapps-3.30 → nikgapps-3.31}/NikGapps.egg-info/SOURCES.txt

@@ -27,12 +27,9 @@ NikGapps/config/__init__.py
 NikGapps/helper/AppSet.py
 NikGapps/helper/Args.py
 NikGapps/helper/Assets.py
-NikGapps/helper/B64.py
 NikGapps/helper/Config.py
 NikGapps/helper/ConfigObj.py
 NikGapps/helper/Package.py
-NikGapps/helper/SystemStat.py
-NikGapps/helper/XmlOp.py
 NikGapps/helper/__init__.py
 NikGapps/helper/assets/addon.sh
 NikGapps/helper/assets/appsets.json
@@ -55,10 +52,6 @@ NikGapps/helper/assets/uninstaller.sh
 NikGapps/helper/assets/unmount.sh
 NikGapps/helper/compression/CompOps.py
 NikGapps/helper/compression/Export.py
-NikGapps/helper/compression/Modes.py
-NikGapps/helper/compression/Tar.py
-NikGapps/helper/compression/Zip.py
-NikGapps/helper/compression/Zsh.py
 NikGapps/helper/compression/__init__.py
 NikGapps/helper/git/TestGit.py
 NikGapps/helper/git/__init__.py

{nikgapps-3.30/NikGapps.egg-info → nikgapps-3.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.30
+Version: 3.31
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani

{nikgapps-3.30 → nikgapps-3.31}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="NikGapps",
-version="3.30",
+version="3.31",
     packages=find_packages(),
     include_package_data=True,
     package_data={

nikgapps-3.30/NikGapps/helper/B64.py

@@ -1,34 +0,0 @@
-import base64
-
-
-class B64:
-
-    @staticmethod
-    def b64e(s):
-        print("Encoding: " + s)
-        return base64.b64encode(s.encode()).decode()
-
-    @staticmethod
-    def b64d(s):
-        try:
-            print("Decoding: " + s)
-            val = base64.b64decode(s).decode()
-        except Exception as e:
-            print(str(e))
-            return s
-        return val
-
-    @staticmethod
-    def is_base64(sb):
-        try:
-            if isinstance(sb, str):
-                # If there's any unicode here, an exception will be thrown and the function will return false
-                sb_bytes = bytes(sb, 'ascii')
-            elif isinstance(sb, bytes):
-                sb_bytes = sb
-            else:
-                raise ValueError("Argument must be string or bytes")
-            return base64.b64encode(base64.b64decode(sb_bytes)) == sb_bytes
-        except Exception as e:
-            print(str(e))
-            return False

nikgapps-3.30/NikGapps/helper/SystemStat.py

@@ -1,103 +0,0 @@
-import os
-import platform
-import shutil
-import subprocess
-from multiprocessing import cpu_count
-
-import psutil
-
-from . import Config
-from .Assets import Assets
-from niklibrary.helper.P import P
-from niklibrary.helper.T import T
-
-
-class SystemStat:
-
-    @staticmethod
-    def run_command(command):
-        result = None
-        try:
-            result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-            # Check both stdout and stderr for output, as some commands might output version info to stderr
-            output = result.stdout.strip() if result.stdout.strip() else result.stderr.strip()
-            return output
-        except subprocess.CalledProcessError as e:
-            # If the command fails (e.g., command not found), return the error message from stderr or a custom message
-            error_message = result.stderr.strip() if result.stderr.strip() else "Command failed without error output"
-            return f"Failed to execute {command}: {e} - {error_message}"
-        except Exception as e:
-            return f"Failed to execute {command}: {e}"
-
-    @staticmethod
-    def display_time(location, time_str):
-        if "AM" in time_str:
-            P.yellow(f"{location}: {time_str}")
-        else:
-            P.green(f"{location}: {time_str}")
-
-    @staticmethod
-    def get_disk_usage(path="/"):
-        total, used, free = shutil.disk_usage(path)
-        return total, used, free
-
-    @staticmethod
-    def print_disk_usage():
-        os_type = platform.system()
-
-        if os_type == "Windows":
-            # On Windows, you can specify a drive letter, e.g., "C:\\"
-            path = "C:\\"
-            total, used, free = SystemStat.get_disk_usage(path)
-        elif os_type == "Linux" or os_type == "Darwin":
-            # On Linux and macOS, use the root path
-            path = "/"
-            total, used, free = SystemStat.get_disk_usage(path)
-        else:
-            print(f"Unsupported OS: {os_type}")
-            return
-
-        # Convert bytes to gigabytes
-        total_gb = total / (2 ** 30)
-        used_gb = used / (2 ** 30)
-        free_gb = free / (2 ** 30)
-
-        print(f"Operating System: {os_type}")
-        print(f"Disk Usage for {path}")
-        print(f"Total: {total_gb:.2f} GiB")
-        print(f"Used: {used_gb:.2f} GiB")
-        print(f"Free: {free_gb:.2f} GiB")
-
-    @staticmethod
-    def show_stats():
-        # Memory and CPU info
-        mem = psutil.virtual_memory()
-        total_ram_in_bytes = mem.total
-        total_ram_in_gb = round(mem.total / 1073741824, 2)
-        P.green("---------------------------------------")
-        P.green(f"Ram: {total_ram_in_bytes} bytes, {total_ram_in_gb} Gb")
-        P.green(f"# of CPUs: {os.cpu_count()}({cpu_count()})")
-        P.green("---------------------------------------")
-        SystemStat.print_disk_usage()
-        # Versions of Java, ADB, and AAPT
-        # java_version = SystemStat.run_command(["java", "-version"])
-        # P.green(f"Java version: {java_version}")
-        # P.green("---------------------------------------")
-        if (not Config.ENVIRONMENT_TYPE == "production") and Config.ENVIRONMENT_TYPE == "dev":
-            adb_version = SystemStat.run_command([f"{Assets.adb_path}", "version"])
-            P.green("---------------------------------------")
-            P.green(f"ADB version: {adb_version}")
-        P.green("---------------------------------------")
-        aapt_version = SystemStat.run_command([f"{Assets.aapt_path}", "version"])
-        P.green(f"AAPT version: {aapt_version}")
-        P.green("---------------------------------------")
-        t = T()
-        local_time = t.get_local_date_time("%a, %m/%d/%Y, %I:%M:%S %p")
-        ny_time = t.get_new_york_date_time("%a, %m/%d/%Y, %I:%M:%S %p")
-        london_time = t.get_london_date_time().strftime("%a, %m/%d/%Y, %I:%M:%S %p")
-
-        SystemStat.display_time("Local", local_time)
-        SystemStat.display_time("NY", ny_time)
-        SystemStat.display_time("London", london_time)
-        P.green("---------------------------------------")
-        print(" ")

nikgapps-3.30/NikGapps/helper/XmlOp.py

@@ -1,40 +0,0 @@
-from xml.etree.ElementTree import Element, SubElement, ElementTree, tostring
-import xml.dom.minidom
-
-
-class XmlOp:
-    def __init__(self, package_name, permissions_list, import_path=None):
-        self.root = Element("permissions")
-        self.doc = SubElement(self.root, "privapp-permissions", package=package_name)
-        for permission in permissions_list:
-            SubElement(self.doc, "permission", name=permission)
-        XmlOp.indent(self.root)
-        if import_path is not None:
-            with open(import_path, 'wb') as f:
-                self.tree = ElementTree(self.root)
-                self.tree.write(f)
-
-    @staticmethod
-    def indent(elem, level=0):
-        i = "\n" + level * "  "
-        if len(elem):
-            if not elem.text or not elem.text.strip():
-                elem.text = i + "  "
-            if not elem.tail or not elem.tail.strip():
-                elem.tail = i
-            for elem in elem:
-                XmlOp.indent(elem, level + 1)
-            if not elem.tail or not elem.tail.strip():
-                elem.tail = i
-        else:
-            if level and (not elem.tail or not elem.tail.strip()):
-                elem.tail = i
-
-    def to_string(self):
-        xml_str = tostring(self.root, 'utf-8')
-        parsed_str = xml.dom.minidom.parseString(xml_str)
-        pretty_str = parsed_str.toprettyxml(encoding="utf-8").decode("utf-8")
-        pretty_str = "\n".join(
-            line for line in pretty_str.splitlines() if line.strip() and not line.__contains__("utf-8"))
-        pretty_str = pretty_str.replace("\r\n", "\n")  # Ensure LF line endings
-        return pretty_str

nikgapps-3.30/NikGapps/helper/compression/Modes.py

@@ -1,4 +0,0 @@
-class Modes:
-    TAR_XZ = ".tar.xz"
-    ZIP = ".zip"
-    DEFAULT = ZIP

nikgapps-3.30/NikGapps/helper/compression/Tar.py

@@ -1,25 +0,0 @@
-import tarfile
-from io import BytesIO
-from niklibrary.helper.F import F
-
-
-class Tar:
-
-    def __init__(self, file_name, folder_to_compress=None):
-        if folder_to_compress is None:
-            self.folder = folder_to_compress
-        self.tarfile = str(file_name) if str(file_name).endswith("tar.xz") else str(file_name) + ".tar.xz"
-        F.create_file_dir(self.tarfile)
-        self.tar = tarfile.open(self.tarfile, "w:xz")
-
-    def add_file(self, file_to_add, zippath):
-        self.tar.add(file_to_add, arcname=zippath)
-
-    def add_string(self, text, file_name):
-        data = text.encode('utf-8')
-        info = tarfile.TarInfo(name=file_name)
-        info.size = len(data)
-        self.tar.addfile(tarinfo=info, fileobj=BytesIO(data))
-
-    def close(self):
-        self.tar.close()

nikgapps-3.30/NikGapps/helper/compression/Zip.py

@@ -1,98 +0,0 @@
-import os
-import zipfile
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives.asymmetric import padding
-from cryptography.hazmat.primitives.serialization import load_pem_private_key
-from cryptography.hazmat.backends import default_backend
-from base64 import b64encode
-import hashlib
-
-
-class Zip:
-    RSAFileName = "META-INF/Nik.RSA"
-    SFFileName = "META-INF/Nik.SF"
-    ManifestFileName = "META-INF/MANIFEST.MF"
-    DigitalMessage = "Author:- Nikhil Menghani (Nikhil @ Xda-developers.com)"
-    SignatureVersion = "1.0"
-    ManifestVersion = "1.0"
-    CreatedBy = "Nikhil @ XDA"
-
-    def __init__(self, name, sign=False, private_key_path=None, comment=DigitalMessage):
-        directory = os.path.dirname(name)
-        if not os.path.exists(directory):
-            os.makedirs(directory, exist_ok=True)
-
-        self.zipObj = zipfile.ZipFile(name, 'w', compression=zipfile.ZIP_DEFLATED)
-        self.comment = comment.encode()
-        self.sign = sign
-        if self.sign:
-            if private_key_path is None:
-                raise ValueError("Private key path must be provided for signing.")
-            self.private_key = Zip.load_private_key(private_key_path)
-            self.signatures = {}
-            self.manifest_digests = {}
-
-    @staticmethod
-    def load_private_key(file_path):
-        with open(file_path, 'rb') as key_file:
-            return load_pem_private_key(
-                key_file.read(),
-                password=None,
-                backend=default_backend()
-            )
-
-    def add_file(self, filename, zippath=None):
-        if zippath is None:
-            zippath = filename
-        self.zipObj.write(filename, zippath)
-        if self.sign:
-            self.sign_content(filename, zippath)
-
-    def add_string(self, text, zippath):
-        text = text.replace('\r\n', '\n')
-        self.zipObj.writestr(zippath, text)
-        if self.sign:
-            self.sign_content_string(text, zippath)
-
-    def sign_content(self, filename, zippath):
-        with open(filename, 'rb') as f:
-            content = f.read()
-        self.process_signature(content, zippath)
-
-    def sign_content_string(self, text, zippath):
-        content = text.encode()
-        self.process_signature(content, zippath)
-
-    def process_signature(self, content, zippath):
-        digest = hashlib.sha256(content).digest()
-        self.manifest_digests[zippath] = b64encode(digest).decode('utf-8')
-        signature = self.private_key.sign(
-            digest,
-            padding.PSS(
-                mgf=padding.MGF1(hashes.SHA256()),
-                salt_length=padding.PSS.MAX_LENGTH
-            ),
-            hashes.SHA256()
-        )
-        self.signatures[zippath] = b64encode(signature).decode('utf-8')
-        # self.zipObj.writestr(zippath + '.sig', signature)
-
-    def generate_manifest_and_signature_files(self):
-        manifest_content = f"Manifest-Version: {self.ManifestVersion}\nCreated-By: {self.CreatedBy}\n"
-        for filename, digest in self.manifest_digests.items():
-            manifest_content += f"Name: {filename}\nSHA-256-Digest: {digest}\n"
-        self.zipObj.writestr(self.ManifestFileName, manifest_content)
-
-        sf_content = f"Signature-Version: {self.SignatureVersion}\nCreated-By: {self.CreatedBy}\n"
-        self.zipObj.writestr(self.SFFileName, sf_content)
-
-        rsa_content = f"Digital-Message: {self.DigitalMessage}\nSignatures:\n"
-        for filename, signature in self.signatures.items():
-            rsa_content += f"{filename}: {signature}\n"
-        self.zipObj.writestr(self.RSAFileName, rsa_content)
-
-    def close(self):
-        if self.sign:
-            self.generate_manifest_and_signature_files()
-            self.zipObj.comment = self.comment
-        self.zipObj.close()

nikgapps-3.30/NikGapps/helper/compression/Zsh.py

@@ -1,17 +0,0 @@
-from pathlib import Path
-from subprocess import call
-
-from niklibrary.helper.T import T
-
-
-class Zsh:
-
-    def __init__(self, folder_to_compress, file_name):
-        self.folder = folder_to_compress
-        self.tarfile = str(file_name) + ".tar.xz"
-
-    def compress(self):
-        time_obj = T()
-        call(["tar", "cJfP", self.tarfile, self.folder])
-        print(f"zsh tar filesize: {round(Path(self.tarfile).stat().st_size / (1024 * 1024), 2)} MB")
-        time_obj.taken("zsh tar filesize")