NikGapps 3.76__py3-none-any.whl → 3.78__py3-none-any.whl

NikGapps/cache.py

@@ -1,4 +1,6 @@
 import os
+import time
+
 from dotenv import load_dotenv
 from NikGapps.build.Build import Build
 from NikGapps.config.NikGappsConfig import NikGappsConfig
@@ -39,9 +41,7 @@ def cache():
         project = gitlab_manager.get_project(cached_url)
         gitattributes = """*.zip filter=lfs diff=lfs merge=lfs -text
         *.tar.xz filter=lfs diff=lfs merge=lfs -text"""
-        if project:
-            gitlab_manager.reset_repository(cached_url, sleep_for=10, gitattributes=gitattributes)
-        else:
+        if not project:
             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)
@@ -56,6 +56,10 @@ def cache():
         config_obj.config_package_list = Build.build_from_directory(app_set_list, android_version)
         for appset in config_obj.config_package_list:
             appset: AppSet
+            # delete the folder to reset the files
+            if F.dir_exists(os.path.join(repo_cached.working_tree_dir, appset.title)):
+                F.remove_dir(os.path.join(repo_cached.working_tree_dir, appset.title))
+                F.make_dir(os.path.join(repo_cached.working_tree_dir, appset.title))
             for pkg in appset.package_list:
                 pkg: Package
                 compression_modes = [Modes.ZIP, Modes.TAR_XZ]
@@ -66,8 +70,10 @@ def cache():
                                                 f"{pkg.package_title}{mode}")
                     print("Done!") if CompOps.compress_package(pkg_zip_path, pkg, mode) else print("Failed!")
                     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")
+                    time.sleep(5)
+                    repo_cached.git_push(
+                        commit_message=f"Compressed {pkg.package_title} for {appset.title} into {mode}",
+                        push_untracked_files=True, post_buffer="1048576000")
         if Config.ENVIRONMENT_TYPE.__eq__("production") and F.dir_exists(repo_cached.working_tree_dir):
             F.remove_dir(repo_cached.working_tree_dir)
 

NikGapps/config/NikGappsConfig.py

@@ -55,51 +55,53 @@ class NikGappsConfig:
 
     def build_config_objects(self, config_dict=None):
         config_list = []
+        if config_dict is None:
+            config_dict = self.config_dict
         default_mode, install_mode = "default", "install"
         enabled_mode, disabled_mode, use_zip_config = 1, 0, self.use_zip_config
         predefined_configs = {
             "AndroidVersion": self.android_version,
             "Version": self.config_version,
             "LogDirectory": {
-                "value": default_mode,
+                "value": config_dict.get("LogDirectory", default_mode),
                 "description": """# set this to the directory you want to copy the logs to.
 # for e.g. LogDirectory="/system/etc" will install the logs to /system/etc/nikgapps_logs directory
 # by default it will install it to /sdcard/NikGapps/nikgapps_logs"""
             },
             "InstallPartition": {
-                "value": default_mode,
+                "value": config_dict.get("InstallPartition", default_mode),
                 "description": "# set to /system, /product or /system_ext if you want to force the installation to aforementioned locations"
             },
             "Mode": {
-                "value": install_mode,
+                "value": config_dict.get("Mode", install_mode),
                 "description": "# set to uninstall if you want to uninstall any google app, also set the value of google app below to -1"
             },
             "WipeDalvikCache": {
-                "value": enabled_mode,
+                "value": config_dict.get("WipeDalvikCache", enabled_mode),
                 "description": "# set WipeDalvikCache=0 if you don't want the installer to wipe dalvik/cache after installing the gapps"
             },
             "WipeRuntimePermissions": {
-                "value": disabled_mode,
+                "value": config_dict.get("WipeRuntimePermissions", enabled_mode),
                 "description": "# set WipeRuntimePermissions=1 if you want to wipe runtime permissions"
             },
             "ExecuteBackupRestore": {
-                "value": enabled_mode,
+                "value": config_dict.get("ExecuteBackupRestore", enabled_mode),
                 "description": "# Addon.d config, set it to 0 to skip the automatic backup/restore while flashing the rom"
             },
             "UseZipConfig": {
-                "value": use_zip_config,
+                "value": config_dict.get("UseZipConfig", use_zip_config),
                 "description": "# if you want to force the installer to use the config from gapps zip file, set below to 1"
             },
             "OverwriteWithZipConfig": {
-                "value": disabled_mode,
+                "value": config_dict.get("OverwriteWithZipConfig", disabled_mode),
                 "description": "# if you want to overwrite the config located in /sdcard/NikGapps with gapps zip file, set below to 1. Applicable to decrypted storage only"
             },
             "GmsOptimization": {
-                "value": disabled_mode,
+                "value": config_dict.get("GmsOptimization", disabled_mode),
                 "description": "# set this to 1 if you want to enable gms optimization, careful while doing it, you may experience issues like delayed notification with some Roms"
             },
             "GenerateLogs": {
-                "value": enabled_mode,
+                "value": config_dict.get("GenerateLogs", enabled_mode),
                 "description": "# set this to 0 if you want to skip generating nikgapps logs, if you run into issues, enable it and flash the zip again to get the logs"
             }
         }

