q2rad 0.1.212__tar.gz → 0.1.214__tar.gz

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

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

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

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

{q2rad-0.1.212 → q2rad-0.1.214}/q2rad/q2appmanager.py

@@ -96,7 +96,7 @@ class AppManager(Q2Form):
                         "App URL",
                         control="line",
                         data=q2app.q2_app.app_url,
-                        disabled=1,
+                        readonly=1,
                     )
                 if q2app.q2_app.app_version:
                     self.add_control(
@@ -104,20 +104,20 @@ class AppManager(Q2Form):
                         "App version",
                         control="line",
                         data=q2app.q2_app.app_version,
-                        disabled=1,
+                        readonly=1,
                     )
                 self.add_control(
                     "drl",
                     "Database type",
                     data=app_data["driver_logic"].lower(),
-                    disabled=1,
+                    readonly=1,
                     datalen=len(app_data["driver_logic"].strip()) + 5,
                 )
                 self.add_control(
                     "dtl",
                     "Database name ",
                     data=app_data["database_logic"],
-                    disabled=1,
+                    readonly=1,
                     datalen=len(app_data["database_logic"].strip()),
                 )
                 if app_data.get("host_logic"):
@@ -125,7 +125,7 @@ class AppManager(Q2Form):
                         "hl",
                         "Host",
                         data=app_data["host_logic"],
-                        disabled=1,
+                        readonly=1,
                         datalen=len(app_data["host_logic"].strip()),
                     )
                 if num(app_data.get("port_logic")):
@@ -133,12 +133,21 @@ class AppManager(Q2Form):
                         "pl",
                         "Port",
                         data=app_data["port_logic"],
-                        disabled=1,
+                        readonly=1,
                         datalen=len(app_data["port_logic"]) + 5,
                     )
                 self.add_control("/")
 
                 if self.add_control("/h", ""):
+                    self.add_control(
+                        "exts",
+                        "Extensions",
+                        control="button",
+                        # datalen=13,
+                        valid=q2app.q2_app.run_extensions,
+                    )
+
+                    self.add_control("/s")
                     if self.add_control("/h", "Export"):
                         self.add_control(
                             "save_app",
@@ -188,14 +197,14 @@ class AppManager(Q2Form):
                     "drd",
                     "Database type",
                     data=app_data["driver_data"].lower(),
-                    disabled=1,
+                    readonly=1,
                     datalen=len(app_data["driver_data"].strip()) + 5,
                 )
                 self.add_control(
                     "dtd",
                     "Database name ",
                     data=app_data["database_data"],
-                    disabled=1,
+                    readonly=1,
                     datalen=len(app_data["database_data"].strip()),
                 )
                 if app_data.get("host_data"):
@@ -203,7 +212,7 @@ class AppManager(Q2Form):
                         "hd",
                         "Host",
                         data=app_data["host_data"],
-                        disabled=1,
+                        readonly=1,
                         datalen=len(app_data["host_data"].strip()),
                     )
                 if num(app_data.get("port_data")):
@@ -211,7 +220,7 @@ class AppManager(Q2Form):
                         "pd",
                         "Port",
                         data=app_data["port_data"],
-                        disabled=1,
+                        readonly=1,
                         datalen=len(app_data["port_data"]) + 5,
                     )
                 self.add_control("/")
@@ -321,16 +330,23 @@ class AppManager(Q2Form):
                 json.dump(app_json, open(file, "w"), indent=1)
 
     def get_app_json(self):
+        return AppManager._get_app_json()
+
+    @staticmethod
+    def _get_app_json(prefix=""):
         db: Q2Db = q2app.q2_app.db_logic
         rez = {}
-        for x in db.get_tables():
-            if x not in app_tables:
+        for table in db.get_tables():
+            if table not in app_tables:
                 continue
-            if x.startswith("log_") or x == "sqlite_sequence":
+            if table.startswith("log_") or table == "sqlite_sequence":
                 continue
-            rez[x] = []
-            for row in db.table(x).records():
-                rez[x].append(row)
+            rez[table] = []
+            for row in db.table(table).records():
+                if prefix:
+                    if table != "packages" and not row.get("name").startswith(prefix):
+                        continue
+                rez[table].append(row)
         return rez
 
     def tables_selector(self, mode="export"):
@@ -440,19 +456,23 @@ class AppManager(Q2Form):
         self.q2_app.open_selected_app()
 
     @staticmethod
-    def import_json_app(data, db=None):
+    def import_json_app(data, db=None, prefix=""):
         if db is None:
             db: Q2Db = q2app.q2_app.db_logic
         db_tables = db.get_tables()
         wait_table = Q2WaitShow(len(data))
         errors = []
