NikGapps 3.5__tar.gz → 3.7__tar.gz

{nikgapps-3.5 → nikgapps-3.7}/NikGapps/build/Build.py

@@ -14,10 +14,8 @@ class Build:
 
     # Just provide the package list, and it will pick them up from the directory and build them for you
     @staticmethod
-    def build_from_directory(app_set_build_list, android_version, arch="arm64", cached=False):
-        arch = "" if arch == "arm64" else "_" + arch
-        source_directory = Statics.pwd + Statics.dir_sep + str(android_version) + arch
-        source_directory = source_directory + f"_{Config.RELEASE_TYPE}" + (f"_cached" if cached else "")
+    def build_from_directory(app_set_build_list, android_version, cached=False):
+        source_directory = Config.CACHED_SOURCE if cached else Config.APK_SOURCE
         print(f"Building from {source_directory}")
         cmd = Cmd()
         app_set_list = []
@@ -28,6 +26,7 @@ class Build:
             package_list = []
             for package in app_set.package_list:
                 package: Package
+                print(f"Setting up {name}/{package.package_title}")
                 pkg_to_build = package
                 package_title = pkg_to_build.package_title
                 pkg_path = os.path.join(str(app_set_path), package_title)
@@ -39,15 +38,15 @@ class Build:
                 primary_app_location = None
                 delete_files_list = []
                 delete_overlay_list = []
-                # copy over any overlay.apk that exists to pkg_path!
-                overlay_android_version = f"overlays_{Statics.get_android_code(android_version)}"
-                overlay_directory = Statics.pwd + os.path.sep + overlay_android_version
+                overlay_directory = Config.OVERLAY_SOURCE
                 overlay_dir = overlay_directory + Statics.dir_sep + f"{package_title}Overlay"
                 if FileOp.dir_exists(overlay_dir):
                     for file in Path(overlay_dir).rglob("*.apk"):
-                        overlay_destination = pkg_path + Statics.dir_sep + "___overlay" + Statics.dir_sep + Path(
-                            file).name
-                        FileOp.copy_file(file, overlay_destination)
+                        pkg_files_path = "overlay" + Statics.dir_sep + Path(file).name
+                        install_list.append(pkg_files_path.replace("___", "/"))
+                        file_dict_value = str(pkg_files_path.replace("___", "/")).replace("\\", "/")
+                        value = str(file_dict_value).split("/")
+                        file_dict[str(file)] = "___" + "___".join(value[:len(value) - 1]) + "/" + value[len(value) - 1]
                 for pkg_files in Path(pkg_path).rglob("*"):
                     if Path(pkg_files).is_dir() or str(pkg_files).__contains__(".git") \
                             or str(pkg_files).endswith(".gitattributes") or str(pkg_files).endswith("README.md"):
@@ -86,7 +85,10 @@ class Build:
                     if str(pkg_files_path).endswith("xml") or str(pkg_files_path).endswith("prop"):
                         FileOp.convert_to_lf(str(pkg_files.absolute()))
                     install_list.append(pkg_files_path.replace("___", "/"))
-                    file_dict[pkg_files.absolute()] = str(pkg_files_path.replace("___", "/")).replace("\\", "/")
+                    file_dict_value = str(pkg_files_path.replace("___", "/")).replace("\\", "/")
+                    value = str(file_dict_value).split("/")
+                    file_dict[pkg_files.absolute()] = "___" + "___".join(value[:len(value) - 1]) + "/" + value[
+                        len(value) - 1]
                 if primary_app_location is not None:
                     title = os.path.basename(primary_app_location)[:-4]
                 else:

{nikgapps-3.5 → nikgapps-3.7}/NikGapps/build/Release.py

@@ -25,7 +25,7 @@ class Release:
 
         def zip_package(file_name, app_set_list):
             if app_set_list:
