db-sync-tool-kmi 2.11.1__py3-none-any.whl → 2.11.3__py3-none-any.whl

db_sync_tool/info.py

@@ -1,6 +1,6 @@
 """
 Info script
 """
-__version__ = "2.11.1"
+__version__ = "2.11.3"
 __pypi_package_url__ = "https://pypi.org/pypi/db-sync-tool-kmi"
 __homepage__ = "https://github.com/jackd248/db-sync-tool"

db_sync_tool/remote/rsync.py

@@ -20,6 +20,7 @@ default_options = [
     '--chmod=D2770,F660'
 ]
 
+
 def get_password_environment(client):
     """
     Optionally create a password environment variable for sshpass password authentication
@@ -122,20 +123,25 @@ def unit_converter(size_in_bytes):
     """
     units = ['Bytes', 'kB', 'MB', 'GB']
 
-    _convertedSize = float(size_in_bytes)
-    for unit in units:
-        if _convertedSize < 1024:
-            return str(_convertedSize) + ' ' + unit
-        _convertedSize = _convertedSize/1024
+    if isinstance(size_in_bytes, (int, float)):
+        _convertedSize = float(size_in_bytes)
+        for unit in units:
+            if _convertedSize < 1024:
+                return str(_convertedSize) + ' ' + unit
+            _convertedSize = _convertedSize / 1024
 
-    return _convertedSize
+        return _convertedSize
+    return size_in_bytes
 
 
-def run_rsync_command(remote_client, origin_path, target_path, origin_ssh = '', target_ssh = ''):
+def run_rsync_command(remote_client, origin_path, target_path, origin_ssh='', target_ssh=''):
     """
 
-    :param localpath:
-    :param remotepath:
+    :param target_ssh:
+    :param origin_ssh:
+    :param target_path:
+    :param origin_path:
+    :param remote_client:
     :return:
     """
     if origin_ssh != '':
@@ -151,4 +157,3 @@ def run_rsync_command(remote_client, origin_path, target_path, origin_ssh = '',
         True
     )
     read_stats(_output)
-

db_sync_tool/remote/utility.py

@@ -29,11 +29,15 @@ def remove_origin_database_dump(keep_compressed_file=False):
 
     _file_path = helper.get_dump_dir(mode.Client.ORIGIN) + database_utility.database_dump_file_name
     if mode.is_origin_remote():
-        sftp = remote_client.ssh_client_origin.open_sftp()
-        sftp.remove(_file_path)
+        mode.run_command(
+            f'{helper.get_command(mode.Client.ORIGIN, 'rm')}  {_file_path}',
+            mode.Client.ORIGIN
+        )
         if not keep_compressed_file:
-            sftp.remove(f'{_file_path}.tar.gz')
-        sftp.close()
+            mode.run_command(
+                f'{helper.get_command(mode.Client.ORIGIN, 'rm')}  {_file_path}.tar.gz',
+                mode.Client.ORIGIN
+            )
     else:
         os.remove(_file_path)
         if not keep_compressed_file:
@@ -92,10 +96,14 @@ def remove_target_database_dump():
             return
 
         if mode.is_target_remote():
-            sftp = remote_client.ssh_client_target.open_sftp()
-            sftp.remove(_file_path)
-            sftp.remove(f'{_file_path}.tar.gz')
-            sftp.close()
+            mode.run_command(
+                f'{helper.get_command(mode.Client.TARGET, 'rm')}  {_file_path}',
+                mode.Client.TARGET
+            )
+            mode.run_command(
+                f'{helper.get_command(mode.Client.TARGET, 'rm')}  {_file_path}.tar.gz',
+                mode.Client.TARGET
+            )
         else:
             if os.path.isfile(_file_path):
                 os.remove(_file_path)

