NikGapps 3.29__tar.gz → 3.31__tar.gz

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/build/Build.py

@@ -6,11 +6,11 @@ from threading import Lock
 
 from NikGapps.helper import Config
 from NikGapps.helper.Package import Package
-from NikGapps.helper.FileOp import FileOp
-from NikGapps.helper.Cmd import Cmd
+from niklibrary.helper.F import F
+from niklibrary.helper.Cmd import Cmd
 from NikGapps.helper.AppSet import AppSet
-from NikGapps.helper.Statics import Statics
-from NikGapps.helper.T import T
+from niklibrary.helper.Statics import Statics
+from niklibrary.helper.T import T
 
 
 class Build:
@@ -48,7 +48,7 @@ class Build:
             if float(android_version) >= 12.1:
                 overlay_directory = Config.OVERLAY_SOURCE
                 overlay_dir = overlay_directory + Statics.dir_sep + f"{package_title}Overlay"
-                if FileOp.dir_exists(overlay_dir):
+                if F.dir_exists(overlay_dir):
                     for file in Path(overlay_dir).rglob("*.apk"):
                         pkg_files_path = "overlay" + Statics.dir_sep + Path(file).name
                         install_list.append(pkg_files_path.replace("___", "/"))
@@ -61,7 +61,7 @@ class Build:
                         or str(pkg_files).endswith(".gitattributes") or str(pkg_files).endswith("README.md"):
                     continue
                 if str(pkg_files).endswith(Statics.DELETE_FILES_NAME):
-                    for str_data in FileOp.read_string_file(pkg_files):
+                    for str_data in F.read_string_file(pkg_files):
                         delete_file = str_data.strip()
                         if delete_file not in delete_files_list:
                             delete_files_list.append(delete_file)
@@ -79,7 +79,7 @@ class Build:
                         app_type = Statics.is_priv_app
                     elif str(primary_app_location).__contains__("___app___"):
                         app_type = Statics.is_system_app
-                for folder in FileOp.get_dir_list(pkg_files_path):
+                for folder in F.get_dir_list(pkg_files_path):
                     if folder.startswith("system") or folder.startswith("vendor") \
                             or folder.startswith("product") or folder.startswith("system_ext") \
                             or folder.startswith("overlay"):
@@ -87,7 +87,7 @@ class Build:
                     folder_dict[folder] = folder
                 # We don't need this but for the sake of consistency
                 if str(pkg_files_path).endswith("xml") or str(pkg_files_path).endswith("prop"):
-                    FileOp.convert_to_lf(str(pkg_files.absolute()))
+                    F.convert_to_lf(str(pkg_files.absolute()))
                 install_list.append(pkg_files_path.replace("___", "/"))
                 file_dict_value = str(pkg_files_path.replace("___", "/")).replace("\\", "/")
                 value = str(file_dict_value).split("/")

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/build/NikGappsManager.py

@@ -3,9 +3,9 @@ import os
 from NikGapps.build.PackageConstants import PackageConstants
 from NikGapps.helper.AppSet import AppSet
 from NikGapps.helper.Assets import Assets
-from NikGapps.helper.Cmd import Cmd
+from niklibrary.helper.Cmd import Cmd
 from NikGapps.helper.Package import Package
-from NikGapps.helper.Statics import Statics
+from niklibrary.helper.Statics import Statics
 from NikGapps.helper.overlay.Overlay import Overlay
 from NikGapps.helper.overlay.Library import Library
 

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

@@ -2,13 +2,13 @@ import os
 from NikGapps.build.Build import Build
 from NikGapps.config.NikGappsConfig import NikGappsConfig
 from NikGapps.helper import Config
-from NikGapps.helper.P import P
-from NikGapps.helper.Statics import Statics
-from NikGapps.helper.T import T
-from NikGapps.helper.compression.Modes import Modes
+from niklibrary.helper.P import P
+from niklibrary.helper.Statics import Statics
+from niklibrary.helper.T import T
+from niklibrary.compression.Modes import Modes
 from NikGapps.helper.compression.Export import Export
