q2rad 0.1.202__tar.gz → 0.1.204__tar.gz

{q2rad-0.1.202 → q2rad-0.1.204}/PKG-INFO

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

{q2rad-0.1.202 → q2rad-0.1.204}/pyproject.toml

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

{q2rad-0.1.202 → q2rad-0.1.204}/q2rad/q2appmanager.py

@@ -20,7 +20,7 @@ from q2gui.q2dialogs import q2AskYN, q2Mess, Q2WaitShow, q2ask, q2working
 
 from q2rad import Q2Form
 from q2terminal.q2terminal import Q2Terminal
-from q2rad.q2raddb import today, insert, update, get
+from q2rad.q2raddb import insert, update, get
 from datetime import datetime
 
 import json
@@ -108,7 +108,7 @@ class AppManager(Q2Form):
                 self.add_control(
                     "drl",
                     "Database type",
-                    data=app_data["driver_logic"],
+                    data=app_data["driver_logic"].lower(),
                     disabled=1,
                     datalen=len(app_data["driver_logic"].strip()) + 5,
                 )
@@ -186,7 +186,7 @@ class AppManager(Q2Form):
                 self.add_control(
                     "drd",
                     "Database type",
-                    data=app_data["driver_data"],
+                    data=app_data["driver_data"].lower(),
                     disabled=1,
                     datalen=len(app_data["driver_data"].strip()) + 5,
                 )

{q2rad-0.1.202 → q2rad-0.1.204}/q2rad/q2appselector.py

@@ -15,8 +15,8 @@
 
 from q2gui import q2app
 from q2gui.q2form import NEW, COPY
-from q2gui.q2model import Q2CursorModel
-from q2gui.q2dialogs import q2Mess, q2Wait, q2mess, q2working
+from q2gui.q2dialogs import q2Mess
+from q2gui.q2utils import Q2Crypto
 
 from q2db.schema import Q2DbSchema
 from q2db.db import Q2Db
@@ -33,7 +33,7 @@ from q2rad.q2appmanager import AppManager
 from q2rad.q2raddb import open_url
 
 
-SQL_ENGINES = ["MySQl", "Sqlite", "Postgresql"]
+SQL_ENGINES = ["MySQL", "SQLite", "PostgreSQL"]
 
 _ = gettext.gettext
 
@@ -81,11 +81,6 @@ class Q2AppSelect(Q2Form):
         self.add_control("/")
         if self.add_control("/f", _("Data storage")):
 
-            def driverDataValid(self=self):
-                self.w.host_data.set_enabled(self.s.driver_data != "Sqlite")
-                self.w.port_data.set_enabled(self.s.driver_data != "Sqlite")
-                self.w.select_data_storage_file.set_enabled(self.s.driver_data == "Sqlite")
-
             self.add_control(
                 "driver_data",
                 label=_("Storage type"),
@@ -94,7 +89,7 @@ class Q2AppSelect(Q2Form):
                 datatype="char",
                 datalen=30,
                 pic=";".join(SQL_ENGINES),
-                valid=driverDataValid,
+                valid=self.driver_data_valid,
             )
             if self.add_control("/h"):
                 self.add_control(
@@ -109,7 +104,6 @@ class Q2AppSelect(Q2Form):
                     _("?"),
                     mess=_("Open Data Storage sqlite database file"),
                     control="button",
-                    datalen=3,
                     valid=self.openSqliteDataFile,
                 )
                 self.add_control("/")
@@ -130,11 +124,6 @@ class Q2AppSelect(Q2Form):
 
         if self.add_control("/f", _("Logic storage")):
 
-            def driverLogicValid(form=self):
-                form.w.host_logic.set_enabled(form.s.driver_logic != "Sqlite")
-                form.w.port_logic.set_enabled(form.s.driver_logic != "Sqlite")
-                form.w.select_app_storage_file.set_enabled(form.s.driver_logic == "Sqlite")
-
             self.add_control(
                 "driver_logic",
                 label=_("Storage type"),
@@ -143,7 +132,7 @@ class Q2AppSelect(Q2Form):
                 datatype="char",
                 datalen=30,
                 pic=";".join(SQL_ENGINES),
-                valid=driverLogicValid,
+                valid=self.driver_logic_valid,
             )
             if self.add_control("/h"):
                 self.add_control(
@@ -158,7 +147,6 @@ class Q2AppSelect(Q2Form):
                     _("?"),
                     mess=_("Open App Storage sqlite database file"),
                     control="button",
-                    datalen=3,
                     valid=self.openSqliteDataFile,
                 )
                 self.add_control("/")