+        db.transaction()
         for table in data:
             wait_table.step(table)
             if table not in db_tables:
                 continue
             wait_row = Q2WaitShow(len(data[table]))
             if table != "packages":
-                db.cursor(f'delete from `{table}` where name not like "\\_%"')
+                if prefix:
+                    db.cursor(f'delete from `{table}` where substr(name,1,{len(prefix)}) = "{prefix}"')
+                else:
+                    db.cursor(f'delete from `{table}` where substr(name,1,1) <> "_"')
             if db.last_sql_error:
                 errors.append(db.last_sql_error)
             for row in data[table]:
@@ -463,12 +483,18 @@ class AppManager(Q2Form):
                         == row["package_name"]
                     ):
                         continue
-                if row.get("name", "").startswith("_"):
-                    continue
+                else:
+                    if prefix:
+                        if not row.get("name").startswith(prefix):
+                            continue
+                    else:
+                        if row.get("name", "").startswith("_"):
+                            continue
                 if not db.insert(table, row):
                     errors.append(db.last_sql_error)
                     errors.append(db.last_record)
             wait_row.close()
+        db.commit()
         wait_table.close()
         if errors:
             q2Mess("<br>".join(errors))
@@ -491,6 +517,7 @@ class AppManager(Q2Form):
         db: Q2Db = q2app.q2_app.db_data
         db_tables = db.get_tables()
         wait_table = Q2WaitShow(len(data))
+        db.transaction()
         errors = []
         for table in data:
             wait_table.step(table)
@@ -506,6 +533,7 @@ class AppManager(Q2Form):
                     errors.append(db.last_sql_error)
                     # print(db.last_sql_error)
             wait_row.close()
+        db.commit()
         wait_table.close()
         if errors:
             q2Mess("<br>".join(errors))

q2rad-0.1.214/q2rad/q2extensions.py

@@ -0,0 +1,142 @@
+#    Copyright © 2021 Andrei Puchko
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+import os
+from datetime import datetime
+from q2db.cursor import Q2Cursor
+from q2gui.q2model import Q2CursorModel
+from q2gui.q2dialogs import q2Mess, q2AskYN, q2working
+
+from q2rad.q2utils import Q2Form
+from q2gui import q2app
+from q2rad.q2appmanager import AppManager
+from q2terminal.q2terminal import Q2Terminal
+import gettext
+import json
+
+
+_ = gettext.gettext
+
+
+class Q2Extensions(Q2Form):
+    def __init__(self, title=""):
+        super().__init__("Extensions")
+        self.no_view_action = True
+
+    def on_init(self):
+        self.db = q2app.q2_app.db_data
+        self.add_control("prefix", _("Name"), datatype="char", datalen=50, pk="*")
+        self.add_control("seq", _("Sequence number"), datatype="int")
+        self.add_control("version", _("Version"), datatype="char", datalen=16, readonly=True)
+        self.add_control("checkupdates", _("Check for updatea"), control="check", datatype="char", datalen=1)
+        self.add_control("comment", _("Comment"), datatype="text")
+
+        cursor: Q2Cursor = self.q2_app.db_data.table(table_name="extensions")
+        model = Q2CursorModel(cursor)
+        model.set_order("seq").refresh()
+        self.set_model(model)
+        self.add_action("/crud")
+        self.add_action("Export|as JSON file", self.export_json, eof_disabled=True)
+        self.add_action("Export|to q2Market", self.export_q2market, eof_disabled=True)
+        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 info(self):
+        pass
+
+    def export_json(self, file=""):
+        prefix = self.r.prefix
+        filetype = "JSON(*.json)"
+        if not file:
+            desktop = os.path.expanduser("~/Desktop")
+            file = f"{desktop}/{prefix}.json"
+            file, filetype = q2app.q2_app.get_save_file_dialoq(
+                f"Export Extension ({prefix})", filter=filetype, path=file
+            )
+        if not file:
+            return
+        file = self.validate_impexp_file_name(file, filetype)
+        if file:
+
+            def get_ext_json(prefix=prefix):
+                return AppManager._get_app_json(prefix)
+
+            ext_json = q2working(get_ext_json, "Prepare data...")
+            if ext_json:
+                json.dump(ext_json, open(file, "w"), indent=1)
+
+    def import_json(self, file=""):
+        prefix = self.r.prefix
+        filetype = "JSON(*.json)"
+        if not file:
+            file, filetype = q2app.q2_app.get_open_file_dialoq(
+                f"Import Extension ({prefix})", filter=filetype
+            )
+
+        if not file or not os.path.isfile(file):
+            return
+
+        data = json.load(open(file))
+        if data:
+            AppManager.import_json_app(data, prefix=prefix)
+            self.q2_app.open_selected_app()
+
+    def export_q2market(self):
+        prefix = self.r.prefix
+        if not self.q2_app.app_url:
+            q2Mess("No App URL!")
+            return
+        if (
+            q2AskYN(
+                f"<p>You are about to export Extension ({prefix}) "
+                f"<p>into folder {os.path.abspath(self.q2_app.q2market_path)}"
+                "<p>Are you sure?"
+            )
+            != 2
+        ):
+            return
+
+        q2market_file = f"{self.q2_app.q2market_path}/q2market.json"
+        if os.path.isfile(q2market_file):
+            q2market = json.load(open(q2market_file))
+        else:
+            q2market = {}
+
+        version = datetime.now().strftime(r"%Y-%m-%d %H:%M:%S")
+        ext_url = f"{os.path.dirname(self.q2_app.app_url)}/{prefix}"
+        q2market[ext_url] = {
+            "ext_title": prefix,
+            "ext_version": version,
+            "ext_description": self.r.comment,
+        }
+        json.dump(q2market, open(q2market_file, "w"), indent=2)
+        open(f"{self.q2_app.q2market_path}/{prefix}.version", "w").write(version)
+        self.db.update("extensions", {"prefix": prefix, "version": version})
+
+        self.export_json(f"{self.q2_app.q2market_path}/{prefix}.json")
+
+        trm = Q2Terminal(callback=print)
+
+        def worker():
+            trm.run(f"cd {self.q2_app.q2market_path}")
+            trm.run("git add -A")
+            trm.run(f"""git commit -a -m"{version}"  """)
+
+        q2working(worker, "Commiting")
+        q2Mess(trm.run("""git push"""))
+        trm.close()
+
+    def import_q2market(self):
+        q2app.q2_app.check_ext_update(self.r.prefix, force_update=True)