-from NikGapps.helper.upload.Upload import Upload
-from NikGapps.helper.web.TelegramApi import TelegramApi
+from niklibrary.web.Upload import Upload
+from niklibrary.web.TelegramApi import TelegramApi
 
 
 class Release:

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

@@ -5,14 +5,14 @@ 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 NikGapps.helper.FileOp import FileOp
-from NikGapps.helper.Statics import Statics
-from NikGapps.helper.SystemStat import SystemStat
-from NikGapps.helper.T import T
+from niklibrary.helper.B64 import B64
+from niklibrary.helper.F import F
+from niklibrary.helper.Statics import Statics
+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 NikGapps.helper.git.GitOperations import GitOperations
+from niklibrary.compression.Modes import Modes
+from niklibrary.git.GitOp import GitOp
 
 
 def build_config():
@@ -35,7 +35,7 @@ def build_config():
         exit(1)
     if not str(config_name).endswith(".config"):
         config_name = config_name + ".config"
-    if FileOp.file_exists(config_name):
+    if F.file_exists(config_name):
         print("Reading from the file " + config_name)
         path = config_name
     else:
@@ -46,11 +46,11 @@ def build_config():
         else:
             config_string = B64.b64d(config_value)
             path = config_name
-            FileOp.write_string_in_lf_file(str_data=config_string, file_path=path)
+            F.write_string_in_lf_file(str_data=config_string, file_path=path)
     for android_version in android_versions:
-        apk_repo = GitOperations.clone_apk_source(android_version, args.arch, release_type=Config.RELEASE_TYPE)
+        apk_repo = GitOp.clone_apk_source(android_version, args.arch, release_type=Config.RELEASE_TYPE)
         Config.APK_SOURCE = apk_repo.working_tree_dir
-        overlay_repo = GitOperations.clone_overlay_repo(android_version)
+        overlay_repo = GitOp.clone_overlay_repo(android_version)
         Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
         config_obj = NikGappsConfig(android_version=android_version, config_path=path)
         print(f"Setting up package list from {config_name}...")

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

@@ -2,18 +2,18 @@ import os
 from dotenv import load_dotenv
 from NikGapps.build.Build import Build
 from NikGapps.config.NikGappsConfig import NikGappsConfig
-from NikGapps.helper.FileOp import FileOp
+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 NikGapps.helper.P import P
-from NikGapps.helper.T import T
-from NikGapps.helper.SystemStat import SystemStat
+from niklibrary.helper.P import P
+from niklibrary.helper.T import T
+from niklibrary.helper.SystemStat import SystemStat
 from NikGapps.helper.Args import Args
-from NikGapps.helper.git.GitOperations import GitOperations
-from NikGapps.helper.git.GitlabManager import GitLabManager
+from niklibrary.git.GitOp import GitOp
+from niklibrary.git.GitlabManager import GitLabManager
 
 
 def cache():
@@ -45,11 +45,11 @@ def cache():
             project = gitlab_manager.create_repository(cached_url, provide_owner_access=True)
             gitlab_manager.create_and_commit_file(project_id=project.id, file_path=".gitattributes",
                                                   content=gitattributes)
-        repo_cached = GitOperations.clone_apk_url(url=cached_url, use_ssh_clone=True)
-        apk_repo = GitOperations.clone_apk_url(url=url)
+        repo_cached = GitOp.clone_apk_url(url=cached_url, use_ssh_clone=True)
+        apk_repo = GitOp.clone_apk_url(url=url)
         Config.APK_SOURCE = apk_repo.working_tree_dir
         if float(android_version) >= 12.1:
-            overlay_repo = GitOperations.clone_overlay_repo(android_version=str(android_version), fresh_clone=True)
+            overlay_repo = GitOp.clone_overlay_repo(android_version=str(android_version), fresh_clone=True)
             Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
         config_obj = NikGappsConfig(android_version)
         app_set_list = config_obj.package_manager.get_packages("all")
