q2rad 0.1.182__tar.gz → 0.1.183__tar.gz

{q2rad-0.1.182 → q2rad-0.1.183}/PKG-INFO

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

{q2rad-0.1.182 → q2rad-0.1.183}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "q2rad"
-version = "0.1.182"
+version = "0.1.183"
 description = "RAD - database, GUI, reports"
 authors = ["Andrei Puchko <andrei.puchko@gmx.de>"]
 readme = "README.md"

{q2rad-0.1.182 → q2rad-0.1.183}/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,7 +82,16 @@ def make_binary(self):
     if not os.path.isdir(make_folder):
         return
 
-    main = "from q2rad.q2rad import Q2RadApp;app = Q2RadApp();app.run()"
+    main = """
+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}")
@@ -89,6 +99,8 @@ def make_binary(self):
     terminal = Q2Terminal(callback=print)
     # pynstaller_executable = os.path.dirname(sys.executable) + "/pyinstaller"
     pynstaller_executable = f"'{sys.executable}' -m PyInstaller"
+    if "win32" in sys.platform:
+        pynstaller_executable = "&" + pynstaller_executable
 
     if not os.path.isfile("poetry.lock"):
         terminal.run(f"{pynstaller_executable} -v")
@@ -128,6 +140,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-0.1.182 → q2rad-0.1.183}/q2rad/q2packages.py

@@ -40,9 +40,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-0.1.183/q2rad/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.183"

q2rad-0.1.182/q2rad/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.182"