q2rad 0.1.210__tar.gz → 0.1.212__tar.gz

{q2rad-0.1.210 → q2rad-0.1.212}/PKG-INFO

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

{q2rad-0.1.210 → q2rad-0.1.212}/pyproject.toml

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

{q2rad-0.1.210 → q2rad-0.1.212}/q2rad/q2modules.py

@@ -16,6 +16,7 @@
 from q2db.cursor import Q2Cursor
 from q2gui.q2model import Q2CursorModel
 from q2gui.q2dialogs import q2AskYN
+from q2gui import q2app
 from q2rad.q2utils import Q2Form
 from q2rad.q2utils import Q2_save_and_run
 from q2gui.q2utils import num
@@ -34,6 +35,7 @@ class Q2Modules(Q2Form, Q2_save_and_run):
 
     def on_init(self):
         self.editor_actions = Q2Actions()
+        self.db = q2app.q2_app.db_logic
         self.add_control(
             "name",
             _("Name"),

{q2rad-0.1.210 → q2rad-0.1.212}/q2rad/q2packages.py

@@ -18,6 +18,7 @@ from q2gui.q2model import Q2CursorModel
 from q2gui.q2dialogs import q2Mess, q2AskYN
 
 from q2rad.q2utils import Q2Form
+from q2gui import q2app
 import gettext
 
 
@@ -30,6 +31,7 @@ class Q2Packages(Q2Form):
         self.no_view_action = True
 
     def on_init(self):
+        self.db = q2app.q2_app.db_logic
         self.add_control("package_name", _("Name"), datatype="char", datalen=100, pk="*")
         self.add_control("package_pipname", _("Pip name"), datatype="char", datalen=100)
         self.add_control("package_version", _("Version"), datatype="char", datalen=10)

{q2rad-0.1.210 → q2rad-0.1.212}/q2rad/q2queries.py

@@ -23,6 +23,7 @@ import json
 import gettext
 import re
 from q2rad.q2utils import Q2Form
+from q2gui import q2app
 
 _ = gettext.gettext
 re_find_param = re.compile(r"(?::\b\w+\b|\{.+\})")
@@ -35,6 +36,7 @@ class Q2Queries(Q2Form, Q2_save_and_run):
 
     def on_init(self):
         self.create_form()
+        self.db = q2app.q2_app.db_logic
 
         cursor: Q2Cursor = self.q2_app.db_logic.table(table_name="queries")
         model = Q2CursorModel(cursor)

{q2rad-0.1.210 → q2rad-0.1.212}/q2rad/q2rad.py

@@ -766,16 +766,15 @@ class Q2RadApp(Q2App):
                         continue
             self.process_events()
             if force or latest_version != current_version and latest_version:
-                self.pip_install(package, latest_version)
                 try:
                     self.pip_install(package, latest_version)
                 except Exception as error:
                     try:
                         self.pip_install(package, latest_version)
-                    except Exception:
-                        pass
-
-                latest_version, new_current_version = self.get_package_versions(package)
+                    except Exception as error:
+                        latest_version = None
+                        logging.warning(f"pip update {package} error:{error}")
+                    # latest_version, new_current_version = self.get_package_versions(package)
                 if latest_version:
                     upgraded.append(
                         f"{package if isinstance(package, str) else package[0]} - "
@@ -792,6 +791,7 @@ class Q2RadApp(Q2App):
             mess = ("Upgrading complete!<p>" "The program will be restarted!" "<p><p>") + "<p>".join(upgraded)
         else:
             mess = "Updates not found!<p>"
+        q2mess(mess)
         if upgraded:
             self.restart()
 
@@ -1144,13 +1144,13 @@ class Q2RadApp(Q2App):
                             return self.get_form(child_form_name)
 
                         return worker
-
                     form.add_action(
                         x["action_text"],
                         self.code_runner(x["action_worker"]) if x["action_worker"] else None,
                         child_form=get_action_form(child_form_name),
                         child_where=x["child_where"],
                         hotkey=x["action_key"],
+                        mess=x["action_mess"],
                         icon=x["action_icon"],
                         tag=x["tag"],
                         child_noshow=x["child_noshow"],
@@ -1163,6 +1163,7 @@ class Q2RadApp(Q2App):
                         self.code_runner(x["action_worker"], form=form) if x["action_worker"] else None,
                         hotkey=x["action_key"],
                         icon=x["action_icon"],
+                        mess=x["action_mess"],
                         tag=x["tag"],
                         child_noshow=x["child_noshow"],
                         child_copy_mode=x["child_copy_mode"],

{q2rad-0.1.210 → q2rad-0.1.212}/q2rad/q2raddb.py

@@ -111,7 +111,7 @@ def insert(table, row, q2_db=None):
     return q2_db.insert(table, row)
 
 
-def insert_if_not_exist(table, row, key_column, q2_db=None):
+def insert_if_not_exists(table, row, key_column, q2_db=None):
     q2_db: Q2Db = get_default_db(q2_db)
     value = row.get(key_column, "0")
     if q2_db.get(table, f"{key_column} = '{value}'") == {}:
@@ -124,6 +124,9 @@ def insert_if_not_exist(table, row, key_column, q2_db=None):
         return True
 
 
+insert_if_not_exist = insert_if_not_exists
+
+
 def raw_insert(table, row, q2_db=None):
     q2_db = get_default_db(q2_db)
     return q2_db.raw_insert(table, row)

{q2rad-0.1.210 → q2rad-0.1.212}/q2rad/q2reports.py

@@ -218,6 +218,7 @@ class Q2Reports(Q2Form, Q2_save_and_run):
 
     def on_init(self):
         self.report_edit_form = None
+        self.db = q2app.q2_app.db_logic
 
         self.add_control("name", _("Name"), datatype="char", datalen=100, pk="*")
         self.add_control("/")

{q2rad-0.1.210 → q2rad-0.1.212}/q2rad/q2utils.py

@@ -233,6 +233,7 @@ class Q2Form(_Q2Form):
                 self.db,
             )
         form = Q2Form(f"Changelog ({self.title})")
+        form.db = self.db
         form.add_control("/")
         form.add_control("/h", "-")
         form.add_control("q2_mode", "Mode", datalen=3)
@@ -290,12 +291,14 @@ class q2cursor(Q2Cursor):
     def __init__(self, sql="", q2_db=None, data=[]):
         if q2_db is None:
             q2_db = q2app.q2_app.db_data
+        self._q2_db = q2_db
         super().__init__(q2_db, sql, data=data)
         if q2_db.last_sql_error:
             print(q2_db.last_sql_error)
 
     def q2form(self):
         form = Q2Form(self.sql)
+        form.db = self._q2_db
         for x in self.record(0):
             form.add_control(x, x, datalen=250)
         form.set_model(Q2CursorModel(self))

q2rad-0.1.212/q2rad/version.py

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

q2rad-0.1.210/q2rad/version.py

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