@@ -68,8 +68,8 @@ def cache():
                     t.taken(f"Total time taken to process the {pkg.package_title}, compressing into {mode}")
                 repo_cached.git_push(commit_message=f"Compressed {pkg.package_title} for {appset.title}",
                                      push_untracked_files=True, pull_first=True, post_buffer="1048576000")
-        if Config.ENVIRONMENT_TYPE.__eq__("production") and FileOp.dir_exists(repo_cached.working_tree_dir):
-            FileOp.remove_dir(repo_cached.working_tree_dir)
+        if Config.ENVIRONMENT_TYPE.__eq__("production") and F.dir_exists(repo_cached.working_tree_dir):
+            F.remove_dir(repo_cached.working_tree_dir)
 
 
 if __name__ == "__main__":

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/config/NikGappsConfig.py

@@ -6,12 +6,12 @@ from NikGapps.helper import Config
 from NikGapps.helper.AppSet import AppSet
 from NikGapps.helper.Assets import Assets
 from NikGapps.helper.ConfigObj import ConfigObj
-from NikGapps.helper.FileOp import FileOp
+from niklibrary.helper.F import F
 from NikGapps.helper.Package import Package
-from NikGapps.helper.Statics import Statics
-from NikGapps.helper.git.GitOperations import GitOperations
-from NikGapps.helper.upload.Upload import Upload
-from NikGapps.helper.web.Requests import Requests
+from niklibrary.helper.Statics import Statics
+from niklibrary.git.GitOp import GitOp
+from niklibrary.web.Upload import Upload
+from niklibrary.web.Requests import Requests
 
 
 class NikGappsConfig:
@@ -28,7 +28,7 @@ class NikGappsConfig:
         self.use_zip_config = use_zip_config
         self.elite_folder = None
         if config_path is not None:
-            self.raw_config = "".join(FileOp.read_string_file(config_path))
+            self.raw_config = "".join(F.read_string_file(config_path))
             self.config_name = str(Path(self.config_path).name).split(".config")[0]
             if str(self.config_path).__contains__(Statics.dir_sep + "elite" + Statics.dir_sep):
                 self.is_elite = True
@@ -269,15 +269,15 @@ class NikGappsConfig:
         analytics_dict = {}
         key = "config_version_" + Statics.get_android_code(self.android_version)
         analytics_dict[key] = str(self.config_version)
-        tracker_repo = GitOperations.setup_tracker_repo()
+        tracker_repo = GitOp.setup_tracker_repo()
         repo_dir = tracker_repo.working_tree_dir
-        if FileOp.dir_exists(repo_dir):
+        if F.dir_exists(repo_dir):
             print(f"{repo_dir} exists!")
             config_version_json = repo_dir + Statics.dir_sep + "config_version.json"
-            if FileOp.file_exists(config_version_json):
+            if F.file_exists(config_version_json):
                 print("File Exists!")
                 custom_builds_json_string = ""
-                for line in FileOp.read_string_file(config_version_json):
+                for line in F.read_string_file(config_version_json):
                     custom_builds_json_string += line
                 print(custom_builds_json_string)
                 print()
@@ -329,8 +329,8 @@ class NikGappsConfig:
         # create nikgapps.config file and upload to sourceforge
         temp_nikgapps_config_location = Statics.get_temp_packages_directory(
             self.android_version) + Statics.dir_sep + "nikgapps.config"
-        FileOp.write_string_in_lf_file(self.get_nikgapps_config(for_release=True), temp_nikgapps_config_location)
-        if FileOp.file_exists(temp_nikgapps_config_location):
+        F.write_string_in_lf_file(self.get_nikgapps_config(for_release=True), temp_nikgapps_config_location)
+        if F.file_exists(temp_nikgapps_config_location):
             release_dir = "NikGappsConfigs"
             u = Upload(android_version=self.android_version, release_type=release_dir, upload_files=Config.UPLOAD_FILES)
             file_type = "nikgappsconfig"