-                config_obj.config_package_list = Build.build_from_directory(app_set_list, android_version, arch,
+                config_obj.config_package_list = Build.build_from_directory(app_set_list, android_version,
                                                                             cached=Config.USE_CACHED_APKS)
                 print(f"Exporting {file_name}")
                 z = Export(file_name, sign=sign_zip)

{nikgapps-3.5 → nikgapps-3.7}/NikGapps/cache.py

@@ -40,13 +40,15 @@ def cache():
         if project:
             gitattributes = """*.zip filter=lfs diff=lfs merge=lfs -text
 *.tar.xz filter=lfs diff=lfs merge=lfs -text"""
-            gitlab_manager.reset_repository(cached_url, sleep_for=5, gitattributes=gitattributes)
+            gitlab_manager.reset_repository(cached_url, sleep_for=10, gitattributes=gitattributes)
         repo_cached = GitOperations.clone_apk_url(url=cached_url)
-        GitOperations.clone_apk_url(url=url)
-        GitOperations.clone_overlay_repo(android_version=str(android_version), fresh_clone=True)
+        apk_repo = GitOperations.clone_apk_url(url=url)
+        Config.APK_SOURCE = apk_repo.working_tree_dir
+        overlay_repo = GitOperations.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")
-        config_obj.config_package_list = Build.build_from_directory(app_set_list, android_version, arch)
+        config_obj.config_package_list = Build.build_from_directory(app_set_list, android_version)
         for appset in config_obj.config_package_list:
             appset: AppSet
             for pkg in appset.package_list:

{nikgapps-3.5 → nikgapps-3.7}/NikGapps/helper/Config.py

@@ -54,6 +54,11 @@ GIT_CLONE_SOURCE = True
 GIT_CHECK = True
 GIT_PUSH = True
 
+# Overlays, Gapps Apks and Cached Apks source
+CACHED_SOURCE = None
+APK_SOURCE = None
+OVERLAY_SOURCE = None
+
 # Enabling this will enable the feature of building NikGapps using config file
 BUILD_CONFIG = True
 BUILD_EXCLUSIVE = (RELEASE_TYPE.lower().__eq__("stable"))

{nikgapps-3.5 → nikgapps-3.7}/NikGapps/helper/Package.py

@@ -107,7 +107,7 @@ class Package:
         str_data += "\n"
         str_data += f"file_list=\"\n"
         for file in self.file_dict:
-            str_data += str(file)[str(file).find("___"):].replace("\\", "/") + "\n"
+            str_data += self.file_dict[file] + "\n"
         if self.priv_app_permissions_str is not None:
             str_data += "___etc___permissions/" + self.package_name + ".xml\n"
         str_data += "\"\n"
@@ -180,7 +180,7 @@ class Package:
         str_data += "\n"
         str_data += f"file_list=\"\n"
         for file in self.file_dict:
-            str_data += str(file)[str(file).find("___"):].replace("\\", "/") + "\n"
+            str_data += self.file_dict[file] + "\n"
         if self.priv_app_permissions_str is not None:
             str_data += "___etc___permissions/" + self.package_name + ".xml\n"
         str_data += "\"\n"

{nikgapps-3.5 → nikgapps-3.7}/NikGapps/helper/compression/CompOps.py

@@ -24,9 +24,10 @@ class CompOps:
             cpkg = CompOps.get_compression_obj(pkg_zip_path, compression_mode=compression_mode)
             file_index = 1
             for x in pkg.file_dict:
+                y = pkg.file_dict[x]
                 file_index = file_index + 1
                 pkg_size = pkg_size + Statics.get_file_bytes(x)
-                cpkg.add_file(x, str(x)[str(x).find("___"):].replace("\\", "/"))
+                cpkg.add_file(x, y)
             if pkg.clean_flash_only:
                 cpkg.add_string("", "___etc___permissions/" + pkg.package_title + ".prop")
             pkg.pkg_size = pkg_size

{nikgapps-3.5 → nikgapps-3.7}/NikGapps/main.py

@@ -14,7 +14,6 @@ def main():
     print("Start of the Program")
     SystemStat.show_stats()
     t = T()
-    P.green("---------------------------------------")
     android_versions = [Config.TARGET_ANDROID_VERSION]
     package_list = Config.BUILD_PACKAGE_LIST
     Config.UPLOAD_FILES = args.upload
@@ -38,10 +37,14 @@ def main():
         # clone the apk repo if it doesn't exist
         if args.enable_git_clone:
             if Config.USE_CACHED_APKS:
-                GitOperations.clone_apk_source(android_version, release_type=Config.RELEASE_TYPE, cached=True)
+                cached_repo = GitOperations.clone_apk_source(android_version, release_type=Config.RELEASE_TYPE,
+                                                             cached=True)
+                Config.CACHED_SOURCE = cached_repo.working_tree_dir
             else:
-                GitOperations.clone_apk_source(android_version, args.arch, release_type=Config.RELEASE_TYPE)
-                GitOperations.clone_overlay_repo(android_version)
+                apk_repo = GitOperations.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)
+                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":

{nikgapps-3.5 → nikgapps-3.7/NikGapps.egg-info}/PKG-INFO

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

{nikgapps-3.5/NikGapps.egg-info → nikgapps-3.7}/PKG-INFO

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

{nikgapps-3.5 → nikgapps-3.7}/setup.py

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