q2rad 0.1.219__py3-none-any.whl → 0.1.221__py3-none-any.whl

q2rad/q2appmanager.py

@@ -173,10 +173,18 @@ class AppManager(Q2Form):
                             "load_app",
                             "From JSON file",
                             control="button",
+                            mess="Excluding _ prefixes",
                             # datalen=10,
                             valid=self.import_app,
                         )
-
+                        self.add_control(
+                            "load_app_all",
+                            "From JSON file *",
+                            mess="Import all, including _ prefixes",
+                            control="button",
+                            # datalen=10,
+                            valid=self.import_app_all,
+                        )
                         if self.q2_app.app_url:
                             self.add_control(
                                 "load_q2market_app",
@@ -455,6 +463,19 @@ class AppManager(Q2Form):
         # self.q2_app.migrate_db_data()
         self.q2_app.open_selected_app()
 
+    def import_app_all(self, file=""):
+        filetype = "JSON(*.json)"
+        if not file:
+            file, filetype = q2app.q2_app.get_open_file_dialoq("Import Application", filter=filetype)
+
+        if not file or not os.path.isfile(file):
+            return
+
+        data = json.load(open(file))
+        self.import_json_app(data, prefix="*")
+        # self.q2_app.migrate_db_data()
+        self.q2_app.open_selected_app()
+
     @staticmethod
     def import_json_app(data, db=None, prefix=""):
         if db is None:
@@ -469,7 +490,9 @@ class AppManager(Q2Form):
                 continue
             wait_row = Q2WaitShow(len(data[table]))
             if table != "packages":
-                if prefix:
+                if prefix == "*":
+                    db.cursor(f"delete from `{table}`")
+                elif 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) <> "_"')
@@ -484,7 +507,9 @@ class AppManager(Q2Form):
                     ):
                         continue
                 else:
-                    if prefix:
+                    if prefix == "*":
+                        pass
+                    elif prefix:
                         if not row.get("name").startswith(prefix):
                             continue
                     else:

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
@@ -40,7 +42,9 @@ class Q2Extensions(Q2Form):
         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("q2market_path", _("q2market folder"), datatype="char", datalen=255)
+        self.add_control("q2market_url", _("q2market url"), datatype="char", datalen=255)
+        self.add_control("checkupdates", _("Check for updates"), control="check", datatype="char", datalen=1)
         self.add_control("comment", _("Comment"), datatype="text")
 
         cursor: Q2Cursor = self.q2_app.db_data.table(table_name="extensions")
@@ -49,11 +53,19 @@ class Q2Extensions(Q2Form):
         self.set_model(model)
         self.add_action("/crud")
         self.add_action("Export|as JSON file", self.export_json, eof_disabled=True)
-        if os.path.isdir(self.q2_app.q2market_path):
-            self.add_action("Export|to q2Market", self.export_q2market, eof_disabled=True)
+        # if os.path.isdir(self.q2_app.q2market_path):
+        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 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
 
@@ -96,42 +108,48 @@ class Q2Extensions(Q2Form):
 
     def export_q2market(self):
         prefix = self.r.prefix
-        if not self.q2_app.app_url:
+        q2market_path = self.r.q2market_path if self.r.q2market_path else self.q2_app.q2market_path
+        q2market_url = self.r.q2market_url if self.r.q2market_url else self.q2_app.q2market_url
+        if not os.path.isdir(q2market_path):
+            q2Mess("No q2market path!")
+            return
+        if not q2market_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)}"
+                f"<p>into folder {os.path.abspath(q2market_path)}"
+                f"<p>and  upload into  {os.path.abspath(q2market_url)}"
                 "<p>Are you sure?"
             )
             != 2
         ):
             return
 
-        q2market_file = f"{self.q2_app.q2market_path}/q2market.json"
+        q2market_file = f"{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}"
+        ext_url = f"{q2market_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)
+        open(f"{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")
+        self.export_json(f"{q2market_path}/{prefix}.json")
 
         trm = Q2Terminal(callback=print)
 
         def worker():
-            trm.run(f"cd {self.q2_app.q2market_path}")
+            trm.run(f"cd {q2market_path}")
             trm.run("git add -A")
             trm.run(f"""git commit -a -m"{version}"  """)
 
@@ -140,4 +158,39 @@ class Q2Extensions(Q2Form):
         trm.close()
 
     def import_q2market(self):