@@ -343,7 +343,7 @@ class NikGappsConfig:
     def get_release_date(self):
         release_date = None
         if self.config_path is not None:
-            file_contents = FileOp.read_string_file(self.config_path)
+            file_contents = F.read_string_file(self.config_path)
             for line in file_contents:
                 if line.startswith("RELEASE_DATE="):
                     release_date = line.split("=")[1].strip()
@@ -354,7 +354,7 @@ class NikGappsConfig:
         if release_date is None:
             release_date = Requests.get_release_date(self.android_version, Config.RELEASE_TYPE)
         if self.config_path is not None:
-            file_contents = FileOp.read_string_file(self.config_path)
+            file_contents = F.read_string_file(self.config_path)
             for index, line in enumerate(file_contents):
                 if line.startswith("RELEASE_DATE="):
                     file_contents[index] = f"RELEASE_DATE={release_date}\n"
@@ -363,6 +363,6 @@ class NikGappsConfig:
                     file_contents.insert(index, f"RELEASE_DATE={release_date}\n")
                     break
             file_string = "".join(file_contents)
-            FileOp.write_string_in_lf_file(file_string, self.config_path)
+            F.write_string_in_lf_file(file_string, self.config_path)
         else:
             print("Invalid config path!")

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

@@ -2,8 +2,8 @@ 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 NikGapps.helper.git.GitlabManager import GitLabManager
+from niklibrary.helper.SystemStat import SystemStat
+from niklibrary.git.GitlabManager import GitLabManager
 
 
 def copy_repos():

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/helper/Assets.py

@@ -2,21 +2,21 @@ from pathlib import Path
 from importlib import resources
 
 from nikassets.helper.Assets import Assets as A
+from niklibrary.helper.F import F
 
-from NikGapps.helper.Statics import Statics
-from .FileOp import FileOp
+from niklibrary.helper.Statics import Statics
 import os.path
 import platform
 
-from .Json import Json
+from niklibrary.json.Json import Json
 
 
 class Assets:
     with resources.files('NikGapps.helper').joinpath('assets') as asset_path:
         assets_folder = str(asset_path)
-    if not FileOp.dir_exists(assets_folder):
+    if not F.dir_exists(assets_folder):
         assets_folder = os.path.join(os.getcwd(), 'assets')
-    if not FileOp.dir_exists(assets_folder):
+    if not F.dir_exists(assets_folder):
         pwd = Path(os.getcwd()).parent
         for folders in pwd.iterdir():
             if folders.is_dir():
@@ -38,7 +38,7 @@ class Assets:
         adb_path = "adb"
     elif system_name == "Darwin":
         aapt_path = os.path.join(A.assets_folder, 'bin', system_name, 'aapt2')
-        if not FileOp.file_exists(aapt_path):
+        if not F.file_exists(aapt_path):
             aapt_path = Statics.find_latest_aapt()
         adb_path = "adb"
     else:
@@ -70,8 +70,8 @@ class Assets:
 
     @staticmethod
     def get_string_resource(file_path):
-        return FileOp.read_string_file(file_path)
+        return F.read_string_file(file_path)
 
     @staticmethod
     def get_binary_resource(file_path):
-        return FileOp.read_binary_file(file_path)
+        return F.read_binary_file(file_path)

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

@@ -1,10 +1,6 @@
-import os.path
-from pathlib import Path
 from .Assets import Assets
-from .Statics import Statics
-from .XmlOp import XmlOp
-from .Cmd import Cmd
-from .FileOp import FileOp
+from niklibrary.helper.Statics import Statics
+from niklibrary.helper.XmlOp import XmlOp
 from .overlay.Overlay import Overlay
 
 

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