@@ -174,6 +162,19 @@ class Q2AppSelect(Q2Form):
                     mess=_("Allow to change App"),
                 )
                 self.add_control("/")
+            self.add_control("/")
+
+        if self.add_control("/h", "Database Credentials"):
+            self.add_control("epwd", "Credentials settings", control="button", valid=self.show_password_form)
+            self.add_control(
+                "credhash",
+                "Credhash",
+                datatype="char",
+                datalen=256,
+                noform=1,
+                nogrid=1,
+            )
+            self.add_control("/")
 
         self.add_action(
             _("Select"),
@@ -202,6 +203,147 @@ class Q2AppSelect(Q2Form):
 
         self.actions.add_action("/crud")
 
+    @staticmethod
+    def decrypt_creds(pin, credhash):
+        creds = Q2Crypto(pin).decrypt(credhash)
+        if creds is not None:
+            username = creds.split(":")[0]
+            password = creds.split(":")[1]
+            return username, password
+        else:
+            return None
+
+    def show_password_form(self):
+        username = ""
+        password = ""
+        if self.crud_mode == "EDIT" and self.s.credhash:
+            pin = self.get_pin(self.r.name)
+            if pin is None:
+                return
+            if Q2Crypto(pin).check_pin(self.s.credhash) is None:
+                q2Mess("Wrong PIN")
+                return
+            creds = self.decrypt_creds(pin, self.s.credhash)
+            if creds is not None:
+                username, password = creds
+        else:
+            pin = ""
+
+        pform = Q2Form("Database credentials")
+        pform.add_control("/f", "Username")
+        pform.add_control(
+            "user1",
+            "Enter username",
+            datatype="char",
+            datalen=100,
+            pic="*",
+            data=username,
+        )
+        pform.add_control(
+            "user2",
+            "Repeat username",
+            datatype="char",
+            datalen=100,
+            pic="*",
+            data=username,
+        )
+        pform.add_control("/")
+
+        pform.add_control("/")
+        pform.add_control("/f", "Password")
+        pform.add_control(
+            "pass1",
+            "Enter password",
+            datatype="char",
+            datalen=100,
+            pic="*",
+            data=password,
+        )
+        pform.add_control(
+            "pass2",
+            "Repeat password",
+            datatype="char",
+            datalen=100,
+            pic="*",
+            data=password,
+        )
+        pform.add_control("/")
+        pform.add_control("/f", "Protect credentials with PIN")
+        pform.add_control("pin1", "Enter PIN", datatype="char", datalen=10, pic="*", data=pin)
+        pform.add_control("pin2", "Repeat PIN", datatype="char", datalen=10, pic="*", data=pin)
+        pform.add_control("/")
+
+        def after_form_show():
+            pass
+
+        pform.after_form_show = after_form_show
+
+        def valid():
+            if (pform.s.user1 or pform.s.user2) and pform.s.user1 != pform.s.user2:
+                q2Mess("Username mismatch")
+                return False
+            if (pform.s.pass1 or pform.s.pass2) and pform.s.pass1 != pform.s.pass2:
+                q2Mess("Password mismatch")
+                return False
+            if (pform.s.pin1 or pform.s.pin2) and pform.s.pin1 != pform.s.pin2:
+                q2Mess("PIN mismatch")
+                return False
+            return True
+
+        pform.valid = valid
+        pform.ok_button = 1
+        pform.cancel_button = 1
+        pform.run()
+
+        if pform.ok_pressed:
+            if pform.s.user1 == "" and pform.s.pass1 == "":
+                self.s.credhash = ""
+            else:
+                self.s.credhash = Q2Crypto(pform.s.pin1).encrypt(pform.s.user1 + ":" + pform.s.pass1)
+
+    def get_pin(self, app_name=""):
+        pinform = Q2Form("Enter PIN")
+        pinform.add_control("/")
+        pinform.add_control("/h")
+        pinform.add_control("/s")
+        pinform.add_control("", "Application:", control="label")
+        pinform.add_control("appname", app_name, control="label", style="color:green;font-weight:bold;background:white")
+        pinform.add_control("/s")
+        pinform.add_control("/")
+        pinform.add_control("/f")
+        pinform.add_control("pin", "PIN", pic="*")
+        pinform.ok_button = 1
+        pinform.cancel_button = 1
+
+        # def before_form_show():
+        #     pinform.w.appname.set_style_sheet("color:green;font-weight:bold")
+
+        # pinform.before_form_show = before_form_show
+        pinform.run()
+        if pinform.ok_pressed:
+            return pinform.s.pin
+        else:
+            return None
+
+    def driver_logic_valid(self):
+        is_sqlite = self.s.driver_logic.lower() == "sqlite"
+        self.w.host_logic.set_enabled(not is_sqlite)
+        self.w.port_logic.set_enabled(not is_sqlite)
+        self.w.select_app_storage_file.set_enabled(is_sqlite)
+        self.credentials_fields_enable()
+
+    def driver_data_valid(self):
+        is_sqlite = self.s.driver_data.lower() == "sqlite"
+        self.w.host_data.set_enabled(not is_sqlite)
+        self.w.port_data.set_enabled(not is_sqlite)
+        self.w.select_data_storage_file.set_enabled(is_sqlite)
+        self.credentials_fields_enable()
+
+    def credentials_fields_enable(self):
+        creds_required = self.s.driver_data.lower() != "sqlite" or self.s.driver_logic.lower() != "sqlite"
+        # self.w.credhash.set_enabled(creds_required)
+        self.w.epwd.set_enabled(creds_required)
+
     def set_autoload(self):
         clean_this = self.r.autoselect
         self.db.cursor("update applications set autoselect='' ")
@@ -223,9 +365,6 @@ class Q2AppSelect(Q2Form):
                 self.s.database_data = fname
 
     def before_grid_show(self):
-        self.q2_app.sleep(0.2)
-        if self.q2_app.keyboard_modifiers() != "":
-            return
         if self.db.table("applications").row_count() <= 0:
             if not os.path.isdir("databases"):
                 os.mkdir("databases")
@@ -234,15 +373,22 @@ class Q2AppSelect(Q2Form):
                 {
                     "ordnum": 1,
                     "name": "My first app",
-                    "driver_data": "Sqlite",
+                    "driver_data": "SQLite",
                     "database_data": "databases/my_first_app_data_storage.sqlite",
-                    "driver_logic": "Sqlite",
+                    "driver_logic": "SQLite",
                     "database_logic": "databases/my_first_app_logic_storage.sqlite",
                     "dev_mode": "",
                 },
                 self.db,
             )
             self.refresh()
