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

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/q2forms.py

@@ -17,7 +17,7 @@ from q2db.cursor import Q2Cursor
 
 from q2gui.q2model import Q2CursorModel
 
-from q2gui.q2dialogs import q2mess
+from q2gui.q2dialogs import q2mess, q2ask
 from q2gui import q2app
 
 from q2rad.q2lines import Q2Lines
@@ -288,6 +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 ""
                 self.db.insert(
                     "lines",
                     {
@@ -298,7 +299,7 @@ class Q2Forms(Q2Form, Q2_save_and_run):
                         "datatype": "int",
                         "migrate": "*",
                         "pk": "*",
-                        "ai": "*",
+                        "ai": ai,
                     },
                 )
                 self.db.insert(

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/q2raddb.py

@@ -168,3 +168,8 @@ def rollback(q2_db=None):
 
 def today():
     return datetime.date.today()
+
+
+def ensure_empty_pk(table="", row={}, q2_db=None):
+    q2_db = get_default_db(q2_db)
+    q2_db.ensure_empty_pk(table, row)

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.217"
+__version__ = "0.1.219"

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

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

{q2rad-0.1.217.dist-info → q2rad-0.1.219.dist-info}/RECORD

@@ -2,24 +2,24 @@ 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/q2appselector.py,sha256=-QazsbpOxRlzuCZZ35QU-p9iiBrF16oDU-Os-5rPIRQ,18811
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2extensions.py,sha256=PclrX3vPgqwjQIOqiKrRiJaBvhWlCjDUmmxvnF0FLwc,5281
-q2rad/q2forms.py,sha256=z8YO2uLXf1QxmlDe099IenfWtUl0olW3a1U4uay8kgc,11030
+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/q2queries.py,sha256=l9SJ_T5Y38p23xa505EPZocCEmFw_a2y4ck0_-AHVP0,13119
 q2rad/q2rad.py,sha256=--C8iBgUlOxDHCVjsf6E1rbDIW3oRZ_cIufksiaeV8U,51838
-q2rad/q2raddb.py,sha256=8cQcByBQoROwInPNA3bEy8INxTg6rPixbyle4QY4WU8,4555
-q2rad/q2reports.py,sha256=zVQbBoXHcdSPhoGlayzdoZ0b1qrRbafM6r1wP2VP0B4,84480
+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=HuDeLxbAxYJMq9H9bSODRQmDLvi7yQmRIrpEz_DvSEQ,23
-q2rad-0.1.217.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.217.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.217.dist-info/METADATA,sha256=kfyl8SBIH8wgiuTkEukZWBEGIhDt_PQKFir8yfOPp_U,3369
-q2rad-0.1.217.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.217.dist-info/RECORD,,
+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,,