{q2rad-0.1.212 → q2rad-0.1.214}/q2rad/q2market.py

@@ -41,9 +41,10 @@ class Q2Market(Q2Form):
         data = json.loads(read_url(q2market_catalogue_url).decode("utf-8"))
         rez = []
         for x in data:
-            rec = data[x]
-            rec["app_url"] = x
-            rez.append(rec)
+            if "app_title" in data[x]:
+                rec = data[x]
+                rec["app_url"] = x
+                rez.append(rec)
         model = Q2Model()
         model.set_records(rez)
         self.set_model(model)

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

@@ -57,6 +57,7 @@ from q2rad.q2forms import Q2Forms
 from q2rad.q2lines import Q2Lines
 from q2rad.q2market import Q2Market
 from q2rad.q2packages import Q2Packages
+from q2rad.q2extensions import Q2Extensions
 from q2rad.q2constants import Q2Constants, q2const
 from q2rad.q2queries import Q2Queries
 from q2rad.q2reports import Q2Reports, Q2RadReport
@@ -111,44 +112,57 @@ def run_form(form_name, order="", where=""):
 
 
 def run_module(module_name=None, _globals={}, _locals=locals(), script="", import_only=False):
+    ext_modules = []
     if module_name is not None:
         script = q2app.q2_app.db_logic.get("modules", f"name = '{module_name}'", "script")
-    if not script:
-        return
-    code = q2app.q2_app.code_compiler(script)
-    if code["code"] is False:
-        msg = code["error"]
-        if threading.current_thread() is threading.main_thread():
-            q2Mess(f"{msg}".replace("\n", "<br>").replace(" ", "&nbsp;"))
-        print(f"{msg}")
-        print("-" * 25)
-        _logger.error(msg)
-        return
-    else:
-        if import_only:
-            __name__ = ""
+        for row in q2cursor("select prefix from extensions order by seq").records():
+            ext_module_name = row["prefix"] + module_name
+            if get("modules", f"name='{ext_module_name}'", "name", q2app.q2_app.db_logic) == ext_module_name:
+                ext_modules.append(ext_module_name)
+    if script:
+        code = q2app.q2_app.code_compiler(script)
+        if code["code"] is False:
+            msg = code["error"]
+            if threading.current_thread() is threading.main_thread():
+                q2Mess(f"{msg}".replace("\n", "<br>").replace(" ", "&nbsp;"))
+            print(f"{msg}")
+            print("-" * 25)
+            _logger.error(msg)
+            return
         else:
-            __name__ = "__main__"
+            if import_only:
+                __name__ = ""
+            else:
+                __name__ = "__main__"
+
+            _locals.update(
+                {
+                    "RETURN": None,
+                    "ReturnEvent": ReturnEvent,
+                    "self": q2app.q2_app,
+                    "q2_app": q2app.q2_app,
+                    "myapp": q2app.q2_app,
+                    "__name__": __name__,
+                }
+            )
+            _globals.update(globals())
+            _globals.update(_locals)
+            try:
+                exec(code["code"], _globals)
+            except ReturnEvent as error:
+                pass
+            except Exception as error:
+                explain_error()
 
-        _locals.update(
-            {
-                "RETURN": None,
-                "ReturnEvent": ReturnEvent,
-                "self": q2app.q2_app,
-                "q2_app": q2app.q2_app,
-                "myapp": q2app.q2_app,
-                "__name__": __name__,
-            }
-        )
-        _globals.update(globals())
-        _globals.update(_locals)
-        try:
-            exec(code["code"], _globals)
-        except ReturnEvent as error:
-            pass
-        except Exception as error:
-            explain_error()
-        return _globals["RETURN"]
+    if ext_modules:
+        res = None
+        for mdl in ext_modules:
+            res = run_module(mdl, _globals=_globals, _locals=_locals, import_only=import_only)
+
+        if res is not None:
+            return res
+
+    return _globals.get("RETURN")
 
 
 def explain_error(tb=None, errtype=None):
@@ -300,6 +314,7 @@ class Q2RadApp(Q2App):
         if self.selected_application != {}:
             self.open_selected_app(True)
             self.check_app_update()
+            self.check_ext_update()
             self.on_new_tab()
         else:
             self.close()
@@ -326,6 +341,7 @@ class Q2RadApp(Q2App):
         else:
             self.set_title(f"{self.selected_application.get('name', '')}")
         self.run_module("autorun")
+        self.run_module("_autorun")
 
         if go_to_q2market and (
             max(
@@ -368,7 +384,10 @@ class Q2RadApp(Q2App):
         )
         for column in cu.records():
             data_schema.add(**column)
-        for form in (Q2Constants(),):
+        for form in (
+            Q2Constants(),
+            Q2Extensions(),
+        ):
             for x in form.get_table_schema():
                 data_schema.add(**x)
 
@@ -894,6 +913,45 @@ class Q2RadApp(Q2App):
                     AppManager.import_json_app(data)
                     self.open_selected_app()
 
+    def check_ext_update(self, prefix="", force_update=False):
+        if self.frozen:
+            return
+        if prefix:
+            cu = q2cursor(f"select * from extensions where prefix='{prefix}'")
+        else:
+            cu = q2cursor(f"select * from extensions order by seq")
+        for row in cu.records():
+            _prefix = row["prefix"]
+            ext_url = f"{os.path.dirname(self.app_url)}/{_prefix}"
+            ext_version = row["version"]
+            if not os.path.isdir(self.q2market_path) or force_update:
+                try:
+                    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:
+                    if force_update:
+                        update_detected = (
+                            f"You are about to rewrite current Extension ({_prefix}) <b>{self.app_title}</b>!"
+                        )
+                    else:
+                        update_detected = (
+                            f"Update for Extension ({_prefix}) <b>{self.app_title}</b> detected!"
+                        )
+                    if (
+                        q2AskYN(
+                            f"{update_detected}"
+                            f"<p>Current version <b>{ext_version}</b>"
+                            f"<p>New version <b>{market_version}</b>"
+                            "<p>Download and install?"
+                        )
+                        == 2
+                    ):
+                        data = json.load(open_url(ext_url + ".json"))  # noqa F405
+                        AppManager.import_json_app(data, prefix=_prefix)
+        self.open_selected_app()
+
     def update_app_packages(self):
         if self.frozen:
             return
@@ -1029,6 +1087,9 @@ class Q2RadApp(Q2App):
     def run_packages(self):
         Q2Packages().run()
 
+    def run_extensions(self):
+        Q2Extensions().run()
+
     def make_binary(self):
         make_binary(self)
 
@@ -1144,6 +1205,7 @@ 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,
@@ -1214,8 +1276,8 @@ class Q2RadApp(Q2App):
                 # import
                 if re.findall(r"^\s*import\W*.*", x):
                     module = x.split("import")[1].strip()
-                    if self.db_logic.get("modules", f"name='{module}'", "name"):
-                        x = x.split("import")[0] + f"run_module('{module}', import_only=True)"
+                    # if self.db_logic.get("modules", f"name='{module}'", "name"):
+                    x = x.split("import")[0] + f"run_module('{module}', import_only=True)"
 
                 new_script_lines.append(x)
             script = "\n".join(new_script_lines)

q2rad-0.1.214/q2rad/version.py

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

q2rad-0.1.212/q2rad/version.py

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