+        elif (
+            q2cursor("select * from applications where autoselect<>''", self.db).row_count() == 1
+        ):  # seek autoload
+            for row in range(self.model.row_count()):
+                if self.model.get_record(row).get("autoselect"):
+                    self.set_grid_index(row)
+                    break
 
     def before_crud_save(self):
         if self.s.name == "":
@@ -258,13 +404,13 @@ class Q2AppSelect(Q2Form):
             self.w.database_logic.set_focus()
             return False
 
-        if self.s.driver_logic == "Sqlite":
+        if self.s.driver_logic.lower() == "sqlite":
             self.s.host_logic = ""
             self.s.port_logic = ""
             if not os.path.isdir(os.path.dirname(self.s.database_logic)):
                 os.makedirs(os.path.dirname(self.s.database_logic))
 
-        if self.s.driver_data == "Sqlite":
+        if self.s.driver_data.lower() == "sqlite":
             self.s.host_data = ""
             self.s.port_data = ""
             if not os.path.isdir(os.path.dirname(self.s.database_data)):
@@ -276,11 +422,19 @@ class Q2AppSelect(Q2Form):
 
     def before_form_show(self):
         if self.crud_mode == "NEW":
-            self.s.driver_logic = "Sqlite"
-            self.s.driver_data = "Sqlite"
+            self.s.driver_logic = "SQLite"
+            self.s.driver_data = "SQLite"
             self.s.dev_mode = ""
             self.s.database_logic = "databases/_logic"
             self.s.database_data = "databases/_data"
+        else:
+            self.s.driver_logic = SQL_ENGINES[
+                ["mysql", "sqlite", "postgresql"].index(self.r.driver_logic.lower())
+            ]
+            self.s.driver_data = SQL_ENGINES[
+                ["mysql", "sqlite", "postgresql"].index(self.r.driver_data.lower())
+            ]
+
         self.w.driver_data.valid()
         self.w.driver_logic.valid()
         if self.crud_mode in [NEW, COPY]:
@@ -289,9 +443,9 @@ class Q2AppSelect(Q2Form):
 
     def run_demo(self):
         row = {
-            "driver_data": "Sqlite",
+            "driver_data": "SQLite",
             "database_data": ":memory:",
-            "driver_logic": "Sqlite",
+            "driver_logic": "SQLite",
             "database_logic": ":memory:",
             "dev_mode": "",
         }
