q2rad 0.1.167__py3-none-any.whl → 0.1.168__py3-none-any.whl

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

@@ -1 +1 @@
-__version__ = "0.1.167"
+__version__ = "0.1.168"

{q2rad-0.1.167.dist-info → q2rad-0.1.168.dist-info}/METADATA

@@ -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.dist-info → q2rad-0.1.168.dist-info}/RECORD

@@ -2,23 +2,23 @@ q2rad/__init__.py,sha256=Y0Up-UTXOmCYC9llNmTF10CpDDgF2kv10pyHT3-YwmQ,183
 q2rad/__main__.py,sha256=zP4JARM-FzFHM-vWLehx7c5N4v4m_F-TuMobCdFzr4Q,824
 q2rad/q2actions.py,sha256=_vbahOkI2NrTeyra0sP0jqYDX1Ov3f32GoLfRqevEks,7175
 q2rad/q2appmanager.py,sha256=x37tKfvUu-w8Cbu_v-0kLJgnLPpJ2o4qKwWu90SqOaU,15464
-q2rad/q2appselector.py,sha256=fxEPeNZZxujf8KRFUHFYLYJrupRIe1-wS_qOqajK-og,12250
+q2rad/q2appselector.py,sha256=H6rF_zJ6qOsUwKrUwaYl_YmPPSnWTsPawu-5RyJs_Lc,12198
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2forms.py,sha256=yhTjLYZ2-UIo2Cz1K4wPY_pgsy9YGtm1NoJpGF3oh7U,10165
 q2rad/q2lines.py,sha256=jUx8_eDA0gZz3cx7_l3qKv-Gn4IRUtcqCyNIXeFWReA,12166
-q2rad/q2make.py,sha256=3OZW-f35MNQHVGa283Om1IMH-gXb1oKGCLLKeBqjgr8,4620
+q2rad/q2make.py,sha256=JgRocf8cDVIFiC_cuZtYh86ZvwQAy9p7o6TF3LHF0B4,4621
 q2rad/q2market.py,sha256=koWwKKc1MVn0ud2XDu_dal8lBFEMLX8KABpZO_OzTIM,2597
 q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
 q2rad/q2packages.py,sha256=IpWEcAT9nLCHUGViInEyM4T1cLEwK9GtNcdGF-pk0tw,3345
 q2rad/q2queries.py,sha256=abr4Fi3ou1CJsTD6vNfcjcakzjE6xTvh6OYY4bNWQLA,12314
-q2rad/q2rad.py,sha256=3tkZd0mALa4NiaJEoVC-y4J1LhTXFpYeygv2wlC9YDU,41523
+q2rad/q2rad.py,sha256=vnxy3MlksBzNiFm0VduiHpz96tdo3xsRPEZRDKokijw,42629
 q2rad/q2raddb.py,sha256=aG5SPEe4cnU_gO8zFmVkTDmIC0gcQFEIUv5NYGuqLlE,4372
 q2rad/q2reports.py,sha256=YhrbwFXTMTgtwIh5XSWaabseaZjRco34WO5mU676PU8,81238
 q2rad/q2stylesettings.py,sha256=esbfQoPgP7lJN2GRkqeQKjDpHCqCilJBzZf-c73ThCU,3593
 q2rad/q2utils.py,sha256=-U4TGTzinY-CrpMTdUAQQrOiG0BVGbeTykH9b6T5-nk,14136
-q2rad/version.py,sha256=PE0Dl4tRYciDvvrITYElbTFDUFVnQg3I_A-fvQyOGXY,23
-q2rad-0.1.167.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.167.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.167.dist-info/METADATA,sha256=yWaB7I05QkckP_yWkMuV8FDlObEtAgM_6fyeawY2dac,3509
-q2rad-0.1.167.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.167.dist-info/RECORD,,
+q2rad/version.py,sha256=DyRSMmft4IGMe-tnzgBjtW1T7qXZwYslbQrz7HufbVo,23
+q2rad-0.1.168.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.168.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.168.dist-info/METADATA,sha256=n_DoAsj0efX_ygqG2Lc0qO1grWkemQqZGAFXjZqLuzA,3509
+q2rad-0.1.168.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.168.dist-info/RECORD,,