q2rad 0.1.218__py3-none-any.whl → 0.1.220__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

@@ -97,7 +97,7 @@ class Q2AppSelect(Q2Form):
                     "Database",
                     gridlabel=_("Data storage"),
                     datatype="char",
-                    datalen=100,
+                    datalen=255,
                 )
                 self.add_control(
                     "select_data_storage_file",
@@ -142,7 +142,7 @@ class Q2AppSelect(Q2Form):
                     "Database",
                     gridlabel="Logic storage",
                     datatype="char",
-                    datalen=100,
+                    datalen=255,
                 )
                 self.add_control(
                     "select_app_storage_file",

q2rad/q2extensions.py

@@ -40,7 +40,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,8 +51,8 @@ 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)
 
@@ -96,42 +98,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 +148,8 @@ 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!")

q2rad/q2queries.py

@@ -17,7 +17,7 @@ from q2db.cursor import Q2Cursor
 from q2gui.q2model import Q2CursorModel, Q2Model
 from q2gui.q2widget import Q2Widget
 from q2gui.q2app import Q2Actions
-from q2rad.q2utils import q2cursor, Q2_save_and_run
+from q2rad.q2utils import q2cursor, Q2_save_and_run, num
 from q2gui.q2utils import set_dict_default
 import json
 import gettext
@@ -245,6 +245,18 @@ class Q2QueryList(Q2Form):
         self.model.readonly = False
         self.last_current_row = -1
 
+    def after_form_show(self):
+        if self.crud_mode != "EDIT":
+            start_value = self.r.name
+            while True:
+                _pkvalue_list = re.split(r"([^\d]+)", start_value)
+                _base = "".join(_pkvalue_list[:-1])
+                _suffix = num(_pkvalue_list[-1]) + 1
+                start_value = f"{_base}{_suffix}"
+                if start_value not in [row["name"] for row in self.model.records]:
+                    break
+            self.s.name = start_value
+
     def set_content(self, content):
         self.model.reset()
         for x in content:

q2rad/q2rad.py

@@ -926,7 +926,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 +935,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 +970,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/q2reports.py

@@ -153,12 +153,20 @@ class Q2RadReport(Q2Report):
             co = 0
             name, ext = os.path.splitext(rez_name)
             while True:
-                lockfile = f"{os.path.dirname(rez_name)}/.~lock.{os.path.basename(rez_name)}#"
-                if os.path.isfile(lockfile):
-                    co += 1
-                    rez_name = f"{name}{co:03d}{ext}"
-                else:
-                    break
+                if os.path.isfile(rez_name):
+                    try:
+                        os.remove(rez_name)
+                    except Exception as e:
+                        co += 1
+                        rez_name = f"{name}{co:03d}{ext}"
+                        continue
+                # lockfile = f"{os.path.dirname(rez_name)}/.~lock.{os.path.basename(rez_name)}#"
+                # if os.path.isfile(lockfile):
+                #     co += 1
+                #     rez_name = f"{name}{co:03d}{ext}"
+                # else:
+                #     break
+                break
         return rez_name
 
     def data_start(self):

q2rad/version.py

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

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

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

{q2rad-0.1.218.dist-info → q2rad-0.1.220.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=wS945hPfugCcxoEuRWm8nP1849Slw90CrRYgMhBB4nI,18811
+q2rad/q2appmanager.py,sha256=4c1h5I_7f4S7Ef9nDnDQthRqPC-uyK8v8B8zmhdhtr0,20567
+q2rad/q2appselector.py,sha256=-QazsbpOxRlzuCZZ35QU-p9iiBrF16oDU-Os-5rPIRQ,18811
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
-q2rad/q2extensions.py,sha256=PclrX3vPgqwjQIOqiKrRiJaBvhWlCjDUmmxvnF0FLwc,5281
+q2rad/q2extensions.py,sha256=V54Xypcucl1-RarLWtH3GGxnAW1m4p3wrTYXFLBdqgk,5929
 q2rad/q2forms.py,sha256=36NriEUquuF97fkHpBBQyw1PDIrBQQlwxb21YVrmtng,11117
 q2rad/q2lines.py,sha256=KQslxn06vypKSFahCDAa7oFPoo_BhvABTKy5iDEOFbc,19133
 q2rad/q2make.py,sha256=wXoyBUwf2zaAl9JjWDCbjAteUElRq0O7ippyaMY9eug,6476
 q2rad/q2market.py,sha256=RNXTNv-fFUgbzBGhHPNXlzGjsAHAtz71BRbTErJarNo,2641
 q2rad/q2modules.py,sha256=FetB84IxsuDzNYKTFM3BdvfH5GrWrFKoi6cV5uW1fKo,4360
 q2rad/q2packages.py,sha256=y72L1RAw1OgtKGaL8lJ1KHIaers5I6kTZSiphwwrY0M,3808
-q2rad/q2queries.py,sha256=RaNQMZaJy97Hcj_iNzSgHkCbM2s-J-vNaW7IyBFFbCc,12602
-q2rad/q2rad.py,sha256=--C8iBgUlOxDHCVjsf6E1rbDIW3oRZ_cIufksiaeV8U,51838
+q2rad/q2queries.py,sha256=l9SJ_T5Y38p23xa505EPZocCEmFw_a2y4ck0_-AHVP0,13119
+q2rad/q2rad.py,sha256=qlHORwI_E0rGXT5Moz7ECid_zlRcnAXco4_CTtcWdvw,52142
 q2rad/q2raddb.py,sha256=tMX971d_awTwiWeYLkZGSfdrIs88oiNHBAs2cMFvSbU,4685
-q2rad/q2reports.py,sha256=zVQbBoXHcdSPhoGlayzdoZ0b1qrRbafM6r1wP2VP0B4,84480
+q2rad/q2reports.py,sha256=1fewf1Zlz98raqTIWlRLIg-zTCYA2flGVqyIC120UEU,84802
 q2rad/q2stylesettings.py,sha256=rEJLyLzsffJEXnMbg9bPB3KHLjYfw-49QgrtcYOfGV0,4769
 q2rad/q2utils.py,sha256=Vb5K8Lbb7PzQGDiBEHFrPyDcytVnUSVXy9yIkvWM1Oc,19734
-q2rad/version.py,sha256=R3Los8W3dDwoWrX7u43DGpUrakSvpbRzdHF-uwHxiU4,23
-q2rad-0.1.218.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.218.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.218.dist-info/METADATA,sha256=NqA59-fGUhhS9__-Ids4NKCXKDY9XN3xHkrug8kCDdc,3369
-q2rad-0.1.218.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.218.dist-info/RECORD,,
+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,,