q2rad 0.1.182__py3-none-any.whl → 0.1.184__py3-none-any.whl

q2rad/q2make.py

@@ -15,6 +15,7 @@
 import os
 import sys
 import shutil
+import zipfile
 from q2terminal.q2terminal import Q2Terminal
 from q2rad.q2utils import q2cursor, Q2Form, open_folder  # noqa F401
 from q2gui.q2dialogs import q2mess, q2wait, q2ask
@@ -69,7 +70,7 @@ def make_binary(self):
     if not form.ok_pressed:
         return
 
-    if q2ask("Уou are about to start buiding binary executable file of Q2RAD!<br>Are You Sure?") != 2:
+    if q2ask("Уou are about to start building binary executable file of Q2RAD!<br>Are You Sure?") != 2:
         return
 
     make_folder = os.path.abspath(form.s.make_folder)
@@ -81,20 +82,30 @@ def make_binary(self):
     if not os.path.isdir(make_folder):
         return
 
-    main = "from q2rad.q2rad import Q2RadApp;app = Q2RadApp();app.run()"
+    main = """
+import sys
+if "darwin" in sys.platform:
+    path = sys.argv[0].split("/Contents/MacOS")[0]
+    path = os.path.dirname(path)
+    os.chdir(path)
+
+from q2rad.q2rad import Q2RadApp
+app = Q2RadApp()
+app.run()
+    """
     open(f"{make_folder}/{binary_name}.py", "w").write(main)
 
     dist_folder = os.path.abspath(f"{make_folder}/dist/{binary_name}")
 
     terminal = Q2Terminal(callback=print)
-    # pynstaller_executable = os.path.dirname(sys.executable) + "/pyinstaller"
-    pynstaller_executable = f"'{sys.executable}' -m PyInstaller"
-
+    pynstaller_executable = f"'{sys.executable.replace('w.exe', '.exe')}' -m PyInstaller"
+    if "win32" in sys.platform:
+        pynstaller_executable = "& " + pynstaller_executable
+    print(pynstaller_executable)
     if not os.path.isfile("poetry.lock"):
         terminal.run(f"{pynstaller_executable} -v")
         if terminal.exit_code != 0:
-            # pip_executable = os.path.dirname(sys.executable) + "/pip"
-            terminal.run(f"'{sys.executable}' -m pip install pyinstaller")
+            terminal.run(f"'{sys.executable.replace('w.exe', '.exe')}' -m pip install pyinstaller")
             if terminal.exit_code != 0:
                 q2mess("Pyinstaller not installed!")
                 return
@@ -128,6 +139,24 @@ def make_binary(self):
     #         if os.path.isfile(os.path.join(dist_folder, x)):
     #             shutil.move(os.path.join(dist_folder, x), os.path.join(dist_folder, binary_name, x))
 
+    if "darwin" in sys.platform:
+        shutil.move(
+            f"{make_folder}/dist/{binary_name}.app", f"{make_folder}/dist/{binary_name}/{binary_name}.app"
+        )
+        os.remove(f"{make_folder}/dist/{binary_name}/{binary_name}")
+        shutil.rmtree(f"{make_folder}/dist/{binary_name}/_internal", ignore_errors=True)
+
+    name = f"{make_folder}/dist/{binary_name}"
+    zip_name = name + ".zip"
+
+    with zipfile.ZipFile(zip_name, "w", zipfile.ZIP_DEFLATED) as zip_ref:
+        for folder_name, subfolders, filenames in os.walk(name):
+            for filename in filenames:
+                file_path = os.path.join(folder_name, filename)
+                zip_ref.write(file_path, arcname=f"{binary_name}/{os.path.relpath(file_path, name)}")
+
+    zip_ref.close()
+
     w.close()
 
     if terminal.exit_code != 0:

q2rad/q2packages.py

@@ -31,7 +31,8 @@ class Q2Packages(Q2Form):
 
     def on_init(self):
         self.add_control("package_name", _("Name"), datatype="char", datalen=100, pk="*")
-        self.add_control("package_version", _("Version"), datatype="char", datalen=10, disabled="*")
+        self.add_control("package_alias", _("Alias"), datatype="char", datalen=100)
+        self.add_control("package_version", _("Version"), datatype="char", datalen=10)
         self.add_control("comment", _("Comment"), datatype="text")
 
         cursor: Q2Cursor = self.q2_app.db_logic.table(table_name="packages")
@@ -40,9 +41,9 @@ class Q2Packages(Q2Form):
         self.set_model(model)
         self.add_action("/crud")
         # self.add_action("Imp", self.imp)
-        self.add_action("Install", self.install)
-        self.add_action("Uninstall", self.uninstall)
-        self.add_action("Versions", self.info)
+        self.add_action("Install", self.install, eof_disabled=True)
+        self.add_action("Uninstall", self.uninstall, eof_disabled=True)
+        self.add_action("Versions", self.info, eof_disabled=True)
 
     # def imp(self):
     #     __import__(self.r.package_name)

q2rad/q2rad.py

@@ -16,6 +16,7 @@ import sys
 import os
 import re
 import threading
+from packaging import version
 
 if __name__ == "__main__":
     sys.path.insert(0, ".")
@@ -63,7 +64,8 @@ from q2rad.q2utils import Q2Tasker, Q2Form, auto_filter, set_logging, open_folde
 from q2rad.q2utils import q2choice
 from q2rad.q2make import make_binary
 