@@ -1,7 +1,7 @@
-from NikGapps.helper.FileOp import FileOp
-from NikGapps.helper.Statics import Statics
+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
@@ -36,7 +36,7 @@ class CompOps:
             cpkg.add_string(pkg.get_installer_script(str(pkg_size)), "installer.sh")
             cpkg.add_string(pkg.get_uninstaller_script(), "uninstaller.sh")
             cpkg.close()
-            FileOp.write_string_file(str(pkg_size), pkg_txt_path)
+            F.write_string_file(str(pkg_size), pkg_txt_path)
         except Exception as e:
             print(e)
             return False

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

@@ -6,16 +6,16 @@ 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 ..Cmd import Cmd
-from ..FileOp import FileOp
-from ..P import P
-from ..Statics import Statics
-from ..T import T
-from ..web.TelegramApi import TelegramApi
+from niklibrary.helper.Cmd import Cmd
+from niklibrary.helper.F import F
+from niklibrary.helper.P import P
+from niklibrary.helper.Statics import Statics
+from niklibrary.helper.T import T
+from niklibrary.web.TelegramApi import TelegramApi
 from ...config.NikGappsConfig import NikGappsConfig
 
 
@@ -52,7 +52,7 @@ class Export:
                 print(f"Using cached package: {os.path.basename(pkg_zip_path)}")
                 cached_pkg_zip_path = os.path.join(Config.CACHED_SOURCE, appset.title,
                                                    f"{pakg.package_title}{compression_mode}")
-                if FileOp.file_exists(cached_pkg_zip_path):
+                if F.file_exists(cached_pkg_zip_path):
                     pkg_zip_path = cached_pkg_zip_path
                     pkg_txt_path = pkg_zip_path.replace(compression_mode, "") + "_" + compression_mode[
                                                                                       1:] + ".txt"
@@ -61,7 +61,7 @@ class Export:
             else:
                 CompOps.compress_package(pkg_zip_path, pakg, compression_mode)
 
-            for size_on_file in FileOp.read_string_file(pkg_txt_path):
+            for size_on_file in F.read_string_file(pkg_txt_path):
                 pkg_size = size_on_file
                 pakg.pkg_size = pkg_size
 

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/helper/git/TestGit.py

@@ -1,6 +1,6 @@
 import time
 
-from NikGapps.helper.git.Git import Git
+from niklibrary.git.Git import Git
 import git.exc
 
 

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/helper/overlay/ApkMetaInfo.py

@@ -1,7 +1,7 @@
 import os
 import yaml
 
-from NikGapps.helper.Statics import Statics
+from niklibrary.helper.Statics import Statics
 
 
 class ApkMetaInfo:

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/helper/overlay/Manifest.py

@@ -1,7 +1,7 @@
 import os
 import xml.etree.ElementTree as eT
 
-from NikGapps.helper.Statics import Statics
+from niklibrary.helper.Statics import Statics
 
 
 class Manifest:

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/helper/overlay/Overlay.py

@@ -1,5 +1,5 @@
 import os
-from NikGapps.helper.Statics import Statics
+from niklibrary.helper.Statics import Statics
 from NikGapps.helper.overlay.ApkMetaInfo import ApkMetaInfo
 from NikGapps.helper.overlay.Manifest import Manifest
 

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/helper/upload/CmdUpload.py

@@ -3,11 +3,11 @@ import platform
 import time
 from pathlib import Path
 import pexpect
-from NikGapps.helper.FileOp import FileOp
-from NikGapps.helper.P import P
-from NikGapps.helper.Statics import Statics
-from NikGapps.helper.T import T
-from NikGapps.helper.web.TelegramApi import TelegramApi
+from niklibrary.helper.F import F
+from niklibrary.helper.P import P
+from niklibrary.helper.Statics import Statics
+from niklibrary.helper.T import T
+from niklibrary.web.TelegramApi import TelegramApi
 
 
 class CmdUpload:
@@ -123,8 +123,8 @@ class CmdUpload:
         file_size_mb = None
         if self.successful_connection:
             system_name = platform.system()