@@ -313,6 +467,19 @@ class Q2AppSelect(Q2Form):
             q2Mess(_("Can't to load Demo App"))
 
     def _select_application(self, app_data={}):
+        if app_data.get("credhash"):
+            pin = self.get_pin(app_data.get("name", ""))
+            if pin is None:
+                return False
+            creds = self.decrypt_creds(pin, app_data.get("credhash"))
+            if creds is None:
+                q2Mess("Wrong PIN")
+                return False
+            app_data["username"] = creds[0]
+            app_data["password"] = creds[1]
+        else:
+            app_data["username"] = "q2user"
+            app_data["password"] = "q2password"
         q2_app: Q2App = q2app.q2_app
         q2_app.dev_mode = app_data.get("dev_mode")
         q2_app.selected_application = app_data
@@ -322,11 +489,13 @@ class Q2AppSelect(Q2Form):
         q2_app.show_statusbar()
         q2_app.show_tabbar()
         self.q2_app.process_events()
+        return True
 
     def select_application(self):
-        self.close()
+        # self.close()
         self.q2_app.process_events()
-        self._select_application(self.model.get_record(self.current_row))
+        if self._select_application(self.model.get_record(self.current_row)):
+            self.close()
 
     def run(self, autoload_enabled=True):
         q2_app: Q2App = q2app.q2_app
@@ -338,9 +507,12 @@ class Q2AppSelect(Q2Form):
         q2_app.hide_tabbar()
 
         self.autoload_enabled = autoload_enabled
-        if autoload_enabled:
+        self.q2_app.process_events()
+        self.q2_app.sleep(0.1)
+        km = self.q2_app.keyboard_modifiers()
+        if autoload_enabled and km != "shift":
             cu = q2cursor("select * from applications where autoselect<>''", self.db)
             if cu.row_count() > 0:
-                self._select_application(cu.record(0))
-                return False
+                if self._select_application(cu.record(0)):
+                    return False
         super().run()

{q2rad-0.1.202 → q2rad-0.1.204}/q2rad/q2lines.py

@@ -188,6 +188,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing tables"),
                         control="button",
+                        datalen=2,
                         valid=self.select_linked_table,
                     )
                     self.add_control("to_table", gridlabel=_("To table"), datatype="char", datalen=100)
@@ -198,6 +199,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing tables"),
                         control="button",
+                        datalen=2,
                         valid=self.select_linked_table_pk,
                     )
                     self.add_control("to_column", gridlabel=_("To field"), datatype="char", datalen=100)
@@ -209,6 +211,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing columns"),
                         control="button",
+                        datalen=2,
                         valid=self.select_linked_table_column,
                     )
                     self.add_control("/")
@@ -222,6 +225,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing forms"),
                         control="button",
+                        datalen=2,
                         valid=self.select_linked_form,
                     )
                     self.add_control("to_form", gridlabel=_("Form to open"), datatype="char", datalen=100)
@@ -271,6 +275,13 @@ class Q2Lines(Q2Form, Q2_save_and_run):
             nogrid="*",
             datatype="longtext",
         )
+        self.add_control("/t", _("Stylesheet"))
+        self.add_control(
+            "style",
+            control="code",
+            nogrid="*",
+            datatype="longtext",
+        )
         self.add_control("/")
         self._add_save_and_run()
         self._add_save_and_run_visible()
@@ -321,11 +332,11 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
         if last < self.model.row_count():
             last_seq = int_(self.model.get_record(last)["seq"]) + 1
-            self.move_rows_down(last, False)
+            self.move_rows_down(last)
         else:
             last_seq = int_(self.model.get_record(self.model.row_count() - 1)["seq"]) + 2
 
-        self.move_rows_down(first, False)
+        self.move_rows_down(first)
         self.model.insert({"column": layout_type, "seq": first_seq})
         self.model.insert({"column": "/", "seq": last_seq})
         self.refresh()
@@ -335,7 +346,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
             current_row = self.current_row
         for x in range(current_row, self.model.row_count()):
             rec = self.model.get_record(x)
-            self.model.update({"id": rec["id"], "seq": 1 + int_(rec["seq"])})
+            self.model.update({"id": rec["id"], "seq": 1 + int_(rec["seq"])}, refresh=False)
         if refresh:
             self.refresh()
 
@@ -350,17 +361,22 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
         def seek_end():
             nonlocal last_row
