db-sync-tool-kmi 2.11.8__tar.gz → 2.11.10__tar.gz

{db_sync_tool-kmi-2.11.8 → db_sync_tool_kmi-2.11.10}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: db_sync_tool-kmi
-Version: 2.11.8
+Version: 2.11.10
 Summary: Synchronize a database from and to host systems.
 Home-page: https://github.com/jackd248/db-sync-tool
 Author: Konrad Michalik
@@ -28,11 +28,24 @@ Requires-Dist: jsonschema>=4.2.1
 Requires-Dist: requests>=2.26.0
 Requires-Dist: semantic_version>=2.8.5
 Requires-Dist: yaspin>=2.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # db sync tool
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/db_sync_tool-kmi)
 ![PyPI](https://img.shields.io/pypi/v/db_sync_tool-kmi)
+![Pepy Total Downloads](https://img.shields.io/pepy/dt/db-sync-tool-kmi)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/db-sync-tool-kmi)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/?branch=master)
 [![Build Status](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/badges/build.png?b=master)](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/build-status/master)
 

{db_sync_tool-kmi-2.11.8 → db_sync_tool_kmi-2.11.10}/README.md

@@ -2,6 +2,8 @@
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/db_sync_tool-kmi)
 ![PyPI](https://img.shields.io/pypi/v/db_sync_tool-kmi)
+![Pepy Total Downloads](https://img.shields.io/pepy/dt/db-sync-tool-kmi)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/db-sync-tool-kmi)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/?branch=master)
 [![Build Status](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/badges/build.png?b=master)](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/build-status/master)
 

{db_sync_tool-kmi-2.11.8 → db_sync_tool_kmi-2.11.10}/db_sync_tool/info.py

@@ -1,6 +1,6 @@
 """
 Info script
 """
-__version__ = "2.11.8"
+__version__ = "2.11.10"
 __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.8 → db_sync_tool_kmi-2.11.10}/db_sync_tool/recipes/typo3.py

@@ -30,14 +30,16 @@ def check_configuration(client):
         _db_config = parse_database_credentials(json.loads(stdout)['DB'])
     elif '.env' in _path:
         # Try to parse settings from .env file
+        if 'db' not in system.config[client]:
+            system.config[client]['db'] = {}
+
         _db_config = {
-            'name': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__dbname', system.config[client]['path']),
-            'host': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__host', system.config[client]['path']),
-            'password': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__password', system.config[client]['path']),
-            'port': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__port', system.config[client]['path'])
-            if get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__port',
-                                    system.config[client]['path']) != '' else 3306,
-            'user': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__user', system.config[client]['path']),
+            'name': get_database_setting_from_env(client, system.config[client]['db'].get('name', 'TYPO3_CONF_VARS__DB__Connections__Default__dbname'), system.config[client]['path']),
+            'host': get_database_setting_from_env(client, system.config[client]['db'].get('host', 'TYPO3_CONF_VARS__DB__Connections__Default__host'), system.config[client]['path']),
+            'password': get_database_setting_from_env(client, system.config[client]['db'].get('password', 'TYPO3_CONF_VARS__DB__Connections__Default__password'), system.config[client]['path']),
+            'port': get_database_setting_from_env(client, system.config[client]['db'].get('port', 'TYPO3_CONF_VARS__DB__Connections__Default__port'), system.config[client]['path'])
+            if get_database_setting_from_env(client, system.config[client]['db'].get('port', 'TYPO3_CONF_VARS__DB__Connections__Default__port'), system.config[client]['path']) != '' else 3306,
+            'user': get_database_setting_from_env(client, system.config[client]['db'].get('user', 'TYPO3_CONF_VARS__DB__Connections__Default__user'), system.config[client]['path']),
         }
     elif 'AdditionalConfiguration.php' in _path:
         # Try to parse settings from AdditionalConfiguration.php file
@@ -94,12 +96,7 @@ def get_database_setting_from_additional_configuration(client, name, file):
     :param file: String
     :return:
     """
-    return mode.run_command(
-        helper.get_command(client, 'sed') +
-        f' -nE "s/\'{name}\'.*=>.*\'(.*)\'.*$/\\1/p" {file}',
-        client,
-        True
-    ).replace('\n', '').strip()
+    return helper.run_sed_command(client, f'"s/\'{name}\'.*=>.*\'(.*)\'.*$/\\1/p" {file}')
 
 def get_database_setting_from_env(client, name, file):
     """
@@ -110,9 +107,4 @@ def get_database_setting_from_env(client, name, file):
     :param file: String
     :return:
     """
-    return mode.run_command(
-        helper.get_command(client, 'sed') +
-        f' -nE "s/{name}=(.*).*$/\\1/p" {file}',
-        client,
-        True
-    ).replace('\n', '').strip()
+    return helper.run_sed_command(client, f'"s/{name}=(.*).*$/\\1/p" {file}')

{db_sync_tool-kmi-2.11.8 → db_sync_tool_kmi-2.11.10}/db_sync_tool/utility/helper.py

@@ -351,3 +351,28 @@ def remove_surrounding_quotes(s):
         elif s.startswith("'") and s.endswith("'"):
             return s[1:-1]
     return s
+
+
+def run_sed_command(client, command):
+    """
+    Executes a sed command on the specified client, trying -E first and falling back to -r if -E fails.
+
+    :param client: The client on which the sed command should be executed.
+    :param command: The sed command to execute (excluding the sed options).
+    :return: The result of the sed command as a cleaned string (with newlines removed).
+    """
+    # Check if the client supports -E or -r option for sed
+    option = mode.run_command(
+         f"echo | {get_command(client, 'sed')} -E '' >/dev/null 2>&1 && echo -E || (echo | {get_command(client, 'sed')} -r '' >/dev/null 2>&1 && echo -r)",
+         client,
+         True
+    )
+    # If neither option is supported, default to -E
+    if option == '':
+        option = '-E'
+
+    return mode.run_command(
+        f"{get_command(client, 'sed')} -n {option} {command}",
+        client,
+        True
+    ).strip().replace('\n', '')

{db_sync_tool-kmi-2.11.8 → db_sync_tool_kmi-2.11.10}/db_sync_tool_kmi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: db-sync-tool-kmi
-Version: 2.11.8
+Metadata-Version: 2.4
+Name: db_sync_tool-kmi
+Version: 2.11.10
 Summary: Synchronize a database from and to host systems.
 Home-page: https://github.com/jackd248/db-sync-tool
 Author: Konrad Michalik
@@ -28,11 +28,24 @@ Requires-Dist: jsonschema>=4.2.1
 Requires-Dist: requests>=2.26.0
 Requires-Dist: semantic_version>=2.8.5
 Requires-Dist: yaspin>=2.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # db sync tool
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/db_sync_tool-kmi)
 ![PyPI](https://img.shields.io/pypi/v/db_sync_tool-kmi)
+![Pepy Total Downloads](https://img.shields.io/pepy/dt/db-sync-tool-kmi)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/db-sync-tool-kmi)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/?branch=master)
 [![Build Status](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/badges/build.png?b=master)](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/build-status/master)