-            file_size_kb = round(FileOp.get_file_size(file_name, "KB"), 2)
-            file_size_mb = round(FileOp.get_file_size(file_name), 2)
+            file_size_kb = round(F.get_file_size(file_name, "KB"), 2)
+            file_size_mb = round(F.get_file_size(file_name), 2)
             if telegram is not None:
                 telegram.message(f"- The zip {file_size_mb} MB is uploading...")
             if system_name != "Windows" and self.upload_files:

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/helper/upload/GoFileUpload.py

@@ -1,11 +1,11 @@
 import platform
 
 from NikGapps.helper.Assets import Assets
-from NikGapps.helper.Cmd import Cmd
-from NikGapps.helper.FileOp import FileOp
-from NikGapps.helper.P import P
-from NikGapps.helper.T import T
-from NikGapps.helper.web.TelegramApi import TelegramApi
+from niklibrary.helper.Cmd import Cmd
+from niklibrary.helper.F import F
+from niklibrary.helper.P import P
+from niklibrary.helper.T import T
+from niklibrary.web.TelegramApi import TelegramApi
 
 
 class GoFileUpload:
@@ -39,8 +39,8 @@ class GoFileUpload:
                 return execution_status
             print("uploading file finished...")
             execution_status = True
-            file_size_kb = round(FileOp.get_file_size(file_name, "KB"), 2)
-            file_size_mb = round(FileOp.get_file_size(file_name), 2)
+            file_size_kb = round(F.get_file_size(file_name, "KB"), 2)
+            file_size_mb = round(F.get_file_size(file_name), 2)
             time_taken = t.taken(f"Total time taken to upload file with size {file_size_mb} MB ("
                                  f"{file_size_kb} Kb)")
             if execution_status:

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

@@ -2,10 +2,10 @@
 from NikGapps.build.Release import Release
 from NikGapps.helper.Args import Args
 from NikGapps.helper import Config
-from NikGapps.helper.SystemStat import SystemStat
-from NikGapps.helper.T import T
-from NikGapps.helper.compression.Modes import Modes
-from NikGapps.helper.git.GitOperations import GitOperations
+from niklibrary.helper.SystemStat import SystemStat
+from niklibrary.helper.T import T
+from niklibrary.compression.Modes import Modes
+from niklibrary.git.GitOp import GitOp
 
 
 def main():
@@ -36,21 +36,21 @@ def main():
         # clone the apk repo if it doesn't exist
         if args.enable_git_clone:
             if Config.USE_CACHED_APKS:
-                cached_repo = GitOperations.clone_apk_source(android_version, release_type=Config.RELEASE_TYPE,
+                cached_repo = GitOp.clone_apk_source(android_version, release_type=Config.RELEASE_TYPE,
                                                              cached=True)
                 Config.CACHED_SOURCE = cached_repo.working_tree_dir
             else:
-                apk_repo = GitOperations.clone_apk_source(android_version, args.arch, release_type=Config.RELEASE_TYPE)
+                apk_repo = GitOp.clone_apk_source(android_version, args.arch, release_type=Config.RELEASE_TYPE)
                 Config.APK_SOURCE = apk_repo.working_tree_dir
-                overlay_repo = GitOperations.clone_overlay_repo(android_version)
+                overlay_repo = GitOp.clone_overlay_repo(android_version)
                 Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
         if Config.OVERRIDE_RELEASE:
             Release.zip(package_list, android_version, args.arch, args.sign)
         if Config.RELEASE_TYPE and Config.ENVIRONMENT_TYPE == "production":
-            GitOperations.mark_a_release(android_version, Config.RELEASE_TYPE)
+            GitOp.mark_a_release(android_version, Config.RELEASE_TYPE)
     if args.release:
         if args.update_website:
-            website_repo = GitOperations.get_website_repo_for_changelog()
+            website_repo = GitOp.get_website_repo_for_changelog()
             if website_repo is not None:
                 website_repo.update_changelog()
 

{nikgapps-3.29 → nikgapps-3.31}/NikGapps/overlay_control.py

@@ -1,12 +1,13 @@
 import os
 from pathlib import Path
+
 from NikGapps.build.NikGappsOverlays import NikGappsOverlays
 from NikGapps.helper.Args import Args
-from NikGapps.helper.Cmd import Cmd
-from NikGapps.helper.FileOp import FileOp
-from NikGapps.helper.P import P
-from NikGapps.helper.Statics import Statics
-from NikGapps.helper.git.Git import Git
+from niklibrary.helper.Cmd import Cmd
+from niklibrary.helper.F import F
+from niklibrary.helper.P import P
+from niklibrary.helper.Statics import Statics
+from niklibrary.git.Git import Git
 from NikGapps.helper.overlay.Overlay import Overlay
 
 
@@ -28,7 +29,7 @@ def overlay_control():
                 print("Pushing due changes!")
                 overlay_source_repo.git_push(commit_message=f"Updated {overlay.folder}!", push_untracked_files=True)
 
-        if FileOp.dir_exists(repo_dir):
+        if F.dir_exists(repo_dir):
             overlays_repo_name = Statics.get_overlay_repo(android_version)
             overlays_repo_dir = Statics.get_overlay_directory(android_version)
             overlay_repo = Git(overlays_repo_dir)
@@ -37,7 +38,7 @@ def overlay_control():
                 if str(folder).__contains__(".git") or str(folder).__contains__("README.md"):
                     continue
                 cmd = Cmd()
-                if not FileOp.file_exists(os.path.join(str(folder), "apktool.yml")):
+                if not F.file_exists(os.path.join(str(folder), "apktool.yml")):
                     P.red(f"apktool.yml doesn't exist in {folder}")
                     continue
                 overlay_path = cmd.build_overlay(folder_name=str(folder))
@@ -45,12 +46,12 @@ def overlay_control():
                     print(f"{overlay_path} successfully built..")
                     print(
                         f"Copying to {os.path.join(overlays_repo_dir, str(Path(folder).name), f'{Path(folder).name}.apk')}")
-                    FileOp.copy_file(overlay_path, os.path.join(overlays_repo_dir,
+                    F.copy_file(overlay_path, os.path.join(overlays_repo_dir,
                                                                 str(Path(folder).name), f"{Path(folder).name}.apk"))
                     folder_to_remove = os.path.join(str(folder), "dist")
-                    FileOp.remove_dir(folder_to_remove)
+                    F.remove_dir(folder_to_remove)
                     folder_to_remove = os.path.join(str(folder), "build")
-                    FileOp.remove_dir(folder_to_remove)
+                    F.remove_dir(folder_to_remove)
                 else:
                     print("Failed to build overlay")
             if overlay_repo.due_changes():

nikgapps-3.31/NikGapps/test.py

@@ -0,0 +1,3 @@
+from niklibrary.web.Requests import Requests
+
+print(Requests.get_package_details())

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.29
+Version: 3.31
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani
@@ -94,8 +94,9 @@ Ensure you have the following tools installed:
 
 ## Total Downloads  
 <!-- 7312415 from 2019-07-22 to 2024-07-18 -->
-![Static Badge](https://img.shields.io/badge/7.3M-red?label=Before%2018th%20July%202024&color=green)  
-<img alt="SourceForge" src="https://img.shields.io/sourceforge/dt/nikgapps?label=After%2018th%20July%202024&color=red">   
+<!-- 7653966 from 2019-07-22 to 2024-10-02 -->
+![Static Badge](https://img.shields.io/badge/7.7M-red?label=Before%202nd%20OOct%202024&color=green)  
+<img alt="SourceForge" src="https://img.shields.io/sourceforge/dt/nikgapps?label=After%202nd%20Oct%202024&color=red">   
 <img alt="SourceForge" src="https://img.shields.io/sourceforge/dd/nikgapps?label=Downloads%20Per%20Day&color=blue">
 
 <!--