-        q2app.q2_app.check_ext_update(self.r.prefix, force_update=True)
+        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)
+        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(

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,7 +322,7 @@ class Q2RadApp(Q2App):
         self.set_title("Open Application")
         Q2AppSelect().run(autoload_enabled)
         if self.selected_application != {}:
-            self.open_selected_app(True)
+            self.open_selected_app(True, migrate_db_data=False)
             self.check_app_update()
             self.check_ext_update()
             self.on_new_tab()
@@ -330,14 +330,18 @@ class Q2RadApp(Q2App):
             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!")
@@ -926,7 +930,7 @@ class Q2RadApp(Q2App):
                     AppManager.import_json_app(data)
                     self.open_selected_app()
 
-    def check_ext_update(self, prefix="", force_update=False):
+    def check_ext_update(self, prefix="", force_update=False, _ext_url=""):
         if self.frozen:
             return
         if prefix:
@@ -935,7 +939,14 @@ class Q2RadApp(Q2App):
             cu = q2cursor(f"select * from extensions where checkupdates<>'' order by seq")
         for row in cu.records():
             _prefix = row["prefix"]
-            ext_url = f"{os.path.dirname(self.app_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:
+                ext_url = f"{self.q2market_url}/{_prefix}"
+
             ext_version = row["version"]
             if not os.path.isdir(self.q2market_path) or force_update:
                 try:
@@ -963,6 +974,7 @@ 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()
 
     def update_app_packages(self):

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.219"
+__version__ = "0.1.221"

{q2rad-0.1.219.dist-info → q2rad-0.1.221.dist-info}/METADATA

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

{q2rad-0.1.219.dist-info → q2rad-0.1.221.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=o5j4bBz5wTVYn8Dot10HS_O1uyDEyzydOpz0NCxUHKI,19522
-q2rad/q2appselector.py,sha256=-QazsbpOxRlzuCZZ35QU-p9iiBrF16oDU-Os-5rPIRQ,18811
+q2rad/q2appmanager.py,sha256=4c1h5I_7f4S7Ef9nDnDQthRqPC-uyK8v8B8zmhdhtr0,20567
+q2rad/q2appselector.py,sha256=bjl4MDg9DoU1h6NZOQDElaIGURjVQwiHnsUwr3kp3nc,18813
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
-q2rad/q2extensions.py,sha256=PclrX3vPgqwjQIOqiKrRiJaBvhWlCjDUmmxvnF0FLwc,5281
-q2rad/q2forms.py,sha256=36NriEUquuF97fkHpBBQyw1PDIrBQQlwxb21YVrmtng,11117
-q2rad/q2lines.py,sha256=KQslxn06vypKSFahCDAa7oFPoo_BhvABTKy5iDEOFbc,19133
+q2rad/q2extensions.py,sha256=iQz8_GlMCm8g9LOR3aP3YSBgi9rD5i1YkuNaxRiTn5g,7541
+q2rad/q2forms.py,sha256=e9FrhXjvi9ZmrhRBmnmsHoPxDQJqsanLnsPjY6rjaQI,11122
+q2rad/q2lines.py,sha256=hGdEOdUmBdBpfJ4jHBrXR4gLRXCrgn0dlywsH8nbJ6Q,19185
 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=--C8iBgUlOxDHCVjsf6E1rbDIW3oRZ_cIufksiaeV8U,51838
+q2rad/q2rad.py,sha256=5IfUu4VHhqVuygem5ZwWFdj1WL_1VyXSKLngaVtbxbo,52313
 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=oVgRTA3VUYJNe8a3a2qNCC9nbYyeVwJmTF9d4EbOWMo,23
-q2rad-0.1.219.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.219.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.219.dist-info/METADATA,sha256=4Kh5XxHBz9DfsFf0CidLrhFxMyNu3R6SRd8ViNkobyM,3369
-q2rad-0.1.219.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.219.dist-info/RECORD,,
+q2rad/version.py,sha256=cAD9mqAwq0S1-BMh3hvd-bOW2U1IH16XAr4cwraQU60,23
+q2rad-0.1.221.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.221.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.221.dist-info/METADATA,sha256=_pCl1FLf9OSMdKqMC6eH-8wYEg1xpviYD4I-bfGrXso,3369
+q2rad-0.1.221.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.221.dist-info/RECORD,,