q2rad 0.1.178__tar.gz → 0.1.179__tar.gz

{q2rad-0.1.178 → q2rad-0.1.179}/PKG-INFO

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

{q2rad-0.1.178 → q2rad-0.1.179}/pyproject.toml

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

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2actions.py

@@ -15,8 +15,8 @@
 
 from q2db.cursor import Q2Cursor
 from q2gui.q2model import Q2CursorModel
-from q2rad.q2raddb import q2cursor, last_error, insert
-from q2rad.q2utils import choice_form, choice_column, Q2_save_and_run, Q2Form, int_
+from q2rad.q2raddb import last_error, insert
+from q2rad.q2utils import q2cursor, choice_form, choice_column, Q2_save_and_run, Q2Form, int_
 from q2gui import q2app
 # from q2rad import Q2Form
 

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2appselector.py

@@ -27,8 +27,8 @@ import json
 import os
 
 from q2rad import Q2App
-from q2rad.q2utils import Q2Form
-from q2rad.q2raddb import q2cursor, insert
+from q2rad.q2utils import q2cursor, Q2Form
+from q2rad.q2raddb import insert
 from q2rad.q2appmanager import AppManager
 from q2rad.q2raddb import open_url
 

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2lines.py

@@ -16,8 +16,8 @@
 from q2gui.q2model import Q2CursorModel
 from q2rad.q2raddb import Q2Cursor, insert
 from q2gui.q2dialogs import q2AskYN
-from q2rad.q2utils import choice_table, choice_column, choice_form, Q2_save_and_run
-from q2rad.q2raddb import q2cursor, last_error
+from q2rad.q2utils import q2cursor, choice_table, choice_column, choice_form, Q2_save_and_run
+from q2rad.q2raddb import last_error
 
 from q2rad.q2utils import Q2Form, int_
 

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2make.py

@@ -16,8 +16,7 @@ import os
 import sys
 import shutil
 from q2terminal.q2terminal import Q2Terminal
-from q2rad.q2utils import Q2Form, open_folder  # noqa F401
-from q2rad.q2raddb import q2cursor
+from q2rad.q2utils import q2cursor, Q2Form, open_folder  # noqa F401
 from q2gui.q2dialogs import q2mess, q2wait, q2ask
 from q2rad.q2appselector import Q2AppSelect
 from q2db.db import Q2Db
@@ -63,7 +62,7 @@ def make_binary(self):
         datatype="char",
         data=os.path.basename(q2app.q2_app.app_url) if q2app.q2_app.app_url else "q2-app",
     )
-    form.add_control("onefile", "One file", datatype="char", control="check")
+    # form.add_control("onefile", "One file", datatype="char", control="check")
     form.ok_button = 1
     form.cancel_button = 1
     form.show_form("Build binary")
@@ -75,7 +74,8 @@ def make_binary(self):
 
     make_folder = os.path.abspath(form.s.make_folder)
     binary_name = form.s.binary_name
-    onefile = "--onefile" if form.s.onefile else ""
+    # onefile = "--onefile" if form.s.onefile else ""
+    onefile = ""
     if not os.path.isdir(make_folder):
         os.mkdir(make_folder)
     if not os.path.isdir(make_folder):
@@ -123,11 +123,11 @@ def make_binary(self):
         shutil.copytree("assets", os.path.abspath(f"{dist_folder}/assets"))
     create_q2apps_sqlite(f"{dist_folder}")
 
-    if onefile:
-        dist_folder = os.path.abspath(f"{make_folder}/dist")
-        for x in os.listdir(dist_folder):
-            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 onefile:
+    #     dist_folder = os.path.abspath(f"{make_folder}/dist")
+    #     for x in os.listdir(dist_folder):
+    #         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))
 
     w.close()
 

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2queries.py

@@ -18,8 +18,7 @@ from q2db.cursor import Q2Cursor
 from q2gui.q2model import Q2CursorModel, Q2Model
 from q2gui.q2widget import Q2Widget
 from q2gui.q2app import Q2Actions
-from q2rad.q2raddb import q2cursor
-from q2rad.q2utils import Q2_save_and_run
+from q2rad.q2utils import q2cursor, Q2_save_and_run
 from q2gui.q2utils import set_dict_default
 import json
 import gettext

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2rad.py

@@ -46,7 +46,7 @@ from q2rad.q2actions import Q2Actions
 from q2rad.q2raddb import *  # noqa:F403
 
 from q2gui import q2app
-from q2rad.q2raddb import q2cursor
+from q2rad.q2utils import q2cursor
 from q2rad.q2appmanager import AppManager
 from q2rad.q2stylesettings import AppStyleSettings
 from q2terminal.q2terminal import Q2Terminal

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2raddb.py

