db-sync-tool-kmi 2.11.5__tar.gz → 2.11.7__tar.gz

{db_sync_tool-kmi-2.11.5 → db_sync_tool-kmi-2.11.7}/PKG-INFO

@@ -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 → db_sync_tool-kmi-2.11.7}/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-kmi-2.11.5 → db_sync_tool-kmi-2.11.7}/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-kmi-2.11.5 → db_sync_tool-kmi-2.11.7}/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-kmi-2.11.5 → db_sync_tool-kmi-2.11.7}/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-kmi-2.11.5 → db_sync_tool-kmi-2.11.7}/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-kmi-2.11.5 → db_sync_tool-kmi-2.11.7}/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-kmi-2.11.5 → db_sync_tool-kmi-2.11.7}/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-kmi-2.11.5 → db_sync_tool-kmi-2.11.7}/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 → db_sync_tool-kmi-2.11.7}/db_sync_tool_kmi.egg-info/PKG-INFO

@@ -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