{db_sync_tool_kmi-2.11.1.dist-info → db_sync_tool_kmi-2.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: db-sync-tool-kmi
-Version: 2.11.1
+Version: 2.11.3
 Summary: Synchronize a database from and to host systems.
 Home-page: https://github.com/jackd248/db-sync-tool
 Author: Konrad Michalik
@@ -220,7 +220,7 @@ optional arguments:
   -w WHERE, --where WHERE
                         Additional where clause for mysql dump to sync only selected rows, e.g. --where="deleted=0"
   -amo OPTIONS, --additional-mysqldump-options OPTIONS
-                        Additional where clause for mysql dump to sync only selected rows, e.g. --where="deleted=0"
+                        Additional mysqldump options for creating the database dump, e.g. --additional-mysqldump-options="--where="deleted=0"
 ```
 
 If you haven't declared a path to a SSH key, during the script execution you are requested to enter the SSH password for the given user in the shell argument or the `config.json` to enable a SSH connection for the remote system. 

{db_sync_tool_kmi-2.11.1.dist-info → db_sync_tool_kmi-2.11.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 db_sync_tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/__main__.py,sha256=-pD13j2oYcKLhPprLy-LQeDCapj-FKrV3CDFHuYJu3g,11541
-db_sync_tool/info.py,sha256=zvJb_plR5CL6T5IYZObECTY_7Km79XQ2jgPTTeUXNF8,165
+db_sync_tool/info.py,sha256=FPLspF2F39NbrqdmhApBJY9jaQlDc7pA8-708-2CLiE,165
 db_sync_tool/sync.py,sha256=WMfMts0M8z3oecI-HL07xG9ktbba8D8h7_U-8tBwizY,2087
 db_sync_tool/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/database/process.py,sha256=6KiYyCVk68tJbyGNfVeIwYyTMkk5jCoOiVdWoLnrDHw,8365
@@ -13,10 +13,10 @@ db_sync_tool/recipes/typo3.py,sha256=7ThFTkqN086FcpYv_aUhxMTEKh2JQl6BB5VrFzNrEWA
 db_sync_tool/recipes/wordpress.py,sha256=Cdjc10c30shHAG8WpQeFvhl8fojHeCto3UInRLb9FFU,1444
 db_sync_tool/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/remote/client.py,sha256=wjcoQ1jp9i8PMO_6XX2XMXZCoLXy-ySA38seZtY-Sns,6553
-db_sync_tool/remote/rsync.py,sha256=sX5s_G89qE6E19TJrOranvGLUP-aSin00SXC7J63ykE,4082
+db_sync_tool/remote/rsync.py,sha256=VsLbCCgZRSXjmYz5o7B_OpKPna0X1WFqlr-irLN83EY,4252
 db_sync_tool/remote/system.py,sha256=A9OIaypETMYx7frTKpXBgja-kXj7vSD6gJs8pUNpL_I,1188
 db_sync_tool/remote/transfer.py,sha256=pYVsad4SKkJ0TgZHcyLc17Z9xK6exdyO7R8TBe4qQcQ,5872
-db_sync_tool/remote/utility.py,sha256=-T4o62i41LGlTOlinX5KplcQQz5_Rdzk11Hjj1Bb48I,3264
+db_sync_tool/remote/utility.py,sha256=s7yuA7bAv4gUEgfK7cHleZpBQd4XB60NvQgPXRZfhik,3570
 db_sync_tool/utility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/utility/helper.py,sha256=KSnps4JQHc-wUmi8HNqI1d836R4ZUiQJo94t1gYNFuo,7987
 db_sync_tool/utility/info.py,sha256=8VdUMi3fsyykfMKKrmgUVoW9WEHPXbzPkVNHOIsNAMo,2976
@@ -26,9 +26,9 @@ db_sync_tool/utility/output.py,sha256=uoiWE7Pm8qv1a3vrBupZHE545d1uZSQHiLAUgkHofL
 db_sync_tool/utility/parser.py,sha256=DIdWVGyiltyH8akoWyyXLvUmFPR-nvBrnzDctPJzgKw,6624
 db_sync_tool/utility/system.py,sha256=G74lWGFcJNmLr0l6-GkZWmkk7q3icv4MccuHFKP_Vsw,18539
 db_sync_tool/utility/validation.py,sha256=qZNPgkTwV_kJTNtFh0OXb2FHrsWPnDA2W_fftWs5hZc,3530
-db_sync_tool_kmi-2.11.1.dist-info/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
-db_sync_tool_kmi-2.11.1.dist-info/METADATA,sha256=LBIbZMmJeLcRTz2-pvDlcNOwaAStmWDH6LlDS-XhrYs,12479
-db_sync_tool_kmi-2.11.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-db_sync_tool_kmi-2.11.1.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
-db_sync_tool_kmi-2.11.1.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
-db_sync_tool_kmi-2.11.1.dist-info/RECORD,,
+db_sync_tool_kmi-2.11.3.dist-info/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
+db_sync_tool_kmi-2.11.3.dist-info/METADATA,sha256=am2k5dWEhIftg-zWavGHjxDQz4-KPm18-3NIatgNy3s,12505
+db_sync_tool_kmi-2.11.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+db_sync_tool_kmi-2.11.3.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
+db_sync_tool_kmi-2.11.3.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
+db_sync_tool_kmi-2.11.3.dist-info/RECORD,,

{db_sync_tool_kmi-2.11.1.dist-info → db_sync_tool_kmi-2.11.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any