db-sync-tool-kmi 2.11.5__py3-none-any.whl → 2.11.7__py3-none-any.whl

db_sync_tool/info.py

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

db_sync_tool/recipes/drupal.py

@@ -41,7 +41,7 @@ def check_configuration(client):
 
     _db_config = parse_database_credentials(json.loads(stdout))
 
-    system.config[client]['db'] = _db_config
+    system.config[client]['db'] = helper.clean_db_config(_db_config)
 
 
 def parse_database_credentials(db_credentials):

db_sync_tool/recipes/laravel.py

@@ -15,13 +15,13 @@ def check_configuration(client):
     """
     _path = system.config[client]['path']
 
-    system.config[client]['db'] = {
+    system.config[client]['db'] = helper.clean_db_config({
         'name': get_database_parameter(client, 'DB_DATABASE', _path),
         'host': get_database_parameter(client, 'DB_HOST', _path),
         'password': get_database_parameter(client, 'DB_PASSWORD', _path),
         'port': get_database_parameter(client, 'DB_PORT', _path),
         'user': get_database_parameter(client, 'DB_USERNAME', _path),
-    }
+    })
 
 
 def get_database_parameter(client, name, file):

db_sync_tool/recipes/symfony.py

@@ -38,7 +38,7 @@ def check_configuration(client):
         )
         _db_config = parse_database_credentials(stdout)
 
-    system.config[client]['db'] = _db_config
+    system.config[client]['db'] = helper.clean_db_config(_db_config)
 
 
 def parse_database_credentials(db_credentials):

db_sync_tool/recipes/typo3.py

@@ -59,7 +59,7 @@ def check_configuration(client):
             )
         )
 
-    system.config[client]['db'] = _db_config
+    system.config[client]['db'] = helper.clean_db_config(_db_config)
 
 
 def parse_database_credentials(db_credentials):

db_sync_tool/recipes/wordpress.py

@@ -25,7 +25,7 @@ def check_configuration(client):
         'user': get_database_setting(client, 'DB_USER', system.config[client]['path']),
     }
 
-    system.config[client]['db'] = _db_config
+    system.config[client]['db'] = helper.clean_db_config(_db_config)
 
 
 def get_database_setting(client, name, file):

db_sync_tool/utility/helper.py

@@ -323,3 +323,31 @@ def confirm(prompt=None, resp=False):
             return True
         if ans == 'n' or ans == 'N':
             return False
+
+
+def clean_db_config(config):
+    """
+    Iterates over all entries of a dictionary and removes enclosing inverted commas
+    from the values, if present.
+
+    :param config: The dictionary to be edited
+    :return: A new dictionary with adjusted values
+    """
+    # Iterate over all entries in the dictionary and use the inverted comma function
+    return {key: remove_surrounding_quotes(value) for key, value in config.items()}
+
+
+def remove_surrounding_quotes(s):
+    """
+    Removes the enclosing inverted commas (single or double),
+    if there are quotes at both the beginning and the end of the string.
+
+    :param s: The string to be checked
+    :return: The string without enclosing quotes, if available
+    """
+    if isinstance(s, str):
+        if s.startswith('"') and s.endswith('"'):
+            return s[1:-1]
+        elif s.startswith("'") and s.endswith("'"):
+            return s[1:-1]
+    return s

db_sync_tool/utility/mode.py

@@ -86,7 +86,7 @@ class SyncMode:
 
         :return: boolean
         """
-        return system.config['import'] != '' and SyncMode.is_full_local()
+        return system.config['import'] != '' and 'host' not in system.config[Client.TARGET]
 
     @staticmethod
     def is_import_remote():
