q2rad 0.1.167__tar.gz → 0.1.168__tar.gz

{q2rad-0.1.167 → q2rad-0.1.168}/PKG-INFO

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

{q2rad-0.1.167 → q2rad-0.1.168}/pyproject.toml

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

{q2rad-0.1.167 → q2rad-0.1.168}/q2rad/q2appselector.py

@@ -228,17 +228,17 @@ class Q2AppSelect(Q2Form):
         if self.q2_app.keyboard_modifiers() != "":
             return
         if self.db.table("applications").row_count() <= 0:
-            if not os.path.isdir("q2rad_sqlite_databases"):
-                os.mkdir("q2rad_sqlite_databases")
+            if not os.path.isdir("databases"):
+                os.mkdir("databases")
             insert(
                 "applications",
                 {
                     "ordnum": 1,
                     "name": "My first app",
                     "driver_data": "Sqlite",
-                    "database_data": "q2rad_sqlite_databases/my_first_app_data_storage.sqlite",
+                    "database_data": "databases/my_first_app_data_storage.sqlite",
                     "driver_logic": "Sqlite",
-                    "database_logic": "q2rad_sqlite_databases/my_first_app_logic_storage.sqlite",
+                    "database_logic": "databases/my_first_app_logic_storage.sqlite",
                     "dev_mode": "*",
                 },
                 self.db,

{q2rad-0.1.167 → q2rad-0.1.168}/q2rad/q2make.py

@@ -25,7 +25,7 @@ from q2rad.q2appmanager import AppManager
 
 
 def create_q2apps_sqlite(dist_folder):
-    database_folder_name = "database"
+    database_folder_name = "databases"
     database_name_prefix = "app1"
     appsel = Q2AppSelect(f"{dist_folder}/q2apps.sqlite")
     appsel.db.insert(

{q2rad-0.1.167 → q2rad-0.1.168}/q2rad/q2rad.py

@@ -613,18 +613,17 @@ class Q2RadApp(Q2App):
 
         if not self.frozen:
             # create update_q2rad.sh
-            self.write_restore_file(
-                "update_q2rad",
-                ("" if "win32" in sys.platform else "#!/bin/bash\n")
-                + ("q2rad\\scripts\\activate " if "win32" in sys.platform else "source q2rad/bin/activate")
-                + "&& pip install --upgrade --force-reinstall q2gui"
-                + "&& pip install --upgrade --force-reinstall q2db"
-                + "&& pip install --upgrade --force-reinstall q2report"
-                + "&& pip install --upgrade --force-reinstall q2terminal"
-                + "&& pip install --upgrade --force-reinstall q2rad",
-            )
+            self.write_reinstall_files()
 
             # create run_q2rad
+            self.write_run_files()
+            if sys.platform != "darwin":
+                if q2AskYN("Should I make a desktop shortcut?") == 2:
+                    self.make_desktop_shortcut()
+        self.process_events()
+
+    def write_run_files(self):
+        if sys.prefix != sys.base_prefix:  # in virtualenv
             self.write_restore_file(
                 "run_q2rad",
                 ("" if "win32" in sys.platform else "#!/bin/bash\n")
@@ -634,27 +633,56 @@ class Q2RadApp(Q2App):
                     else "q2rad/bin/q2rad\n"
                 ),
             )
-            if "win32" in sys.platform:
-                open("run_q2rad.vbs", "w").write(
-                    'WScript.CreateObject("WScript.Shell").Run '
-                    '"q2rad\\scripts\\pythonw.exe -m q2rad", 0, false'
-                )
+        elif os.path.isdir("python.loc"):
+            self.write_restore_file(
+                "run_q2rad",
+                ("" if "win32" in sys.platform else "#!/bin/bash\n")
+                + ("python.loc\\scripts\\q2rad" if "win32" in sys.platform else "python.loc/bin/q2rad\n"),
+            )
+        else:
+            self.write_restore_file(
+                "run_q2rad",
+                ("" if "win32" in sys.platform else "#!/bin/bash\n")
+                + ("pythonw.exe -m q2rad" if "win32" in sys.platform else "python -m q2rad\n"),
+            )
 
-                open("make_shortcut.vbs", "w").write(
-                    'Set oWS = WScript.CreateObject("WScript.Shell")\n'
-                    'Set oLink = oWS.CreateShortcut(oWS.SpecialFolders("Desktop") & "\\q2RAD.lnk")\n'
-                    'cu = WScript.CreateObject("Scripting.FileSystemObject").'
-                    "GetParentFolderName(WScript.ScriptFullName)\n"
-                    'oLink.TargetPath = cu & "\\run_q2rad.vbs"\n'
-                    'oLink.WorkingDirectory = cu & ""\n'
-                    'oLink.Description = "q2RAD"\n'
-                    'oLink.IconLocation = cu & "\\assets\\q2rad.ico"\n'
-                    "oLink.Save\n"
-                )
-            if sys.platform != "darwin":
-                if q2AskYN("Should I make a desktop shortcut?") == 2:
-                    self.make_desktop_shortcut()
-        self.process_events()
+        if "win32" in sys.platform:
+            open("run_q2rad.vbs", "w").write(
+                'WScript.CreateObject("WScript.Shell").Run '
+                '"q2rad\\scripts\\pythonw.exe -m q2rad", 0, false'
+            )
+
+            open("make_shortcut.vbs", "w").write(
+                'Set oWS = WScript.CreateObject("WScript.Shell")\n'
+                'Set oLink = oWS.CreateShortcut(oWS.SpecialFolders("Desktop") & "\\q2RAD.lnk")\n'
+                'cu = WScript.CreateObject("Scripting.FileSystemObject").'
+                "GetParentFolderName(WScript.ScriptFullName)\n"
+                'oLink.TargetPath = cu & "\\run_q2rad.vbs"\n'
+                'oLink.WorkingDirectory = cu & ""\n'
+                'oLink.Description = "q2RAD"\n'
+                'oLink.IconLocation = cu & "\\assets\\q2rad.ico"\n'
+                "oLink.Save\n"
+            )
+
+    def write_reinstall_files(self):
+        if sys.prefix != sys.base_prefix:  # in virtualenv
+            pip_command = (
+                "q2rad\\scripts\\python -m " if "win32" in sys.platform else "q2rad/script/python -m "
+            )
+        elif os.path.isdir("python.loc"):
+            pip_command = "python.loc\\python  -m " if "win32" in sys.platform else "python.loc/python -m "
+        else:
+            pip_command = "python  -m " if "win32" in sys.platform else "python  -m "
+
+        self.write_restore_file(
+            "update_q2rad",
+            ("" if "win32" in sys.platform else "#!/bin/bash\n")
+            + f"{pip_command} pip install --upgrade --force-reinstall q2gui"
+            + f"&&{pip_command} pip install --upgrade --force-reinstall q2db"
+            + f"&&{pip_command} pip install --upgrade --force-reinstall q2report"
+            + f"&&{pip_command} pip install --upgrade --force-reinstall q2terminal"
+            + f"&&{pip_command} pip install --upgrade --force-reinstall q2rad",
+        )
 
     def get_package_versions(self, package):
         response = open_url(f"https://pypi.python.org/pypi/{package}/json")  # noqa F405

q2rad-0.1.168/q2rad/version.py

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

q2rad-0.1.167/q2rad/version.py

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