q2rad 0.1.220__py3-none-any.whl → 0.1.222__py3-none-any.whl

q2rad/q2appmanager.py

@@ -448,7 +448,8 @@ class AppManager(Q2Form):
         return rez
 
     def import_q2market(self):
-        self.q2_app.check_app_update(force_update=True)
+        if self.q2_app.check_app_update(force_update=True):
+            self.q2_app.open_selected_app()
 
     def import_app(self, file=""):
         filetype = "JSON(*.json)"

q2rad/q2appselector.py

@@ -467,7 +467,7 @@ class Q2AppSelect(Q2Form):
             self.close()
             AppManager.import_json_app(json.load(response_app))
             self.q2_app.open_selected_app()
-            self.q2_app.migrate_db_data()
+            # self.q2_app.migrate_db_data()
             AppManager.import_json_data(json.load(response_data))
         else:
             q2Mess(_("Can't to load Demo App"))

q2rad/q2extensions.py

@@ -25,6 +25,8 @@ from q2rad.q2appmanager import AppManager
 from q2terminal.q2terminal import Q2Terminal
 import gettext
 import json
+from q2rad.q2raddb import read_url
+from q2gui.q2model import Q2Model
 
 
 _ = gettext.gettext
@@ -56,6 +58,14 @@ class Q2Extensions(Q2Form):
         self.add_action("Import|from JSON file", self.import_json, eof_disabled=True)
         self.add_action("Import|from q2Market", self.import_q2market, eof_disabled=True)
 
+    def before_form_show(self):
+        if self.crud_mode == "NEW":
+            if q2AskYN("Would you like to download one from q2market?") == 2:
+                q2market = Q2MarketExt().run()
+                if q2market.heap._return:
+                    self.s.prefix = q2market.heap._return
+                    self.s.checkupdates = "*"
+
     def info(self):
         pass
 
@@ -150,6 +160,38 @@ class Q2Extensions(Q2Form):
     def import_q2market(self):
         q2market_url = self.r.q2market_url if self.r.q2market_url else self.q2_app.q2market_url
         if q2market_url:
-            q2app.q2_app.check_ext_update(self.r.prefix, force_update=True)
+            if q2app.q2_app.check_ext_update(self.r.prefix, force_update=True):
+                q2app.q2_app.open_selected_app()
         else:
             q2Mess("No App URL!")
+
+
+class Q2MarketExt(Q2Form):
+    def __init__(self, title=""):
+        super().__init__("q2Market")
+        self.no_view_action = True
+        self.heap._return = None
+
+    def on_init(self):
+        self.add_control("ext_title", _("Name"), datatype="char", datalen=100)
+        self.add_control("ext_version", _("Version"), datatype="char", datalen=100)
+        self.add_control("ext_description", _("Description"), control="text", datatype="char", datalen=100)
+        self.add_control("ext_url", _("Path"), datatype="char", datalen=100)
+
+        q2market_catalogue_url = f"{self.q2_app.q2market_url}/q2market.json"
+        data = json.loads(read_url(q2market_catalogue_url).decode("utf-8"))
+        rez = []
+        for x in data:
+            if "ext_title" in data[x]:
+                rec = data[x]
+                rec["ext_url"] = x
+                rez.append(rec)
+        model = Q2Model()
+        model.set_records(rez)
+        self.set_model(model)
+        self.add_action_view()
+        self.add_action("Select", self.select_row, tag="select", eof_disabled=1)
+
+    def select_row(self):
+        self.heap._return = self.r.ext_title
+        self.close()

q2rad/q2forms.py

@@ -288,7 +288,7 @@ class Q2Forms(Q2Form, Q2_save_and_run):
         super().after_crud_save()
         if self.crud_mode != "EDIT":
             if self.s.form_table:
-                ai = "*" if q2ask("Set AUTOINCREMENT for primary key?") else ""
+                ai = "*" if q2ask("Set AUTOINCREMENT for primary key?") == 2 else ""
                 self.db.insert(
                     "lines",
                     {

q2rad/q2lines.py

@@ -125,7 +125,8 @@ class Q2Lines(Q2Form, Q2_save_and_run):
             if self.add_control("/h"):
                 self.add_control("stretch", _("Stretch factor"), datatype="int")
                 self.add_control("alignment", _("Alignment"), datatype="int", datalen=3)
-                self.add_control("tag", _("Tag"), datatype="char", datalen=100)
+                self.add_control("tag", _("Tag"), datatype="char", datalen=100, stretch=99)
+                self.add_control("/s")
                 self.add_control("/")
             if self.add_control("/h", _("Control type")):
                 self.add_control(
@@ -299,7 +300,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
             record = self.get_current_record()
             record["table"] = self.db.get("forms", f"name = '{self.prev_form.r.name}'", "form_table")
             if not q2app.q2_app.db_data.alter_column(record):
-                q2mess(self.db_data.migrate_error_list)
+                q2mess(self.q2_app.db_data.migrate_error_list)
 
     def copy_to(self):
         rows = self.get_grid_selected_rows()

q2rad/q2modules.py

@@ -104,7 +104,7 @@ class Q2Modules(Q2Form, Q2_save_and_run):
                 != 2
             ):
                 return False
-        self.s.last_line = self.w.script.current_line()+1
+        self.s.last_line = self.w.script.current_line() + 1
         # return super().before_crud_save()
 
     def before_form_show(self):
@@ -118,8 +118,12 @@ class Q2Modules(Q2Form, Q2_save_and_run):
             self.w.script.set_focus()
 
     def script_runner(self):
-        self.q2_app.code_runner(self.r.script)()
+        # self.q2_app.code_runner(self.r.script)()
+        from q2rad.q2rad import run_module
+        run_module(script=self.r.script)
 
     def editor_just_run(self):
-        self.q2_app.code_runner(self.s.script)()
+        # self.q2_app.code_runner(self.s.script)()
+        from q2rad.q2rad import run_module
+        run_module(script=self.s.script)
         self.w.script.set_focus()

q2rad/q2rad.py

@@ -139,6 +139,7 @@ def run_module(module_name=None, _globals={}, _locals={}, script="", import_only
             else:
                 __name__ = "__main__"
 
+            _globals.update(globals())
             _globals.update(
                 {
                     "RETURN": None,
@@ -149,7 +150,6 @@ def run_module(module_name=None, _globals={}, _locals={}, script="", import_only
                     "__name__": __name__,
                 }
             )
-            _globals.update(globals())
             try:
                 if _locals:
                     exec(code["code"], _globals, _locals)
@@ -322,22 +322,26 @@ class Q2RadApp(Q2App):
         self.set_title("Open Application")
         Q2AppSelect().run(autoload_enabled)
         if self.selected_application != {}:
-            self.open_selected_app(True)
-            self.check_app_update()
-            self.check_ext_update()
+            self.open_selected_app(True, migrate_db_data=False)
+            if self.check_app_update() or self.check_ext_update():
+                self.open_selected_app()
             self.on_new_tab()
         else:
             self.close()
         self.subwindow_count_changed()
 
-    def open_selected_app(self, go_to_q2market=False):
+    def open_selected_app(self, go_to_q2market=False, migrate_db_data=True):
         wait = Q2WaitShow(5, "Loading app> ")
         wait.step("Prepare")
         self.clear_app_info()
         wait.step("Migrate logic DB")
         self.migrate_db_logic(self.db_logic)
-        wait.step("Migrate data DB")
-        self.migrate_db_data()
+        if migrate_db_data:
+            wait.step("Migrate data DB")
+            self.migrate_db_data()
+        else:
+            wait.step("Create menus")
+            self.create_menu()
         wait.step("looking for updates")
         self.process_events()
         wait.step("Done!")
@@ -554,9 +558,11 @@ class Q2RadApp(Q2App):
         if self.dev_mode:
             self.add_menu("Dev|Forms", self.run_forms)
             self.add_menu("Dev|Modules", self.run_modules)
-            self.add_menu("Dev|Querys", self.run_queries)
+            self.add_menu("Dev|Queres", self.run_queries)
             self.add_menu("Dev|Reports", self.run_reports)
             self.add_menu("Dev|Packages", self.run_packages)
+            self.add_menu("Dev|-")
+            self.add_menu("Dev|Finder", self.run_finder)
             if not self.frozen:
                 self.add_menu("Dev|-")
                 self.add_menu("Dev|Make binary", self.make_binary)
@@ -908,7 +914,7 @@ class Q2RadApp(Q2App):
             except Exception as e:  # noqa F841
                 self.show_statusbar_mess("An error occurred while checking for updates")
                 return
-            if force_update or market_version and market_version != self.app_version:
+            if force_update or (market_version and market_version > self.app_version):
                 if force_update:
                     update_detected = f"You are about to rewrite current App <b>{self.app_title}</b>!"
                 else:
@@ -924,20 +930,22 @@ class Q2RadApp(Q2App):
                 ):
                     data = json.load(open_url(self.app_url + ".json"))  # noqa F405
                     AppManager.import_json_app(data)
-                    self.open_selected_app()
+                    # self.open_selected_app()
+                    return True
 
-    def check_ext_update(self, prefix="", force_update=False, ext_url=""):
+    def check_ext_update(self, prefix="", force_update=False, _ext_url=""):
         if self.frozen:
             return
         if prefix:
             cu = q2cursor(f"select * from extensions where prefix='{prefix}'")
         else:
             cu = q2cursor(f"select * from extensions where checkupdates<>'' order by seq")
+        updated = None
         for row in cu.records():
             _prefix = row["prefix"]
 
-            if ext_url:
-                ext_url = f"{ext_url}/{_prefix}"
+            if _ext_url:
+                ext_url = f"{_ext_url}/{_prefix}"
             elif self.app_url:
                 ext_url = f"{os.path.dirname(self.app_url)}/{_prefix}"
             else:
@@ -949,8 +957,8 @@ class Q2RadApp(Q2App):
                     market_version = read_url(ext_url + ".version").decode("utf-8")  # noqa F405
                 except Exception as e:  # noqa F841
                     self.show_statusbar_mess("An error occurred while checking for updates")
-                    return
-                if force_update or market_version and market_version != ext_version:
+                    continue
+                if force_update or (market_version and market_version > ext_version):
                     if force_update:
                         update_detected = (
                             f"You are about to rewrite current Extension ({_prefix}) <b>{self.app_title}</b>!"
@@ -970,8 +978,10 @@ class Q2RadApp(Q2App):
                     ):
                         data = json.load(open_url(ext_url + ".json"))  # noqa F405
                         AppManager.import_json_app(data, prefix=_prefix)
-                        update("extensions", {"prefix":row["prefix"], "version":market_version})
-        self.open_selected_app()
+                        update("extensions", {"prefix": row["prefix"], "version": market_version})
+                        updated = True
+        # self.open_selected_app()
+        return updated
 
     def update_app_packages(self):
         if self.frozen:
@@ -1111,6 +1121,71 @@ class Q2RadApp(Q2App):
     def run_extensions(self):
         Q2Extensions().run()
 
+    def run_finder(self):
+        class Q2Finder:
+            def __init__(self, find_string):
+                self.find_string = find_string
+
+            def get_columns_sql(self, table):
+                return "select {{}} from {} where concat({}) like".format(
+                    table,
+                    ", ".join([f"`{x}`" for x in q2app.q2_app.db_logic.get_database_columns(table).keys()]),
+                )
+
+            def show_lines(self, table="lines"):
+                sql = self.get_columns_sql(table).format("id") + " '%{}%'".format(self.find_string)
+                where = "id in ({})".format(
+                    ", ".join([x["id"] for x in q2cursor(sql, q2app.q2_app.db_logic).records()])
+                )
+                {"actions": Q2Actions, "lines": Q2Lines}[table]().run(where=where)
+
+            def show_other(self, table):
+                sql = self.get_columns_sql(table).format("name") + " '%{}%'".format(self.find_string)
+                where = "name in ({})".format(
+                    ", ".join(['"' + x["name"] + '"' for x in q2cursor(sql, q2app.q2_app.db_logic).records()])
+                )
+                {"forms": Q2Forms, "reports": Q2Reports, "modules": Q2Modules, "queries": Q2Queries}[
+                    table
+                ]().run(where=where)
+
+        finder = Q2Form("Finder")
+
+        finder.add_control("find_string", "Find string", datalen=150)
+        finder.add_control("/")
+        finder.add_control("/h", "in")
+        finder.add_control(
+            "button",
+            "Forms",
+            control="button",
+            valid=lambda: Q2Finder(finder.s.find_string).show_other("forms"),
+        )
+        finder.add_control(
+            "button",
+            "Lines",
+            control="button",
+            valid=lambda: Q2Finder(finder.s.find_string).show_lines("lines"),
+        )
+        finder.add_control(
+            "button",
+            "Actions",
+            control="button",
+            valid=lambda: Q2Finder(finder.s.find_string).show_lines("actions"),
+        )
+        finder.add_control(
+            "button",
+            "Modules",
+            control="button",
+            valid=lambda: Q2Finder(finder.s.find_string).show_other("modules"),
+        )
+        finder.add_control(
+            "button",
+            "Queries",
+            control="button",
+            valid=lambda: Q2Finder(finder.s.find_string).show_other("queries"),
+        )
+        finder.cancel_button = 1
+        finder.run()
+
     def make_binary(self):
         make_binary(self)
 
@@ -1195,12 +1270,12 @@ class Q2RadApp(Q2App):
         form.after_delete = self.code_runner(form_dic["after_delete"], form)
 
         # add controls
-        for x in cu.records():
-            x["valid"] = self.code_runner(x["valid"], form)
-            if x.get("_show"):
-                x["show"] = self.code_runner(x["_show"], form)
-            x["when"] = self.code_runner(x["_when"], form)
-            form.add_control(**x)
+        for control in cu.records():
+            control["valid"] = self.code_runner(control["valid"], form)
+            if control.get("_show"):
+                control["show"] = self.code_runner(control["_show"], form)
+            control["when"] = self.code_runner(control["_when"], form)
+            form.add_control(**control)
             run_module("_e_control", _locals=locals())
 
         # add datasource
@@ -1231,14 +1306,14 @@ class Q2RadApp(Q2App):
             ext_select = ""
         sql = f"select * from (select * from actions where name = '{name}' order by seq ) qq {ext_select}"
         cu = q2cursor(sql, self.db_logic)
-        for x in cu.records():
-            if x["action_mode"] == "1":
+        for action in cu.records():
+            if action["action_mode"] == "1":
                 form.add_action("/crud")
-            elif x["action_mode"] == "3":
+            elif action["action_mode"] == "3":
                 form.add_action("-")
             else:
-                if x["child_form"] and x["child_where"]:
-                    child_form_name = x["child_form"]
+                if action["child_form"] and action["child_where"]:
+                    child_form_name = action["child_form"]
 
                     def get_action_form(child_form_name):
                         def worker():
@@ -1247,29 +1322,33 @@ class Q2RadApp(Q2App):
                         return worker
 
                     form.add_action(
-                        x["action_text"],
-                        self.code_runner(x["action_worker"]) if x["action_worker"] else None,
+                        action["action_text"],
+                        self.code_runner(action["action_worker"]) if action["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"],
-                        child_copy_mode=x["child_copy_mode"],
+                        child_where=action["child_where"],
+                        hotkey=action["action_key"],
+                        mess=action["action_mess"],
+                        icon=action["action_icon"],
+                        tag=action["tag"],
+                        child_noshow=action["child_noshow"],
+                        child_copy_mode=action["child_copy_mode"],
                         eof_disabled=1,
                     )
                 else:
                     form.add_action(
-                        x["action_text"],
-                        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"],
-                        eof_disabled=x["eof_disabled"],
+                        action["action_text"],
+                        (
+                            self.code_runner(action["action_worker"], form=form)
+                            if action["action_worker"]
+                            else None
+                        ),
+                        hotkey=action["action_key"],
+                        icon=action["action_icon"],
+                        mess=action["action_mess"],
+                        tag=action["tag"],
+                        child_noshow=action["child_noshow"],
+                        child_copy_mode=action["child_copy_mode"],
+                        eof_disabled=action["eof_disabled"],
                     )
             run_module("_e_action", _locals=locals())
         return form

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.220"
+__version__ = "0.1.222"

{q2rad-0.1.220.dist-info → q2rad-0.1.222.dist-info}/METADATA

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

{q2rad-0.1.220.dist-info → q2rad-0.1.222.dist-info}/RECORD

@@ -1,25 +1,25 @@
 q2rad/__init__.py,sha256=Y0Up-UTXOmCYC9llNmTF10CpDDgF2kv10pyHT3-YwmQ,183
 q2rad/__main__.py,sha256=zP4JARM-FzFHM-vWLehx7c5N4v4m_F-TuMobCdFzr4Q,824
 q2rad/q2actions.py,sha256=eExRvOSyLhT_v1XCR-DmLEhQ9g_LRkrlyXnwDCjT0LM,8258
-q2rad/q2appmanager.py,sha256=4c1h5I_7f4S7Ef9nDnDQthRqPC-uyK8v8B8zmhdhtr0,20567
-q2rad/q2appselector.py,sha256=-QazsbpOxRlzuCZZ35QU-p9iiBrF16oDU-Os-5rPIRQ,18811
+q2rad/q2appmanager.py,sha256=8btKbT_NGBlNxscINVQnpdkLZ032OuvnFeYbXda4Xnw,20616
+q2rad/q2appselector.py,sha256=bjl4MDg9DoU1h6NZOQDElaIGURjVQwiHnsUwr3kp3nc,18813
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
-q2rad/q2extensions.py,sha256=V54Xypcucl1-RarLWtH3GGxnAW1m4p3wrTYXFLBdqgk,5929
-q2rad/q2forms.py,sha256=36NriEUquuF97fkHpBBQyw1PDIrBQQlwxb21YVrmtng,11117
-q2rad/q2lines.py,sha256=KQslxn06vypKSFahCDAa7oFPoo_BhvABTKy5iDEOFbc,19133
+q2rad/q2extensions.py,sha256=ZAY2gXKjun666PeYfnqGH0X17ZmTgaOMmjCvxAIltJI,7595
+q2rad/q2forms.py,sha256=e9FrhXjvi9ZmrhRBmnmsHoPxDQJqsanLnsPjY6rjaQI,11122
+q2rad/q2lines.py,sha256=hZMfbqsd_UTACrsR5_GxmDqWY7uKcF-P5kMUeoY0KG8,19192
 q2rad/q2make.py,sha256=wXoyBUwf2zaAl9JjWDCbjAteUElRq0O7ippyaMY9eug,6476
 q2rad/q2market.py,sha256=RNXTNv-fFUgbzBGhHPNXlzGjsAHAtz71BRbTErJarNo,2641
-q2rad/q2modules.py,sha256=FetB84IxsuDzNYKTFM3BdvfH5GrWrFKoi6cV5uW1fKo,4360
+q2rad/q2modules.py,sha256=SpDdXJPG6IcVz1u3xnLoynA2rmiODCNZTZJT8s5iTRI,4538
 q2rad/q2packages.py,sha256=y72L1RAw1OgtKGaL8lJ1KHIaers5I6kTZSiphwwrY0M,3808
 q2rad/q2queries.py,sha256=l9SJ_T5Y38p23xa505EPZocCEmFw_a2y4ck0_-AHVP0,13119
-q2rad/q2rad.py,sha256=qlHORwI_E0rGXT5Moz7ECid_zlRcnAXco4_CTtcWdvw,52142
+q2rad/q2rad.py,sha256=Mw3VZpK08JftJ9Ov5U8i2FdGhAYRlGGPeagmnQqTSlk,55424
 q2rad/q2raddb.py,sha256=tMX971d_awTwiWeYLkZGSfdrIs88oiNHBAs2cMFvSbU,4685
 q2rad/q2reports.py,sha256=1fewf1Zlz98raqTIWlRLIg-zTCYA2flGVqyIC120UEU,84802
 q2rad/q2stylesettings.py,sha256=rEJLyLzsffJEXnMbg9bPB3KHLjYfw-49QgrtcYOfGV0,4769
 q2rad/q2utils.py,sha256=Vb5K8Lbb7PzQGDiBEHFrPyDcytVnUSVXy9yIkvWM1Oc,19734
-q2rad/version.py,sha256=Yg55j5Kpc4j7L2JTOD4XO90GgG_NmOIipe_KjVZ996s,23
-q2rad-0.1.220.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.220.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.220.dist-info/METADATA,sha256=4D6X3yn1DATbq926bwEaZW_m_qrHlDKPgY4GPDHmoGA,3369
-q2rad-0.1.220.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.220.dist-info/RECORD,,
+q2rad/version.py,sha256=NVwRTBgIeHjH6vZ080qRRs0_PMbU-1iWEOmyuOznMyA,23
+q2rad-0.1.222.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.222.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.222.dist-info/METADATA,sha256=SGv212kqcX-QPThHnmml3mYlgYKX2sjQQ28RJqSMJkQ,3369
+q2rad-0.1.222.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.222.dist-info/RECORD,,