q2rad 0.1.231__tar.gz → 0.1.232__tar.gz

{q2rad-0.1.231 → q2rad-0.1.232}/PKG-INFO

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

{q2rad-0.1.231 → q2rad-0.1.232}/pyproject.toml

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

{q2rad-0.1.231 → q2rad-0.1.232}/q2rad/q2appmanager.py

@@ -22,6 +22,8 @@ from q2rad import Q2Form
 from q2terminal.q2terminal import Q2Terminal
 from q2rad.q2raddb import insert, update, get
 from datetime import datetime
+from urllib.parse import urlparse
+from q2rad.q2utils import ftp_upload
 
 import json
 import os
@@ -313,16 +315,46 @@ class AppManager(Q2Form):
         if app_name == "demo_app":
             self.export_data(f"{self.q2_app.q2market_path}/demo_data.json")
 
-        trm = Q2Terminal(callback=print)
-
-        def worker():
-            trm.run(f"cd {self.q2_app.q2market_path}")
-            trm.run("git add -A")
-            trm.run(f"""git commit -a -m"{version}"  """)
+        if os.path.isdir(f"{self.q2_app.q2market_path}/.git"):
+            trm = Q2Terminal(callback=print)
+
+            def worker():
+                trm.run(f"cd {self.q2_app.q2market_path}")
+                trm.run("git add -A")
+                trm.run(f"""git commit -a -m"{version}"  """)
+
+            q2working(worker, "Commiting")
+            q2Mess(trm.run("""git push"""))
+            trm.close()
+        else:  # try FTP
+            if os.path.isfile(".ftp"):
+                login, password = open(".ftp").read().split("\n")
+            else:
+                login, password = (
+                    "",
+                    "",
+                )
 
-        q2working(worker, "Commiting")
-        q2Mess(trm.run("""git push"""))
-        trm.close()
+            app_file = f"{self.q2_app.q2market_path}/{os.path.basename(self.q2_app.app_url)}"
+            app_file_json = f"{app_file}.json"
+            app_file_version = f"{app_file}.version"
+            server = urlparse(self.q2_app.app_url).netloc
+            if server in self.q2_app.app_url:
+                workdir = os.path.dirname(self.q2_app.app_url.split(server)[1])
+            else:
+                workdir = ""
+            ftp_creds = Q2Form("FTP credentials")
+            ftp_creds.add_control("server", "Server", datalen=100, data=server)
+            ftp_creds.add_control("login", "Login", datalen=100, data=login)
+            ftp_creds.add_control("password", "Password", pic="*", datalen=100, data=password)
+            ftp_creds.ok_button = 1
+            ftp_creds.cancel_button = 1
+            ftp_creds.run()
+            if ftp_creds.ok_pressed:
+                try:
+                    ftp_upload([app_file_json, app_file_version], server, workdir, login, password)
+                except Exception as error:
+                    q2Mess(f"Error while uploading: {error}")
 
     def export_app(self, file="", app_json=None):
         filetype = "JSON(*.json)"

{q2rad-0.1.231 → q2rad-0.1.232}/q2rad/q2rad.py

@@ -924,7 +924,7 @@ class Q2RadApp(Q2App):
         if self.frozen:
             return
 
-        if not os.path.isdir(self.q2market_path) and self.app_url and self.app_version or force_update:
+        if not os.path.isdir(self.q2market_path) and self.app_url or force_update:
             try:
                 market_version = read_url(self.app_url + ".version").decode("utf-8")  # noqa F405
             except Exception as e:  # noqa F841

{q2rad-0.1.231 → q2rad-0.1.232}/q2rad/q2utils.py

@@ -27,7 +27,7 @@ from q2gui.q2model import Q2Model
 from q2gui.q2dialogs import q2ask
 from q2gui.q2model import Q2CursorModel
 from q2gui import q2app
-from q2gui.q2dialogs import q2working, q2Mess
+from q2gui.q2dialogs import q2working, q2Mess, q2wait
 from q2gui.q2app import Q2Actions
 from q2gui.q2app import Q2Controls
 from q2gui.q2utils import int_
@@ -37,6 +37,9 @@ from logging.handlers import TimedRotatingFileHandler
 
 import gettext
 
+import math
+from ftplib import FTP
+
 
 _ = gettext.gettext
 