-from q2data2docx.q2data2docx import q2data2docx # noqa F401
+from q2data2docx.q2data2docx import q2data2docx  # noqa F401
+
 # from q2googledrive.q2googledrive import q2googledrive # noqa F401
 
 import gettext
@@ -866,9 +868,19 @@ class Q2RadApp(Q2App):
         list_2_upgrade = []
 
         rez = self.get_packages_version(packages_list)
-
         for package in rez:
             latest_version, current_version = rez[package]
+            if self.db_logic is not None and package not in q2_modules:
+                pkg_ver = get("packages", f"package_name='{package}'", "package_version", q2_db=self.db_logic)
+                pkg_ver = pkg_ver if pkg_ver else "99999"
+                try:
+                    if version.parse(latest_version) > version.parse(pkg_ver):
+                        continue
+                except Exception as error:
+                    q2mess(f"Error occured while checking updates for <b>{package}</b>:"
+                           f"<br> {error}<br>"
+                            f"<b>{package}</b> package update interrupted")
+                    continue
             if latest_version != current_version and latest_version:
                 list_2_upgrade_message.append(f"<b>{package}</b>: {current_version} > {latest_version}")
                 list_2_upgrade.append(package)
@@ -877,7 +889,7 @@ class Q2RadApp(Q2App):
         if can_upgrade:
             if (
                 q2AskYN(
-                    "Updates for packages are avaiable!<p><p>"
+                    "!Updates for packages are avaiable!<p><p>"
                     f"{',<br> '.join(list_2_upgrade_message)}<br><br>"
                     "Do you want to proceed with update?<p><p>"
                     "The program will be restarted after the update!"

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.182"
+__version__ = "0.1.184"

{q2rad-0.1.182.dist-info → q2rad-0.1.184.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q2rad
-Version: 0.1.182
+Version: 0.1.184
 Summary: RAD - database, GUI, reports
 Author: Andrei Puchko
 Author-email: andrei.puchko@gmx.de

{q2rad-0.1.182.dist-info → q2rad-0.1.184.dist-info}/RECORD

@@ -6,19 +6,19 @@ q2rad/q2appselector.py,sha256=oKlBdGPaCh0HEeDNJRMtGMVYGev2Ylundqum74NtPqY,12238
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2forms.py,sha256=A5VeBK8OdE3zn0L1TgvCk4OjpB1nLibJqBFfpVZr_Uc,10181
 q2rad/q2lines.py,sha256=e2GwnXxGhxMw_xWF_-enmYeHaMSKRnxER1jGFgRlOAc,14481
-q2rad/q2make.py,sha256=UdrmyGngzVD5Ix9mBqb8SPmZ2tOYghQ9Tv69lg-LjOs,5514
+q2rad/q2make.py,sha256=k5hOwhhI8N2FY_6Irl0LlL2vBjjFMNHgxwWcD4jiXoY,6510
 q2rad/q2market.py,sha256=koWwKKc1MVn0ud2XDu_dal8lBFEMLX8KABpZO_OzTIM,2597
 q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
-q2rad/q2packages.py,sha256=IpWEcAT9nLCHUGViInEyM4T1cLEwK9GtNcdGF-pk0tw,3345
+q2rad/q2packages.py,sha256=ifRu8LuVrrTphiJe1JUVED_KB2sHJCPVnZq9VEh3K8w,3473
 q2rad/q2queries.py,sha256=ABbr66YRLmleo2wcpvwcQwSPt_htjQsYXgoCqRRQSbo,12512
-q2rad/q2rad.py,sha256=yf-W0YHQcCI5BNqzfKmTLzMOIgybk7fauR9-dsIn_Ps,42942
+q2rad/q2rad.py,sha256=S5XD-Np8OzeqEHSndN3EWLtUPup2YgZCVsZt_WvzWjQ,43644
 q2rad/q2raddb.py,sha256=ISqT5EBFO7eaXcQRNpA0hMiRU84kbd-FcfckwKMlGfs,4506
 q2rad/q2reports.py,sha256=xciOPsSbhepcKk_q2bIHsceAyg5ZMbs-EVbzyD8sqBI,81212
 q2rad/q2stylesettings.py,sha256=esbfQoPgP7lJN2GRkqeQKjDpHCqCilJBzZf-c73ThCU,3593
 q2rad/q2utils.py,sha256=YKmHbfvKqGqhVjOERdceK2lT9IShj0afwZkGTObCs-I,18504
-q2rad/version.py,sha256=yBRTO_Z5iUlFP8SyNJhLSxgyv7mchXV1x4AI3gAPbpA,23
-q2rad-0.1.182.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.182.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.182.dist-info/METADATA,sha256=J-8Q2s4AmTY8SDiBvZeghR33w4B-fLhoVZzKAYC22uY,3329
-q2rad-0.1.182.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.182.dist-info/RECORD,,
+q2rad/version.py,sha256=QIoV_M2rk6XDGECmjmRmCu9WBMJogF97jr_VxixP1hc,23
+q2rad-0.1.184.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.184.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.184.dist-info/METADATA,sha256=OU3hzh7gKNxZerxrOOVxNZhLKOXpgF0rvZFl9Oh-GbI,3329
+q2rad-0.1.184.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.184.dist-info/RECORD,,