+            same_panel = 0
             while last_row < self.model.row_count():
                 self.set_grid_index(last_row)
-                # if is_panel_start():
-                #     break
-                if is_panel_end():
-                    break
+                if is_panel_start():
+                    same_panel += 1
+                elif is_panel_end():
+                    if same_panel == 1:
+                        break
+                    else:
+                        same_panel -= 1
                 last_row += 1
 
         def seek_start():
-            in_panel = -1 if is_panel_end() else 0
             nonlocal first_row
+            self.set_grid_index(first_row)
+            in_panel = -1 if is_panel_end() else 0
             while first_row > 0:
                 self.set_grid_index(first_row)
                 if is_panel_start():
@@ -374,6 +390,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
         if not is_panel_start():
             seek_start()
+        last_row = first_row
         if not is_panel_end():
             seek_end()
         self.set_grid_selected_rows([x for x in range(first_row, last_row + 1)])

{q2rad-0.1.202 → q2rad-0.1.204}/q2rad/q2rad.py

@@ -297,9 +297,9 @@ class Q2RadApp(Q2App):
             self.open_selected_app(True)
             self.check_app_update()
             self.on_new_tab()
-            # self.update_app_packages()
         else:
             self.close()
+        self.subwindow_count_changed()
 
     def open_selected_app(self, go_to_q2market=False):
         wait = Q2WaitShow(5, "Loading app> ")
@@ -475,8 +475,8 @@ class Q2RadApp(Q2App):
             host=self.selected_application.get("host_data", ""),
             port=self.selected_application.get("port_data", ""),
             guest_mode=self.selected_application.get("guest_mode", ""),
-            user="q2user",
-            password="q2password",
+            user=self.selected_application.get("username", ""),
+            password=self.selected_application.get("password", ""),
         )
         self.db = self.db_data
         if self.db_data:
@@ -485,8 +485,8 @@ class Q2RadApp(Q2App):
                 db_engine_name=self.selected_application.get("driver_logic", "").lower(),
                 host=self.selected_application.get("host_logic", ""),
                 port=self.selected_application.get("port_logic", ""),
-                user="q2user",
-                password="q2password",
+                user=self.selected_application.get("username", ""),
+                password=self.selected_application.get("password", ""),
             )
         self.last_root_password = ""
         if self.db_data is None or self.db_logic is None:
@@ -1040,6 +1040,7 @@ class Q2RadApp(Q2App):
                 , code_valid as valid
                 , code_when as _when
                 , code_show as _show
+                , style
             from `lines`
             where name = '{name}'
             order by seq

{q2rad-0.1.202 → q2rad-0.1.204}/q2rad/q2utils.py

@@ -81,6 +81,7 @@ class Q2Form(_Q2Form):
         tag="",
         eat_enter=None,
         hotkey="",
+        style="",
         **args,
     ):
         if isinstance(to_form, str) and to_form != "":
@@ -123,6 +124,7 @@ class Q2Form(_Q2Form):
             tag,
             eat_enter,
             hotkey,
+            style,
             **args,
         )
 
@@ -490,13 +492,14 @@ class Q2_save_and_run:
 
 
 class auto_filter:
-    def __init__(self, form_name, mem):
+    def __init__(self, form_name, mem, lines_per_tab=10):
         self.form_name = form_name
         self.mem = mem
         self.filter_columns = []
         self.mem.ok_button = True
         self.mem.cancel_button = True
         self.mem.add_ok_cancel_buttons()
+        self.lines_per_tab = lines_per_tab
 
         self.auto_filter()
 
@@ -513,8 +516,13 @@ class auto_filter:
             """,
             self.mem.q2_app.db_logic,
         )
-        self.mem.add_control("/f")
+        make_tabs = cu.row_count() > self.lines_per_tab
+        if not make_tabs:
+            self.mem.add_control("/f")
         for col in cu.records():
+            if make_tabs and cu.current_row() % self.lines_per_tab == 0:
+                self.mem.add_control("/t", f"Tab #{1+ cu.current_row() // self.lines_per_tab}")
+                self.mem.add_control("/f")
             if col["control"] == "text":
                 col["control"] = "line"
             col = Q2Controls.validate(col)
@@ -536,6 +544,7 @@ class auto_filter:
                 col["check"] = 1
 
                 self.mem.add_control(**col)
+        self.mem.add_control("/")
         self.mem.valid = self.valid
 
     def valid(self):

q2rad-0.1.204/q2rad/version.py

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

q2rad-0.1.202/q2rad/version.py

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