@@ -361,7 +364,11 @@ def q2choice(records=[], title="Make your choice", column_title=["Column"]):
 
 def choice_table():
     return q2choice(
-        [{"table": x} for x in q2app.q2_app.db_data.db_schema.get_schema_tables() if not x.startswith("log_")],
+        [
+            {"table": x}
+            for x in q2app.q2_app.db_data.db_schema.get_schema_tables()
+            if not x.startswith("log_")
+        ],
         title="Select table",
         column_title="Table",
     )
@@ -531,8 +538,17 @@ class auto_filter:
                 col["control"] = "line"
             col = Q2Controls.validate(col)
             self.filter_columns.append(cu.r.column)
-
-            if col["datatype"] in ["date"] or (col.get("num") and col.get("to_form", "") == ""):
+            if col["datatype"] in ["date"] or (
+                col.get("num")
+                and col.get("to_form", "") == ""
+                and col.get("control", "")
+                not in (
+                    "radio",
+                    "vradio",
+                    "list",
+                    "combo",
+                )
+            ):
                 self.mem.add_control("/h", cu.r.label, check=1)
                 col["label"] = "from"
                 co = col["column"]
@@ -543,6 +559,8 @@ class auto_filter:
                 self.mem.add_control(**col)
                 self.mem.add_control("/s")
                 self.mem.add_control("/")
+            # elif col.get("control", "") == "check":
+            #     pass
             else:
                 col["label"] = cu.r.label
                 col["check"] = 1
@@ -554,52 +572,28 @@ class auto_filter:
     def valid(self):
         where = []
         for x in self.filter_columns:
-            where.append(self.prepare_where(x))
+            where.append(self.mem.prepare_where(x))
         where_string = " and ".join([x for x in where if x])
         q2app.q2_app.run_form(self.form_name, where=where_string)
         return False
 
-    def prepare_where(self, column=None, control1=None, control2=None):
-        mem_widgets = self.mem.widgets().keys()
-        if control1 is None:
-            if column in mem_widgets:
-                control1 = column
-            elif column + "____1" in mem_widgets:
-                control1 = column + "____1"
-        if control1 not in mem_widgets:
-            return ""
-
-        if not self.mem.w.__getattr__(control1).is_checked():
-            return ""
-
-        date_control = self.mem.controls.c.__getattr__(control1)["datatype"] == "date"
-        num_control = self.mem.controls.c.__getattr__(control1).get("num")
-        control1_value = self.mem.s.__getattr__(control1)
-        if control2 is None:
-            if control1.endswith("____1"):
-                control2 = control1[:-5] + "____2"
-                control2_value = self.mem.s.__getattr__(control2)
-            else:
-                control2_value = None
-        if date_control:
-            if control1_value == "0000-00-00":
-                control1_value = ""
-            if control2_value == "0000-00-00":
-                control2_value = ""
-        elif num_control:
-            control1_value = num(control1_value)
-            if control2_value:
-                control2_value = num(control2_value)
-
-        if (control2_value is None) or control1_value == control2_value:
-            if date_control or num_control:
-                return f"{column} = '{control1_value}'"
-            else:
-                return f"{column} like '%{control1_value}%'"
-        elif (control1_value and not control2_value) or (control2_value and control1_value > control2_value):
-            return f"{column} >= '{control1_value}'"
-        elif not control1_value and control2_value:
-            return f"{column} <= '{control2_value}'"
-        elif control1_value and control2_value:
-            return f"{column} >= '{control1_value}' and {column}<='{control2_value}'"
-        return ""
+
+def ftp_upload(files=[], server="", workdir="", login="", password=""):
+    chunks = sum([math.ceil(os.path.getsize(x) / 1000) for x in files])
+    w = q2wait(chunks)
+    connection = FTP(server)
+    connection.login(login, password)
+    connection.cwd(workdir)
+
+    def send_call_back(w=w):
+        def realDo(chunk):
+            w.step()
+
+        return realDo
+
+    for x in files:
+        localfile = open(x, "rb")
+        connection.storbinary(f"STOR {os.path.basename(x)}", localfile, 1024, send_call_back())
+        localfile.close()
+    connection.quit()
+    w.close()

q2rad-0.1.232/q2rad/version.py

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

q2rad-0.1.231/q2rad/version.py

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