@@ -102,7 +102,7 @@ class SyncMode:
 
         :return: boolean
         """
-        return SyncMode.is_full_local() and SyncMode.is_same_host()  and SyncMode.is_same_sync()
+        return SyncMode.is_full_local() and SyncMode.is_same_host() and SyncMode.is_same_sync()
 
     @staticmethod
     def is_sync_remote():

{db_sync_tool_kmi-2.11.5.dist-info → db_sync_tool_kmi-2.11.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: db-sync-tool-kmi
-Version: 2.11.5
+Version: 2.11.7
 Summary: Synchronize a database from and to host systems.
 Home-page: https://github.com/jackd248/db-sync-tool
 Author: Konrad Michalik

{db_sync_tool_kmi-2.11.5.dist-info → db_sync_tool_kmi-2.11.7.dist-info}/RECORD

@@ -1,16 +1,16 @@
 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=g-WFaJb7HXUyVdF5q4ofO48yR8GCfY-6f6vJ_TZiGqY,165
+db_sync_tool/info.py,sha256=hh8zjO1L4Fpu06f1t3M0x5DaYUYIuTqzWl7gMFNMFc0,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=zmaKkxMVLYG3kr7S9rUUuxE1fgsdKasRNOhxZgSfzvg,8357
 db_sync_tool/database/utility.py,sha256=EfxWwHUsS6hVIMD4Jrz3n2_HQNBn3pB2GWo6OpWph4k,7783
 db_sync_tool/recipes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-db_sync_tool/recipes/drupal.py,sha256=jlWuSQQeoLkVBq6nqka853QnEyy2ZO_08o5mfkv0jDo,1481
-db_sync_tool/recipes/laravel.py,sha256=-iF-2SHh5tOKuOC4C2qQMdz_sn9gm0-TBN9XpiYEuC4,1151
-db_sync_tool/recipes/symfony.py,sha256=rk2epXLEBLfsNTiV5G43JUnJtjn5-JTtnhQFi-tgmJQ,2493
-db_sync_tool/recipes/typo3.py,sha256=7ThFTkqN086FcpYv_aUhxMTEKh2JQl6BB5VrFzNrEWA,4737
-db_sync_tool/recipes/wordpress.py,sha256=Cdjc10c30shHAG8WpQeFvhl8fojHeCto3UInRLb9FFU,1444
+db_sync_tool/recipes/drupal.py,sha256=jAo1d3vxZ4UZ4Vzk308Dsmn1--ORmVO2g87l8OpQoPw,1505
+db_sync_tool/recipes/laravel.py,sha256=kp_gnKG0iyX_rzM0GW7Ca9ZPV3oGfEgGsLvJR_0pVDo,1175
+db_sync_tool/recipes/symfony.py,sha256=8ObIRXdoBG1MbWD7pd1TxUQboz5LUWbfzz3TX6F9G5w,2517
+db_sync_tool/recipes/typo3.py,sha256=7IejOtxASfskymG5jBFKmEzjl2sON3miKo_78Oqvi2g,4761
+db_sync_tool/recipes/wordpress.py,sha256=KN3HTzDbs5p2GD7vvTEhBl7xNOiy2YHrXhVLmiF_y_A,1468
 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=VsLbCCgZRSXjmYz5o7B_OpKPna0X1WFqlr-irLN83EY,4252
@@ -18,17 +18,17 @@ db_sync_tool/remote/system.py,sha256=A9OIaypETMYx7frTKpXBgja-kXj7vSD6gJs8pUNpL_I
 db_sync_tool/remote/transfer.py,sha256=pYVsad4SKkJ0TgZHcyLc17Z9xK6exdyO7R8TBe4qQcQ,5872
 db_sync_tool/remote/utility.py,sha256=knTfzFKLdw2QsirvTfTz76XmckagKURKVBhjyREsQIo,3580
 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/helper.py,sha256=zf1dPKgb5loLcOUtinjHdY9D_E6Gp5kLjbS8R-bRrxw,8905
 db_sync_tool/utility/info.py,sha256=8VdUMi3fsyykfMKKrmgUVoW9WEHPXbzPkVNHOIsNAMo,2976
 db_sync_tool/utility/log.py,sha256=OdJsVKyvJqQYl5NUzb5bIg1uhUJ9kj7c7kT9oKbGvo8,869
-db_sync_tool/utility/mode.py,sha256=ijmCb7CC8cYnjaD7kBhNYAWm8_3rYSk4NeY7CfG4JPk,8571
+db_sync_tool/utility/mode.py,sha256=DAkt-N5sYr6r2iTL_1sWu7_WHq04DNO4YjvBLkU3LeA,8588
 db_sync_tool/utility/output.py,sha256=uoiWE7Pm8qv1a3vrBupZHE545d1uZSQHiLAUgkHofLM,4758
 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.5.dist-info/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
-db_sync_tool_kmi-2.11.5.dist-info/METADATA,sha256=tskrIqeRZYyBGR9IdPNwzeBLAE_QxLWV-tB-Zpf5LSU,12505
-db_sync_tool_kmi-2.11.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-db_sync_tool_kmi-2.11.5.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
-db_sync_tool_kmi-2.11.5.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
-db_sync_tool_kmi-2.11.5.dist-info/RECORD,,
+db_sync_tool_kmi-2.11.7.dist-info/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
+db_sync_tool_kmi-2.11.7.dist-info/METADATA,sha256=URT5TX1lofJ0YOFnFfi8gLK-6i1HoAiBG-3fU2RrEKQ,12505
+db_sync_tool_kmi-2.11.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+db_sync_tool_kmi-2.11.7.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
+db_sync_tool_kmi-2.11.7.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
+db_sync_tool_kmi-2.11.7.dist-info/RECORD,,