@@ -70,34 +70,34 @@ def read_url(url, waitbar=False, chunk_size=10000000):
         return b""
 
 
-class q2cursor(Q2Cursor):
-    def __init__(self, sql="", q2_db=None):
-        if q2_db is None:
-            q2_db = q2app.q2_app.db_data
-        super().__init__(q2_db, sql)
-        if q2_db.last_sql_error:
-            print(q2_db.last_sql_error)
-
-    def q2form(self):
-        form = Q2Form(self.sql)
-        for x in self.record(0):
-            form.add_control(x, x, datalen=250)
-        form.set_model(Q2CursorModel(self))
-        return form
-
-    def browse(self):
-        if self.row_count() <= 0:
-            q2Mess(
-                f"""Query<br>
-                        <b>{html.escape(self.sql)}</b><br>
-                        returned no records,<br>
-                        <font color=red>
-                        {self.last_sql_error()}
-                    """
-            )
-        else:
-            self.q2form().run()
-        return self
+# class q2cursor(Q2Cursor):
+#     def __init__(self, sql="", q2_db=None):
+#         if q2_db is None:
+#             q2_db = q2app.q2_app.db_data
+#         super().__init__(q2_db, sql)
+#         if q2_db.last_sql_error:
+#             print(q2_db.last_sql_error)
+
+#     def q2form(self):
+#         form = Q2Form(self.sql)
+#         for x in self.record(0):
+#             form.add_control(x, x, datalen=250)
+#         form.set_model(Q2CursorModel(self))
+#         return form
+
+#     def browse(self):
+#         if self.row_count() <= 0:
+#             q2Mess(
+#                 f"""Query<br>
+#                         <b>{html.escape(self.sql)}</b><br>
+#                         returned no records,<br>
+#                         <font color=red>
+#                         {self.last_sql_error()}
+#                     """
+#             )
+#         else:
+#             self.q2form().run()
+#         return self
 
 
 def get_default_db(q2_db):

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2reports.py

@@ -23,8 +23,7 @@ from q2gui.q2utils import dotdict, set_dict_default, num, int_
 from q2report.q2report import Q2Report, Q2Report_rows
 from q2rad.q2queries import re_find_param
 from q2rad.q2queries import Q2QueryEdit
-from q2rad.q2raddb import q2cursor
-from q2rad.q2utils import Q2_save_and_run
+from q2rad.q2utils import q2cursor, Q2_save_and_run
 from q2gui import q2app
 from q2gui.q2dialogs import Q2WaitShow, q2WaitMax, q2WaitStep, q2working
 import json

{q2rad-0.1.178 → q2rad-0.1.179}/q2rad/q2utils.py

@@ -18,12 +18,15 @@ import random
 import string
 import threading
 import subprocess
+import html
 
 from q2rad import Q2Form as _Q2Form
-from q2rad.q2raddb import q2cursor, num
+from q2db.cursor import Q2Cursor
+from q2rad.q2raddb import num
 from q2gui.q2model import Q2Model
+from q2gui.q2model import Q2CursorModel
 from q2gui import q2app
-from q2gui.q2dialogs import q2working
+from q2gui.q2dialogs import q2working, q2Mess
 from q2gui.q2app import Q2Actions
 from q2gui.q2app import Q2Controls
 from q2gui.q2utils import int_
@@ -190,6 +193,36 @@ class Q2Form(_Q2Form):
         report.run()
 
 
+class q2cursor(Q2Cursor):
+    def __init__(self, sql="", q2_db=None):
+        if q2_db is None:
+            q2_db = q2app.q2_app.db_data
+        super().__init__(q2_db, sql)
+        if q2_db.last_sql_error:
+            print(q2_db.last_sql_error)
+
+    def q2form(self):
+        form = Q2Form(self.sql)
+        for x in self.record(0):
+            form.add_control(x, x, datalen=250)
+        form.set_model(Q2CursorModel(self))
+        return form
+
+    def browse(self):
+        if self.row_count() <= 0:
+            q2Mess(
+                f"""Query<br>
+                        <b>{html.escape(self.sql)}</b><br>
+                        returned no records,<br>
+                        <font color=red>
+                        {self.last_sql_error()}
+                    """
+            )
+        else:
+            self.q2form().run()
+        return self
+
+
 def q2choice(records=[], title="Make your choice", column_title=["Column"]):
     if len(records) == 0:
         return None

q2rad-0.1.179/q2rad/version.py

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

q2rad-0.1.178/q2rad/version.py

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