q2rad 0.1.214__tar.gz → 0.1.216__tar.gz

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

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

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

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

{q2rad-0.1.214 → q2rad-0.1.216}/q2rad/q2extensions.py

@@ -49,7 +49,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)
-        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)
 

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

@@ -762,7 +762,7 @@ class Q2RadApp(Q2App):
         upgraded = []
         w = Q2WaitShow(len(packages_list))
         for package in packages_list:
-            if w.step(package):
+            if w.step(f"{package if isinstance(package, str) else package[0]}"):                
                 break
             latest_version, current_version = self.get_package_versions(package)
             # q2mess([package, latest_version, current_version])
@@ -860,6 +860,9 @@ class Q2RadApp(Q2App):
         if self.frozen:
             return
 
+        if isinstance(package, tuple) or isinstance(package, list):
+            package = package[1] if package[1] else package[0]
+
         def pip_runner():
             trm = Q2Terminal(callback=print)
             trm.run(
@@ -919,7 +922,7 @@ class Q2RadApp(Q2App):
         if prefix:
             cu = q2cursor(f"select * from extensions where prefix='{prefix}'")
         else:
-            cu = q2cursor(f"select * from extensions order by seq")
+            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}"
@@ -1276,8 +1279,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.216/q2rad/version.py

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

q2rad-0.1.214/q2rad/version.py

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