{nikgapps-3.76.dist-info → nikgapps-3.78.dist-info}/METADATA

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

{nikgapps-3.76.dist-info → nikgapps-3.78.dist-info}/RECORD

@@ -1,6 +1,6 @@
 NikGapps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NikGapps/build_config.py,sha256=QVWmRLUIv1US8OWeBwwiAHLTBu6heMF1aFezsud8Fxw,3193
-NikGapps/cache.py,sha256=lQTX3-JZOCWhgsiaklKRLSy46FKX9WwQ49dyrLnSQTk,4057
+NikGapps/cache.py,sha256=7z6IODtzW8bEa32KnergLqtViLQD3vBDNQrdIDzLFFA,4316
 NikGapps/config_upload.py,sha256=0HE7txm73XXxat_cR0JDXWtQUmg1IYK_SktwJS6N34s,652
 NikGapps/copy_repos.py,sha256=AXI1LIO_4pXkJUTlIsW45JRpEIkmICPVcCDOJ-YIauk,1951
 NikGapps/main.py,sha256=86OrjdjqZwfdzgrQte6e8ADzGgKms37YaM_QlbY3BlE,2904
@@ -12,7 +12,7 @@ NikGapps/build/NikGappsOverlays.py,sha256=bbAIuIeE7HICdXRNeZJrvuW58_tUuDH9Du_1k6
 NikGapps/build/PackageConstants.py,sha256=QEq8tFngNXoFpNe87k3iBvfaGe1hjP7LCEINtFpnzFA,17763
 NikGapps/build/Release.py,sha256=3YjZ2puzBE_QuaJMXQxRtphX0WGtU4SKYrGDD3RztL0,4944
 NikGapps/build/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-NikGapps/config/NikGappsConfig.py,sha256=7qqeKyWm-2GO39Z8vSOI9TqEd22u0QHLetu2urQxpMw,20318
+NikGapps/config/NikGappsConfig.py,sha256=SNGpODuGXq9UadXpfG3BOqQesg33BuU-2fJcQqVzP88,20752
 NikGapps/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NikGapps/helper/AppSet.py,sha256=vEIwk7NX1LQt71UJ3naEdsekmB_Ea0v8j0CQJkrSTEU,352
 NikGapps/helper/Args.py,sha256=r1KIKs1x9DbIPwqBPmfIb3BBD5PvclvUDIv3D-fvy2A,4338
@@ -54,9 +54,9 @@ NikGapps/helper/overlay/Resources.py,sha256=bKWJEF2avl3j2ud390HQq9fRMMA8GKh9-KAB
 NikGapps/helper/overlay/String.py,sha256=nyCAD_dNfwHlOgj4zuKGGz71n20CLEKyZCgrVAmiX2I,469
 NikGapps/helper/overlay/StringArray.py,sha256=DYPEAIdpicaJ3C08IYW6Q2tnTH6gUFXmu3KhQlHGY5g,563
 NikGapps/helper/overlay/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nikgapps-3.76.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-nikgapps-3.76.dist-info/METADATA,sha256=9IA0R3yIAiC1ThJc4QhC9qsVWaT_4Ht6fJf1nazMIWs,4343
-nikgapps-3.76.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nikgapps-3.76.dist-info/entry_points.txt,sha256=iKbeOiuELwTDu5kmQHrU9XBVASWRR6_TuRIRva2UnAY,286
-nikgapps-3.76.dist-info/top_level.txt,sha256=CD7RpCb7bzjyvpQLt8hh2gU6X1wj3Z0NIErVkg-nJI4,9
-nikgapps-3.76.dist-info/RECORD,,
+nikgapps-3.78.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+nikgapps-3.78.dist-info/METADATA,sha256=BsE4v_m4tt6PnXouHqb0q9briPeUmC3wj92mfqmVyLo,4343
+nikgapps-3.78.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nikgapps-3.78.dist-info/entry_points.txt,sha256=iKbeOiuELwTDu5kmQHrU9XBVASWRR6_TuRIRva2UnAY,286
+nikgapps-3.78.dist-info/top_level.txt,sha256=CD7RpCb7bzjyvpQLt8hh2gU6X1wj3Z0NIErVkg-nJI4,9
+nikgapps-3.78.dist-info/RECORD,,