q2rad 0.1.209__py3-none-any.whl → 0.1.210__py3-none-any.whl

q2rad/q2appselector.py

@@ -102,13 +102,14 @@ class Q2AppSelect(Q2Form):
                 self.add_control(
                     "select_data_storage_file",
                     _("?"),
+                    datalen=3,
                     mess=_("Open Data Storage sqlite database file"),
                     control="button",
                     valid=self.openSqliteDataFile,
                 )
                 self.add_control("/")
             if self.add_control("/h"):
-                self.add_control("host_data", _("Host"), gridlabel=_("Data host"), datalen=100)
+                self.add_control("host_data", _("Host"), gridlabel=_("Data host"), datalen=100, stretch=90)
                 self.add_control("port_data", _("Port"), gridlabel=_("Data port"), datatype="int")
                 self.add_control(
                     "guest_mode",
@@ -118,6 +119,7 @@ class Q2AppSelect(Q2Form):
                     datalen=1,
                     mess=_("No database schema changes"),
                 )
+                self.add_control("/s", stretch=0)
                 self.add_control("/")
 
             self.add_control("/")
@@ -145,13 +147,14 @@ class Q2AppSelect(Q2Form):
                 self.add_control(
                     "select_app_storage_file",
                     _("?"),
+                    datalen=3,
                     mess=_("Open App Storage sqlite database file"),
                     control="button",
                     valid=self.openSqliteDataFile,
                 )
                 self.add_control("/")
             if self.add_control("/h"):
-                self.add_control("host_logic", _("Host"), gridlabel=_("Logic host"), datalen=100)
+                self.add_control("host_logic", _("Host"), gridlabel=_("Logic host"), datalen=100, stretch=90)
                 self.add_control("port_logic", _("Port"), gridlabel=_("Logic port"), datatype="int")
                 self.add_control(
                     "dev_mode",
@@ -161,6 +164,7 @@ class Q2AppSelect(Q2Form):
                     datalen=1,
                     mess=_("Allow to change App"),
                 )
+                self.add_control("/s", stretch=0)
                 self.add_control("/")
             self.add_control("/")
 
@@ -307,7 +311,9 @@ class Q2AppSelect(Q2Form):
         pinform.add_control("/h")
         pinform.add_control("/s")
         pinform.add_control("", "Application:", control="label")
-        pinform.add_control("appname", app_name, control="label", style="color:green;font-weight:bold;background:white")
+        pinform.add_control(
+            "appname", app_name, control="label", style="color:green;font-weight:bold;background:white"
+        )
         pinform.add_control("/s")
         pinform.add_control("/")
         pinform.add_control("/f")

q2rad/q2rad.py

@@ -731,6 +731,12 @@ class Q2RadApp(Q2App):
 
         return latest_version, current_version
 
+    def get_git_package_version(git_package):
+        package_name = os.path.basename(git_package)
+        package_path = git_package.replace("github.com", "githubusercontent.com")
+        version_url = f"https://raw.{package_path}/main/{package_name}/version.py"
+        return read_url(version_url).decode().split("=")[-1].strip()
+
     def update_packages(self, packages_list=q2_modules, force=False):
         if self.frozen:
             return
@@ -912,7 +918,12 @@ class Q2RadApp(Q2App):
         for package in rez:
             latest_version, current_version = rez[package]
             if self.db_logic is not None and package not in q2_modules:
-                pkg_ver = get("packages", f"package_name='{package}'", "package_version", q2_db=self.db_logic)
+                pkg_ver = get(
+                    "packages",
+                    f"package_name='{package if isinstance(package, str) else package[0]}'",
+                    "package_version",
+                    q2_db=self.db_logic,
+                )
                 pkg_ver = pkg_ver if pkg_ver else "99999"
                 if pkg_ver != "":
                     try:

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.209"
+__version__ = "0.1.210"

{q2rad-0.1.209.dist-info → q2rad-0.1.210.dist-info}/METADATA

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

{q2rad-0.1.209.dist-info → q2rad-0.1.210.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=RXcR35NDtoyhtWOlPOPt5Ml17JVHgnFy9POCYtJ9dT8,18451
-q2rad/q2appselector.py,sha256=PZWSXaiUswinB_Zj1Q8fyRhzqK9ViB8lUHlNVUr85rI,18597
+q2rad/q2appselector.py,sha256=wS945hPfugCcxoEuRWm8nP1849Slw90CrRYgMhBB4nI,18811
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2forms.py,sha256=z8YO2uLXf1QxmlDe099IenfWtUl0olW3a1U4uay8kgc,11030
 q2rad/q2lines.py,sha256=KQslxn06vypKSFahCDAa7oFPoo_BhvABTKy5iDEOFbc,19133
@@ -11,14 +11,14 @@ q2rad/q2market.py,sha256=nyIBhZYqxNSlBXpcxdBRQ1vGSzWV8jI4cQoVa9JdRhE,2589
 q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
 q2rad/q2packages.py,sha256=bP-QfNx0-IZ_rNTJ88jeYmNL09Pryjf4V803Yam34Tk,3742
 q2rad/q2queries.py,sha256=EXcau1UCdPrvTvsYr0857NoXldmrkhdrkmbUTk5LrMQ,12536
-q2rad/q2rad.py,sha256=59ykodEMu0mK5n2Jkm3bRjGt5ZpWqu5Vvr-0nSrniCE,46871
+q2rad/q2rad.py,sha256=oaJ7P9L1vd-w8kKLku4gcIH5y-lC_IxLKOlRtPhr3mQ,47359
 q2rad/q2raddb.py,sha256=ISqT5EBFO7eaXcQRNpA0hMiRU84kbd-FcfckwKMlGfs,4506
 q2rad/q2reports.py,sha256=Q-bZONOSDDQPrLziHTpW_L6FS82CkWzxITkv5EX5x98,84439
 q2rad/q2stylesettings.py,sha256=rEJLyLzsffJEXnMbg9bPB3KHLjYfw-49QgrtcYOfGV0,4769
 q2rad/q2utils.py,sha256=qpyw0V92DI8LcrUkWrtPlFoD9G2SGLXMfGwLGBLn3EU,19647
-q2rad/version.py,sha256=OZkl-LORwlEiNKzyimi0xP-IDh43rc8Ia5LsBRxKxS8,23
-q2rad-0.1.209.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.209.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.209.dist-info/METADATA,sha256=DKmNGm9hopiGtg868mt_Dib4o8wsuBYxIcUx7DW4tO8,3369
-q2rad-0.1.209.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.209.dist-info/RECORD,,
+q2rad/version.py,sha256=FiJHVGUWIUbI3cvPHtojUuqMLuCH8j90dVwrKzHcfB0,23
+q2rad-0.1.210.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.210.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.210.dist-info/METADATA,sha256=HDfXUh-laM24a7KeH568_aiuyoSkkldq6At1oQokVsk,3369
+q2rad-0.1.210.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.210.dist-info/RECORD,,