NikGapps 3.44__tar.gz → 3.46__tar.gz

{nikgapps-3.44 → nikgapps-3.46}/NikGapps/helper/compression/Export.py

@@ -35,7 +35,7 @@ class Export:
         completed_packages = 0
         file_sizes = ""
         zip_execution_status = False
-        telegram.message(f"Progress {0:.2f}% ({completed_packages}/{total_packages})")
+        telegram.message(f"- Gapps is building {0:.2f}% ({completed_packages}/{total_packages})")
 
         def compress_and_add_file(appset, pakg, compressionmode):
             nonlocal completed_packages
@@ -70,9 +70,9 @@ class Export:
                 file_sizes = file_sizes + str(pakg.package_title) + "=" + str(pakg.pkg_size) + "\n"
                 completed_packages += 1
                 progress = (completed_packages / total_packages) * 100
-                telegram.message(f"Progress {progress:.2f}% ({completed_packages}/{total_packages})",
+                telegram.message(f"- Gapps is building {progress:.2f}% ({completed_packages}/{total_packages})",
                                  replace_last_message=True)
-                P.blue(f"Progress {progress:.2f}% ({completed_packages}/{total_packages}): "
+                P.blue(f"- Gapps is building {progress:.2f}% ({completed_packages}/{total_packages}): "
                        f"{appset.title}/{pakg.package_title} (Thread {thread_id})")
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:

{nikgapps-3.44 → nikgapps-3.46}/NikGapps/helper/git/TestGit.py

@@ -1,7 +1,12 @@
+import os
 import time
+from shutil import copyfile
 
 from niklibrary.git.Git import Git
 import git.exc
+from niklibrary.git.GitStatics import GitStatics
+
+from NikGapps.helper.Assets import Assets
 
 
 class TestGit(Git):
@@ -59,3 +64,13 @@ class TestGit(Git):
                 if debug:
                     print(f"Pushed {info.summary}")
         return True
+
+    def update_changelog(self):
+        source_file = Assets.changelog
+        dest_file = GitStatics.website_repo_dir + os.path.sep + "_data" + os.path.sep + "changelogs.yaml"
+        copyfile(source_file, dest_file)
+        if self.due_changes():
+            print("Updating the changelog to the website")
+            self.git_push("Update Changelog")
+        else:
+            print("There is no changelog to update!")

{nikgapps-3.44 → nikgapps-3.46}/NikGapps/main.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from niklibrary.git.GitStatics import GitStatics
+
 from NikGapps.build.Release import Release
 from NikGapps.helper.Args import Args
 from NikGapps.helper import Config
@@ -7,6 +9,8 @@ from niklibrary.helper.T import T
 from niklibrary.compression.Modes import Modes
 from niklibrary.git.GitOp import GitOp
 
+from NikGapps.helper.git.TestGit import TestGit
+
 
 def main():
     args = Args()
@@ -43,14 +47,17 @@ def main():
                 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 = GitOp.clone_overlay_repo(android_version)
-                Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
+                if overlay_repo is not None:
+                    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":
             GitOp.mark_a_release(android_version, Config.RELEASE_TYPE)
     if args.release:
         if args.update_website:
-            website_repo = GitOp.get_website_repo_for_changelog()
+            website_repo = TestGit(GitStatics.website_repo_dir)
+            if GitStatics.website_repo_url is not None:
+                website_repo.clone_repo(repo_url=GitStatics.website_repo_url, fresh_clone=False, branch="main")
             if website_repo is not None:
                 website_repo.update_changelog()
 

{nikgapps-3.44 → nikgapps-3.46/NikGapps.egg-info}/PKG-INFO

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

{nikgapps-3.44/NikGapps.egg-info → nikgapps-3.46}/PKG-INFO

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

{nikgapps-3.44 → nikgapps-3.46}/setup.py

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