meerschaum 2.3.0rc1__py3-none-any.whl → 2.3.0rc2__py3-none-any.whl

meerschaum/_internal/arguments/__init__.py

@@ -8,7 +8,7 @@ This package includes argument parsing utilities.
 
 from meerschaum._internal.arguments._parse_arguments import (
     parse_arguments, parse_line, remove_leading_action,
-    parse_dict_to_sysargs,
+    parse_dict_to_sysargs, split_chained_sysargs,
 )
 from meerschaum._internal.arguments._parser import parser
 from meerschaum.plugins import add_plugin_argument

meerschaum/_internal/arguments/_parse_arguments.py

@@ -19,6 +19,44 @@ _locks = {
 _loaded_plugins_args: bool = False
 
 
+def split_chained_sysargs(sysargs: List[str]) -> List[List[str]]:
+    """
+    Split a `sysargs` list containing "and" keys (`&&`)
+    into a list of individual `sysargs`.
+    """
+    from meerschaum.config.static import STATIC_CONFIG
+    and_key = STATIC_CONFIG['system']['arguments']['and_key']
+
+    if not sysargs or and_key not in sysargs:
+        return [sysargs]
+
+    ### Coalesce and consecutive joiners into one.
+    coalesce_args = []
+    previous_arg = None
+    for arg in [_arg for _arg in sysargs]:
+        if arg == and_key and previous_arg == and_key:
+            continue
+        coalesce_args.append(arg)
+        previous_arg = arg
+
+    ### Remove any joiners from the ends.
+    if coalesce_args[0] == and_key:
+        coalesce_args = coalesce_args[1:]
+    if coalesce_args[-1] == and_key:
+        coalesce_args = coalesce_args[:-1]
+
+    chained_sysargs = []
+    current_sysargs = []
+    for arg in coalesce_args:
+        if arg != and_key:
+            current_sysargs.append(arg)
+        else:
+            chained_sysargs.append(current_sysargs)
+            current_sysargs = []
+    chained_sysargs.append(current_sysargs)
+    return chained_sysargs
+
+
 def parse_arguments(sysargs: List[str]) -> Dict[str, Any]:
     """
     Parse a list of arguments into standard Meerschaum arguments.
@@ -206,9 +244,24 @@ def parse_dict_to_sysargs(
     args_dict: Dict[str, Any]
 ) -> List[str]:
     """Revert an arguments dictionary back to a command line list."""
+    import shlex
     from meerschaum._internal.arguments._parser import get_arguments_triggers
-    sysargs = []
-    sysargs += args_dict.get('action', [])
+    from meerschaum.config.static import STATIC_CONFIG
+    from meerschaum.utils.warnings import warn
+
+    and_key = STATIC_CONFIG['system']['arguments']['and_key']
+    if (line := args_dict.get('line', None)):
+        return shlex.split(line)
+
+    if (_sysargs := args_dict.get('sysargs', None)):
+        return _sysargs
+
+    action = args_dict.get('action', None)
+    if action and and_key in action:
+        warn(f"Cannot determine flags from chained actions:\n{args_dict}")
+
+    sysargs: List[str] = []
+    sysargs.extend(action or [])
     allow_none_args = {'location_keys'}
 
     triggers = get_arguments_triggers()
@@ -216,6 +269,7 @@ def parse_dict_to_sysargs(
     for a, t in triggers.items():
         if a == 'action' or a not in args_dict:
             continue
+
         ### Add boolean flags
         if isinstance(args_dict[a], bool):
             if args_dict[a] is True:

meerschaum/_internal/entry.py

@@ -40,31 +40,68 @@ def entry(sysargs: Optional[List[str]] = None) -> SuccessTuple:
     -------
     A `SuccessTuple` indicating success.
     """
-    from meerschaum._internal.arguments import parse_arguments
+    import shlex
+    from meerschaum.utils.formatting import make_header
+    from meerschaum._internal.arguments import parse_arguments, split_chained_sysargs
     from meerschaum.config.static import STATIC_CONFIG
     if sysargs is None:
         sysargs = []
     if not isinstance(sysargs, list):
-        import shlex
         sysargs = shlex.split(sysargs)
-    args = parse_arguments(sysargs)
-    argparse_exception = args.get(
-        STATIC_CONFIG['system']['arguments']['failure_key'],
-        None,
+
+    has_daemon = '-d' in sysargs or '--daemon' in sysargs
+    has_start_job = sysargs[:2] == ['start', 'job']
+    chained_sysargs = (
+        [sysargs]
+        if has_daemon or has_start_job
+        else split_chained_sysargs(sysargs)
     )
-    if argparse_exception is not None:
-        args_text = args.get('text', '')
-        if not args_text.startswith('show arguments'):
-            return (
-                False,
+    results: List[SuccessTuple] = []
+
+    for _sysargs in chained_sysargs:
+        args = parse_arguments(_sysargs)
+        argparse_exception = args.get(
+            STATIC_CONFIG['system']['arguments']['failure_key'],
+            None,
+        )
+        if argparse_exception is not None:
+            args_text = args.get('text', '')
+            if not args_text.startswith('show arguments'):
+                return (
+                    False,
+                    (
+                        "Invalid arguments:"
+                        + (f"\n{args_text}" if args_text else '')
+                        + f"\n    {argparse_exception}"
+                    )
+                )
+
+        entry_success, entry_msg = entry_with_args(**args)
+        if not entry_success:
+            return entry_success, entry_msg
+
+        results.append((entry_success, entry_msg))
+
+    success = all(_success for _success, _ in results)
+    msg = (
+        results[0][1]
+        if len(results) == 1
+        else 'Successfully completed steps:\n\n' + '\n'.join(
+            [
                 (
-                    "Invalid arguments:"
-                    + (f"\n{args_text}" if args_text else '')
-                    + f"\n    {argparse_exception}"
+                    make_header(shlex.join(_sysargs))
+                    + '\n    ' + _msg + '\n'
                 )
-            )
+                for i, ((_, _msg), _sysargs) in enumerate(zip(results, chained_sysargs))
+            ]
+        )
+    )
+    if _systemd_result_path:
+        import json
+        with open(_systemd_result_path, 'w+', encoding='utf-8') as f:
+            json.dump((success, msg), f)
 
-    return entry_with_args(**args)
+    return success, msg
 
 
 def entry_with_args(
@@ -79,7 +116,16 @@ def entry_with_args(
     import inspect
     from meerschaum.actions import get_action, get_main_action_name
     from meerschaum._internal.arguments import remove_leading_action
-    from meerschaum.utils.venv import Venv, active_venvs, deactivate_venv
+    from meerschaum.utils.venv import active_venvs, deactivate_venv
+    from meerschaum.config.static import STATIC_CONFIG
+
+    and_key = STATIC_CONFIG['system']['arguments']['and_key']
+    escaped_and_key = STATIC_CONFIG['system']['arguments']['escaped_and_key']
+    if and_key in (sysargs := kw.get('sysargs', [])):
+        if '-d' in sysargs or '--daemon' in sysargs:
+            sysargs = [(arg if arg != and_key else escaped_and_key) for arg in sysargs]
+        return entry(sysargs)
+
     if kw.get('trace', None):
         from meerschaum.utils.misc import debug_trace
         debug_trace()
@@ -159,11 +205,6 @@ def entry_with_args(
     for venv in [venv for venv in active_venvs]:
         deactivate_venv(venv, debug=kw.get('debug', False), force=True)
 
-    if _systemd_result_path:
-        import json
-        with open(_systemd_result_path, 'w+', encoding='utf-8') as f:
-            json.dump(result, f)
-
     return result
 
 

meerschaum/_internal/shell/Shell.py

@@ -8,6 +8,8 @@ This module is the entry point for the interactive shell.
 from __future__ import annotations
 import os
 from copy import deepcopy
+from itertools import chain
+
 from meerschaum.utils.typing import Union, SuccessTuple, Any, Callable, Optional, List, Dict
 from meerschaum.utils.packages import attempt_import
 from meerschaum.config import __doc__, __version__ as version, get_config
@@ -30,6 +32,12 @@ from meerschaum._internal.shell.ShellCompleter import ShellCompleter
 _clear_screen = get_config('shell', 'clear_screen', patch=True)
 from meerschaum.utils.misc import string_width, remove_ansi
 from meerschaum.jobs import get_executor_keys_from_context
+from meerschaum.config.static import STATIC_CONFIG
+from meerschaum._internal.arguments._parse_arguments import (
+    split_chained_sysargs,
+    parse_arguments,
+    parse_line,
+)
 
 patch = True
 ### remove default cmd2 commands
@@ -63,6 +71,8 @@ reserved_completers = {
 ### To handle dynamic reloading, store shell attributes externally.
 ### This is because the shell object address gets lost upon reloads.
 shell_attrs = {}
+AND_KEY: str = STATIC_CONFIG['system']['arguments']['and_key']
+ESCAPED_AND_KEY: str = STATIC_CONFIG['system']['arguments']['escaped_and_key']
 
 def _insert_shell_actions(
         _shell: Optional['Shell'] = None,
@@ -111,7 +121,6 @@ def _completer_wrapper(
         if _check_keys is not None:
             return _check_keys
 
-        from meerschaum._internal.arguments._parse_arguments import parse_line
         args = parse_line(line)
         if target.__name__ != 'default_action_completer':
             if len(args['action']) > 0:
@@ -149,7 +158,6 @@ def default_action_completer(
 
 def _check_complete_keys(line: str) -> Optional[List[str]]:
     from meerschaum._internal.arguments._parser import parser, get_arguments_triggers
-    from meerschaum._internal.arguments._parse_arguments import parse_line
 
     ### TODO Add all triggers
     trigger_args = {
@@ -546,16 +554,68 @@ class Shell(cmd.Cmd):
             else:
                 main_action_name = args['action'][0]
 
+        def _add_flag_to_sysargs(
+                chained_sysargs, key, value, flag, shell_key=None,
+            ):
+            shell_key = shell_key or key
+            shell_value = remove_ansi(shell_attrs.get(shell_key) or '')
+            if key == 'mrsm_instance':
+                default_value = get_config('meerschaum', 'instance')
+            elif key == 'repository':
+                default_value = get_config('meerschaum', 'default_repository')
+            elif key == 'executor_keys':
+                default_value = get_executor_keys_from_context()
+            else:
+                default_value = None
+
+            if shell_value == default_value:
+                return
+
+            for sysargs in chained_sysargs:
+                kwargs = parse_arguments(sysargs)
+                if key in kwargs:
+                    continue
+                sysargs.extend([flag, value])
+
+            args['sysargs'] = list(
+                chain.from_iterable(
+                    sub_sysargs + [AND_KEY]
+                    for sub_sysargs in chained_sysargs
+                )
+            )[:-1]
+
+
         ### if no instance is provided, use current shell default,
         ### but not for the 'api' command (to avoid recursion)
-        if 'mrsm_instance' not in args and main_action_name != 'api':
-            args['mrsm_instance'] = str(shell_attrs['instance_keys'])
+        if main_action_name != 'api':
+            chained_sysargs = split_chained_sysargs(args['sysargs'])
+            chained_filtered_sysargs = split_chained_sysargs(args['filtered_sysargs'])
+            mrsm_instance = shell_attrs['instance_keys']
+            args['mrsm_instance'] = mrsm_instance
+            _add_flag_to_sysargs(
+                chained_sysargs, 'mrsm_instance', mrsm_instance, '-i', 'instance_keys',
+            )
+            _add_flag_to_sysargs(
+                chained_filtered_sysargs, 'mrsm_instance', mrsm_instance, '-i', 'instance_keys',
+            )
 
-        if 'repository' not in args and main_action_name != 'api':
-            args['repository'] = str(shell_attrs['repo_keys'])
+            repo_keys = str(shell_attrs['repo_keys'])
+            args['repository'] = repo_keys
+            _add_flag_to_sysargs(
+                chained_sysargs, 'repository', repo_keys, '-r', 'repo_keys',
+            )
+            _add_flag_to_sysargs(
+                chained_filtered_sysargs, 'repository', repo_keys, '-r', 'repo_keys',
+            )
 
-        if 'executor_keys' not in args:
-            args['executor_keys'] = remove_ansi(str(shell_attrs['executor_keys']))
+            executor_keys = remove_ansi(str(shell_attrs['executor_keys']))
+            args['executor_keys'] = remove_ansi(executor_keys)
+            _add_flag_to_sysargs(
+                chained_sysargs, 'executor_keys', executor_keys, '-e',
+            )
+            _add_flag_to_sysargs(
+                chained_filtered_sysargs, 'executor_keys', executor_keys, '-e',
+            )
 
         ### parse out empty strings
         if args['action'][0].strip("\"'") == '':
@@ -630,12 +690,12 @@ class Shell(cmd.Cmd):
         info(f"Debug mode is {'on' if shell_attrs['debug'] else 'off'}.")
 
     def do_instance(
-            self,
-            action: Optional[List[str]] = None,
-            executor_keys=None,
-            debug: bool = False,
-            **kw: Any
-        ) -> SuccessTuple:
+        self,
+        action: Optional[List[str]] = None,
+        executor_keys=None,
+        debug: bool = False,
+        **kw: Any
+    ) -> SuccessTuple:
         """
         Temporarily set a default Meerschaum instance for the duration of the shell.
         The default instance is loaded from the Meerschaum configuraton file
@@ -804,6 +864,7 @@ class Shell(cmd.Cmd):
         from meerschaum import get_connector
         from meerschaum.connectors.parse import parse_executor_keys
         from meerschaum.utils.warnings import warn, info
+        from meerschaum.jobs import get_executor_keys_from_context
 
         if action is None:
             action = []
@@ -814,6 +875,10 @@ class Shell(cmd.Cmd):
             executor_keys = ''
         if executor_keys == '':
             executor_keys = get_executor_keys_from_context()
+
+        if executor_keys == 'systemd' and get_executor_keys_from_context() != 'systemd':
+            warn(f"Cannot execute via `systemd`, falling back to `local`...", stack=False)
+            executor_keys = 'local'
         
         conn = parse_executor_keys(executor_keys, debug=debug)
 
@@ -987,7 +1052,7 @@ def input_with_sigint(_input, session, shell: Optional[Shell] = None):
         )
 
         try:
-            typ, label = shell_attrs['instance_keys'].split(':')
+            typ, label = shell_attrs['instance_keys'].split(':', maxsplit=1)
             connected = typ in connectors and label in connectors[typ]
         except Exception as e:
             connected = False

meerschaum/actions/delete.py

@@ -509,12 +509,18 @@ def _complete_delete_jobs(
         get_stopped_jobs,
         get_paused_jobs,
         get_running_jobs,
+        get_executor_keys_from_context,
     )
     from meerschaum.utils.misc import remove_ansi
 
-    executor_keys = executor_keys or remove_ansi(shell_attrs.get('executor_keys', 'local'))
+    executor_keys = (
+        executor_keys
+        or remove_ansi(
+            shell_attrs.get('executor_keys', get_executor_keys_from_context())
+        )
+    )
 
-    jobs = get_jobs(executor_keys)
+    jobs = get_jobs(executor_keys, include_hidden=False)
     if _get_job_method:
         method_keys = [_get_job_method] if isinstance(_get_job_method, str) else _get_job_method
         method_jobs = {}
@@ -540,11 +546,11 @@ def _complete_delete_jobs(
 
 
 def _delete_venvs(
-        action: Optional[List[str]] = None,
-        yes: bool = False,
-        force: bool = False,
-        **kwargs: Any
-    ) -> SuccessTuple:
+    action: Optional[List[str]] = None,
+    yes: bool = False,
+    force: bool = False,
+    **kwargs: Any
+) -> SuccessTuple:
     """
     Remove virtual environments.
     Specify which venvs to remove, or remove everything at once.

meerschaum/actions/start.py

@@ -82,6 +82,7 @@ def _start_api(action: Optional[List[str]] = None, **kw):
     from meerschaum.actions import actions
     return actions['api'](action=['start'], **kw)
 
+
 def _start_jobs(
     action: Optional[List[str]] = None,
     name: Optional[str] = None,
@@ -119,25 +120,20 @@ def _start_jobs(
                 Start the job 'happy_seal' but via the `--name` flag.
                 This only applies when no text follows the words 'start job'.
     """
-    import textwrap
     from meerschaum.utils.warnings import warn, info
     from meerschaum.utils.daemon._names import get_new_daemon_name
     from meerschaum.jobs import (
         Job,
-        get_jobs,
         get_filtered_jobs,
         get_stopped_jobs,
         get_running_jobs,
         get_paused_jobs,
-        get_restart_jobs,
         _install_healthcheck_job,
     )
-    from meerschaum._internal.arguments._parse_arguments import parse_arguments
     from meerschaum.actions import actions
     from meerschaum.utils.prompt import yes_no
     from meerschaum.utils.formatting import print_tuple
-    from meerschaum.utils.formatting._jobs import pprint_job, pprint_jobs
-    from meerschaum.utils.formatting._shell import clear_screen
+    from meerschaum.utils.formatting._jobs import pprint_jobs
     from meerschaum.utils.misc import items_str
 
     names = []

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.3.0rc1"
+__version__ = "2.3.0rc2"

meerschaum/config/static/__init__.py

@@ -88,6 +88,8 @@ STATIC_CONFIG: Dict[str, Any] = {
             ),
             'underscore_standin': '<UNDERSCORE>', ### Temporary replacement for parsing.
             'failure_key': '_argparse_exception',
+            'and_key': '+',
+            'escaped_and_key': '++',
         },
         'urls': {
             'get-pip.py': 'https://bootstrap.pypa.io/get-pip.py',

meerschaum/connectors/parse.py

@@ -120,7 +120,6 @@ def parse_repo_keys(keys: Optional[str] = None, **kw):
 def parse_executor_keys(keys: Optional[str] = None, **kw):
     """Parse the executor keys into an APIConnector or string."""
     from meerschaum.jobs import get_executor_keys_from_context
-    from meerschaum.config import get_config
     if keys is None:
         keys = get_executor_keys_from_context()
 

meerschaum/jobs/_Job.py

@@ -91,6 +91,14 @@ class Job:
         if isinstance(sysargs, str):
             sysargs = shlex.split(sysargs)
 
+        and_key = STATIC_CONFIG['system']['arguments']['and_key']
+        escaped_and_key = STATIC_CONFIG['system']['arguments']['escaped_and_key']
+        if sysargs:
+            sysargs = [
+                (arg if arg != escaped_and_key else and_key)
+                for arg in sysargs
+            ]
+
         ### NOTE: 'local' and 'systemd' executors are being coalesced.
         if executor_keys is None:
             from meerschaum.jobs import get_executor_keys_from_context
@@ -831,7 +839,7 @@ class Job:
         """
         Return the job's Daemon label (joined sysargs).
         """
-        return shlex.join(self.sysargs)
+        return shlex.join(self.sysargs).replace(' + ', '\n+ ')
 
     def __str__(self) -> str:
         sysargs = self.sysargs

meerschaum/jobs/_SystemdExecutor.py

@@ -21,7 +21,7 @@ from meerschaum.jobs import Job, Executor, make_executor
 from meerschaum.utils.typing import Dict, Any, List, SuccessTuple, Union, Optional, Callable
 from meerschaum.config.static import STATIC_CONFIG
 from meerschaum.utils.warnings import warn, dprint
-from meerschaum._internal.arguments._parse_arguments import parse_arguments, parse_dict_to_sysargs
+from meerschaum._internal.arguments._parse_arguments import parse_arguments
 
 JOB_METADATA_CACHE_SECONDS: int = STATIC_CONFIG['api']['jobs']['metadata_cache_seconds']
 
@@ -36,11 +36,11 @@ class SystemdExecutor(Executor):
         """
         Return a list of existing jobs, including hidden ones.
         """
-        from meerschaum.config.paths import SYSTEMD_USER_RESOURCES_PATH
+        from meerschaum.config.paths import SYSTEMD_ROOT_RESOURCES_PATH
         return [
             service_name[len('mrsm-'):(-1 * len('.service'))]
-            for service_name in os.listdir(SYSTEMD_USER_RESOURCES_PATH)
-            if service_name.startswith('mrsm-')
+            for service_name in os.listdir(SYSTEMD_ROOT_RESOURCES_PATH)
+            if service_name.startswith('mrsm-') and service_name.endswith('.service')
         ]
 
     def get_job_exists(self, name: str, debug: bool = False) -> bool:
@@ -51,10 +51,10 @@ class SystemdExecutor(Executor):
         if debug:
             dprint(f'Existing services: {user_services}')
         return name in user_services
-    
+
     def get_jobs(self, debug: bool = False) -> Dict[str, Job]:
         """
-        Return a dictionary of `systemd` Jobs (excluding hidden jobs).
+        Return a dictionary of `systemd` Jobs (including hidden jobs).
         """
         user_services = self.get_job_names(debug=debug)
         jobs = {
@@ -64,7 +64,6 @@ class SystemdExecutor(Executor):
         return {
             name: job
             for name, job in jobs.items()
-            if not job.hidden
         }
 
     def get_service_name(self, name: str, debug: bool = False) -> str:
@@ -73,13 +72,20 @@ class SystemdExecutor(Executor):
         """
         return f"mrsm-{name.replace(' ', '-')}.service"
 
-    def get_service_file_path(self, name: str, debug: bool = False) -> pathlib.Path:
+    def get_service_symlink_file_path(self, name: str, debug: bool = False) -> pathlib.Path:
         """
-        Return the path to a Job's service file.
+        Return the path to where to create the service symlink.
         """
         from meerschaum.config.paths import SYSTEMD_USER_RESOURCES_PATH
         return SYSTEMD_USER_RESOURCES_PATH / self.get_service_name(name, debug=debug)
 
+    def get_service_file_path(self, name: str, debug: bool = False) -> pathlib.Path:
+        """
+        Return the path to a Job's service file.
+        """
+        from meerschaum.config.paths import SYSTEMD_ROOT_RESOURCES_PATH
+        return SYSTEMD_ROOT_RESOURCES_PATH / self.get_service_name(name, debug=debug)
+
     def get_service_logs_path(self, name: str, debug: bool = False) -> pathlib.Path:
         """
         Return the path to direct service logs to.
@@ -150,8 +156,7 @@ class SystemdExecutor(Executor):
             "\n"
             "[Service]\n"
             f"ExecStart={exec_str}\n"
-            "KillSignal=SIGINT\n"
-            "TimeoutStopSpec=8\n"
+            "KillSignal=SIGTERM\n"
             "Restart=always\n"
             "RestartPreventExitStatus=0\n"
             f"SyslogIdentifier={service_name}\n"
@@ -180,23 +185,11 @@ class SystemdExecutor(Executor):
         )
         return socket_text
 
-    @staticmethod
-    def clean_sysargs(sysargs: List[str]) -> List[str]:
-        """
-        Return a sysargs list with the executor key set to 'local'.
-        """
-        kwargs = parse_arguments(sysargs)
-        _ = kwargs.pop('executor_keys', None)
-        _ = kwargs.pop('systemd', None)
-        return parse_dict_to_sysargs(kwargs)
-
     def get_hidden_job(self, name: str, sysargs: Optional[List[str]] = None, debug: bool = False):
         """
         Return the hidden "sister" job to store a job's parameters.
         """
         hidden_name = f'.systemd-{self.get_service_name(name, debug=debug)}' 
-        if sysargs:
-            sysargs = self.clean_sysargs(sysargs)
 
         return Job(
             hidden_name,
@@ -309,6 +302,9 @@ class SystemdExecutor(Executor):
             return None
 
         pid_str = output[len('MainPID='):]
+        if pid_str == '0':
+            return None
+
         if is_int(pid_str):
             return int(pid_str)
         
@@ -438,19 +434,19 @@ class SystemdExecutor(Executor):
         """
         Create a job as a service to be run by `systemd`.
         """
-
+        from meerschaum.utils.misc import make_symlink
         service_name = self.get_service_name(name, debug=debug)
         service_file_path = self.get_service_file_path(name, debug=debug)
-        service_socket_path = self.get_service_socket_path(name, debug=debug)
-        socket_path = self.get_socket_path(name, debug=debug)
+        service_symlink_file_path = self.get_service_symlink_file_path(name, debug=debug)
         socket_stdin = self.get_job_stdin_file(name, debug=debug)
         _ = socket_stdin.file_handler
 
-        job = self.get_hidden_job(name, sysargs, debug=debug)
-
-        clean_sysargs = self.clean_sysargs(sysargs)
         with open(service_file_path, 'w+', encoding='utf-8') as f:
-            f.write(self.get_service_file_text(name, clean_sysargs, debug=debug))
+            f.write(self.get_service_file_text(name, sysargs, debug=debug))
+
+        symlink_success, symlink_msg = make_symlink(service_file_path, service_symlink_file_path)
+        if not symlink_success:
+            return symlink_success, symlink_msg
 
         commands = [
             ['daemon-reload'],
@@ -494,6 +490,18 @@ class SystemdExecutor(Executor):
         """
         job = self.get_hidden_job(name, debug=debug)
         job.daemon._write_stop_file('quit')
+        sigint_success, sigint_msg = self.run_command(
+            ['kill', '-s', 'SIGINT', self.get_service_name(name, debug=debug)],
+            debug=debug,
+        )
+
+        loop_start = time.perf_counter()
+        while (time.perf_counter() - loop_start) < 5:
+            if self.get_job_status(name, debug=debug) == 'stopped':
+                return True, 'Success'
+
+            time.sleep(0.1)
+
         return self.run_command(
             ['stop', self.get_service_name(name, debug=debug)],
             debug=debug,
@@ -516,28 +524,25 @@ class SystemdExecutor(Executor):
         """
         from meerschaum.config.paths import SYSTEMD_LOGS_RESOURCES_PATH
 
-        stop_success, stop_msg = self.stop_job(name, debug=debug)
-        if not stop_success:
-            return stop_success, stop_msg
-
-        disable_success, disable_msg = self.run_command(
+        _ = self.stop_job(name, debug=debug)
+        _ = self.run_command(
             ['disable', self.get_service_name(name, debug=debug)],
             debug=debug,
         )
-        if not disable_success:
-            return disable_success, disable_msg
 
-        service_file_path = self.get_service_file_path(name, debug=debug)
-        service_socket_path = self.get_service_socket_path(name, debug=debug)
-        socket_path = self.get_socket_path(name, debug=debug)
-        result_path = self.get_result_path(name, debug=debug)
         service_logs_path = self.get_service_logs_path(name, debug=debug)
         logs_paths = [
             (SYSTEMD_LOGS_RESOURCES_PATH / name)
             for name in os.listdir(SYSTEMD_LOGS_RESOURCES_PATH)
             if name.startswith(service_logs_path.name + '.')
         ]
-        paths = [service_file_path, service_socket_path, socket_path, result_path] + logs_paths
+        paths = [
+            self.get_service_file_path(name, debug=debug),
+            self.get_service_symlink_file_path(name, debug=debug),
+            self.get_socket_path(name, debug=debug),
+            self.get_result_path(name, debug=debug),
+        ] + logs_paths
+
         for path in paths:
             if path.exists():
                 try:
@@ -547,7 +552,7 @@ class SystemdExecutor(Executor):
                     return False, str(e)
 
         job = self.get_hidden_job(name, debug=debug)
-        job.delete()
+        _ = job.delete()
 
         return self.run_command(['daemon-reload'], debug=debug)
 

meerschaum/jobs/__init__.py

@@ -55,10 +55,11 @@ def get_jobs(
     -------
     A dictionary mapping job names to jobs.
     """
-    from meerschaum.connectors.parse import parse_connector_keys
+    from meerschaum.connectors.parse import parse_executor_keys
     include_local_and_system = (
         combine_local_and_systemd
-        and str(executor_keys).split(':')[0] in ('None', 'local', 'systemd')
+        and str(executor_keys).split(':', maxsplit=1)[0] in ('None', 'local', 'systemd')
+        and get_executor_keys_from_context() == 'systemd'
     )
 
     def _get_local_jobs():
@@ -76,7 +77,12 @@ def get_jobs(
 
     def _get_systemd_jobs():
         conn = mrsm.get_connector('systemd')
-        return conn.get_jobs(debug=debug)
+        jobs = conn.get_jobs(debug=debug)
+        return {
+            name: job
+            for name, job in jobs.items()
+            if include_hidden or not job.hidden
+        }
 
     if include_local_and_system:
         local_jobs = _get_local_jobs()
@@ -97,9 +103,14 @@ def get_jobs(
         return {**local_jobs, **systemd_jobs}
 
     try:
-        _ = parse_connector_keys(executor_keys, construct=False)
-        conn = mrsm.get_connector(executor_keys)
-        return conn.get_jobs(debug=debug)
+        _ = parse_executor_keys(executor_keys, construct=False)
+        conn = parse_executor_keys(executor_keys)
+        jobs = conn.get_jobs(debug=debug)
+        return {
+            name: job
+            for name, job in jobs.items()
+            if include_hidden or not job.hidden
+        }
     except Exception:
         return {}
 
@@ -115,10 +126,13 @@ def get_filtered_jobs(
     Return a list of jobs filtered by the user.
     """
     from meerschaum.utils.warnings import warn as _warn
-    jobs = get_jobs(executor_keys, include_hidden=include_hidden, debug=debug)
-
+    jobs = get_jobs(executor_keys, include_hidden=True, debug=debug)
     if not filter_list:
-        return jobs
+        return {
+            name: job
+            for name, job in jobs.items()
+            if include_hidden or not job.hidden
+        }
 
     jobs_to_return = {}
     for name in filter_list:
@@ -337,17 +351,26 @@ def stop_check_jobs_thread():
         warn(f"Failed to remove check jobs lock file:\n{e}")
 
 
+_context_keys = None
 def get_executor_keys_from_context() -> str:
     """
     If we are running on the host with the default root, default to `'systemd'`.
     Otherwise return `'local'`.
     """
+    global _context_keys
+
+    if _context_keys is not None:
+        return _context_keys
+
     from meerschaum.config.paths import ROOT_DIR_PATH, DEFAULT_ROOT_DIR_PATH
     from meerschaum.utils.misc import is_systemd_available
-    if is_systemd_available() and ROOT_DIR_PATH == DEFAULT_ROOT_DIR_PATH:
-        return 'systemd'
 
-    return 'local' 
+    _context_keys = (
+        'systemd'
+        if is_systemd_available() and ROOT_DIR_PATH == DEFAULT_ROOT_DIR_PATH
+        else 'local'
+    )
+    return _context_keys
 
 
 def _install_healthcheck_job() -> SuccessTuple:

meerschaum/utils/formatting/_jobs.py

@@ -112,17 +112,14 @@ def pprint_jobs(
 
 
         for name, job in running_jobs.items():
-            if job.hidden:
-                continue
-
             status_group = [
                 (
                     rich_text.Text(job.status, style=('green' if ANSI else ''))
                     if not job.is_blocking_on_stdin()
                     else rich_text.Text('waiting for input', style=('yellow' if ANSI else ''))
                 ),
-                rich_text.Text(f'PID: {job.pid}'),
-            ]
+            ] + ([rich_text.Text(f"PID: {pid}")] if (pid := job.pid) else [])
+
             if job.restart:
                 status_group.append(rich_text.Text('(restarts)'))
 
@@ -134,9 +131,6 @@ def pprint_jobs(
             )
 
         for name, job in paused_jobs.items():
-            if job.hidden:
-                continue
-
             status_group = [
                 rich_text.Text(job.status, style=('yellow' if ANSI else '')),
             ]
@@ -151,9 +145,6 @@ def pprint_jobs(
             )
 
         for name, job in stopped_jobs.items():
-            if job.hidden:
-                continue
-
             status_group = [
                 rich_text.Text(job.status, style=('red' if ANSI else '')),
             ]
@@ -182,9 +173,6 @@ def pprint_job(
     nopretty: bool = False,
 ):
     """Pretty-print a single `Job`."""
-    if job.hidden:
-        return
-
     from meerschaum.utils.warnings import info
     if not nopretty:
         info(f"Command for job '{job.name}':")

{meerschaum-2.3.0rc1.dist-info → meerschaum-2.3.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.3.0rc1
+Version: 2.3.0rc2
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.3.0rc1.dist-info → meerschaum-2.3.0rc2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 meerschaum/__init__.py,sha256=rzLJwaiLJvc_VAOjUM6pzKlm-w8NhHrOCH99Ob1vrjY,1736
 meerschaum/__main__.py,sha256=r5UjYxH1WA6dGG9YGBPul5xOdgF3Iwl0X4dWDtXU-30,2646
 meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iyEf4,169
-meerschaum/_internal/entry.py,sha256=Le-BekTma050RSmR8LBFWbrhSwCEl7XRbE52J3pSW2A,7497
-meerschaum/_internal/arguments/__init__.py,sha256=HFciFQgo2ZOT19Mo6CpLhPYlpLYh2sNn1C9Lo7NMADc,519
-meerschaum/_internal/arguments/_parse_arguments.py,sha256=EJfxtQJcoc0DBTTUHLTbC1cwe_K_WAiNOXMLEXGQ7vE,10708
+meerschaum/_internal/entry.py,sha256=D5w3j7w_pWlxfhh-vr1Ao7fzfIIEhUtXc_UTVpy-6GQ,9001
+meerschaum/_internal/arguments/__init__.py,sha256=lZ6YJM5buApdEOOJz61gRdpv1ICbifbiepArBT8hztQ,542
+meerschaum/_internal/arguments/_parse_arguments.py,sha256=Xf5KoHEd3LDSomyXmTb0Kr8cb60AGfCZcGPVsRcq7Kc,12374
 meerschaum/_internal/arguments/_parser.py,sha256=7vjKEuevFNE48idGz1Jj5dps1-Wq462iXDsOLQfiYcQ,14998
 meerschaum/_internal/docs/__init__.py,sha256=ZQYHWo6n0kfLLkyG36YXqTYvv2Pc7it5HZHMylT6cBA,126
 meerschaum/_internal/docs/index.py,sha256=Qovl1fI-KqCz7KtxCIWklqUGUcJ8Sbx4UKAEarrUn_A,18056
@@ -12,7 +12,7 @@ meerschaum/_internal/gui/app/__init__.py,sha256=rKUa8hHk6Fai-PDF61tQcpT1myxKcfmv
 meerschaum/_internal/gui/app/_windows.py,sha256=-VHdjTzA3V596fVqnbmTxemONSp_80-sTNJ0CTB8FwU,2632
 meerschaum/_internal/gui/app/actions.py,sha256=rx37qXf3uoa7Ou0n1cISqNFZNL0nr4wO7vSUmWO8f2E,935
 meerschaum/_internal/gui/app/pipes.py,sha256=4nAQ0rrHb_2bNgDF0Ru2YlbPaCDDzAl5beOGU4Af-4A,1596
-meerschaum/_internal/shell/Shell.py,sha256=NX7NQUrRf6xIl7dujbpyVoNAaVRaxhmGonGn46WRTtc,36939
+meerschaum/_internal/shell/Shell.py,sha256=l6_WDD55H_KcH1auqTgadHSyWBpKnJ2FnanYapGXh5k,39437
 meerschaum/_internal/shell/ShellCompleter.py,sha256=bbG-mExNXO4pltWBOXdbMp8P2wLgy8_BgipIr5aGp5s,3114
 meerschaum/_internal/shell/ValidAutoSuggest.py,sha256=bARjOWMidz0dvMelLUe6yRPto5l3gcEHYHqFDjoh22I,1280
 meerschaum/_internal/shell/__init__.py,sha256=vXQoQPEVlYiUYai1b5AwQAlTnja6A2cSABnqXhzlS7I,281
@@ -28,7 +28,7 @@ meerschaum/actions/bootstrap.py,sha256=9D3cBHzgZbZyWy-Y7iQgk9bpTbKEhumFKbIIThZgP
 meerschaum/actions/clear.py,sha256=OoFZE0bK5m8s3GLNZcixuVT0DMj1izXVxGCATcmUGbI,4851
 meerschaum/actions/copy.py,sha256=hLRc81oVBjnV22lpeSDb-HsDX2on9K2u6C1H8qJITNQ,6844
 meerschaum/actions/deduplicate.py,sha256=puYyxeFYEUy1Sd2IOcZB2e6MrNxAZl2bTLmNzFDkCiw,1167
-meerschaum/actions/delete.py,sha256=j_GiWsBTt_-1zZukkP8YJEf20AqkAiGgJM0NcOc3Vsc,18710
+meerschaum/actions/delete.py,sha256=GRokg2NRzlow2UMYXNs9xwBu-9AuJdK6kAxsxgwp-E0,18823
 meerschaum/actions/drop.py,sha256=Hd5h4rrWd7qL2rTqglsTonUsEoH7qQlsfqNFSHGeqr0,2453
 meerschaum/actions/edit.py,sha256=6d1Y8Ejd4zQWVARvx04cvbGyRA2r4ihJXWqMFiFX0aM,11740
 meerschaum/actions/install.py,sha256=jdhOrR_KlvinTKr0YJNkUHsnh5EY6OzA7cRq0Vnp1oU,7494
@@ -44,7 +44,7 @@ meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
 meerschaum/actions/show.py,sha256=JAyDWFUVDoRY--ehFEsrso7vrj_wdoxgqL6z-bIF6os,28158
 meerschaum/actions/sql.py,sha256=wYofwk1vGO96U2ncigGEfMtYMZeprz2FR1PRRZhkAPI,4311
 meerschaum/actions/stack.py,sha256=7ODAxzmCx8i9AHxvkbr5ZtzUNPpY-iqlSVo4rZHMOw4,5900
-meerschaum/actions/start.py,sha256=tPN_Sl4lQPmLllRTzKH5ZCNsvyC9Nd5ImAB2f0T3LaI,17708
+meerschaum/actions/start.py,sha256=e0Ca01VRSu5BQDMec8C9A6c9yfSX6LpIkCTecxa1u8Q,17489
 meerschaum/actions/stop.py,sha256=5fdUw70YN-yuUWrC-NhA88cxr9FZ5NbssbQ8xXO8nFU,4632
 meerschaum/actions/sync.py,sha256=AkH-1O5bkUC-UElQGr0lRhrX-z18ZY2nBPSy9EsW1Kc,17506
 meerschaum/actions/tag.py,sha256=SJf5qFW0ccLXjqlTdkK_0MCcrCMdg6xhYrhKdco0hdA,3053
@@ -140,7 +140,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=72j-dU_H0nKu_aipfQemECmHjrsxky5_Tu3bUnQZup4,74
+meerschaum/config/_version.py,sha256=bfQh2_v-HpBVdlfw2zoIhMos9XaCBgtxmAFNwHxb3HM,74
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=Yt7GNzC_hz7iUDZ4gVho_lugJO2DnXgnMtsMG_ReoRg,9114
@@ -148,10 +148,10 @@ meerschaum/config/stack/grafana/__init__.py,sha256=LNXQw2FvHKrD68RDhqDmi2wJjAHaK
 meerschaum/config/stack/mosquitto/__init__.py,sha256=-OwOjq8KiBoSH_pmgCAAF3Dp3CRD4KgAEdimZSadROs,186
 meerschaum/config/stack/mosquitto/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meerschaum/config/static/__init__.py,sha256=LJmBS3hPMGJoi51OBRoACfpKECucTiC5R3FwghlioFw,4987
+meerschaum/config/static/__init__.py,sha256=CvyWdb4B97PFjtNQx0mcz7g-kSbmDElipULUaKYav7k,5052
 meerschaum/connectors/Connector.py,sha256=utNV3Fy5DhUVbQE-vtm7enH5rH2gxQERmgmP7PUzH30,6682
 meerschaum/connectors/__init__.py,sha256=b1RdpMUNWtA5Q4KbymeUt9HtEiMWUHf0BBXzcl4itkc,12557
-meerschaum/connectors/parse.py,sha256=MdCKHpEO3m9evB1sYd969qZgdoRp-BByPi9FvQzUCUs,4352
+meerschaum/connectors/parse.py,sha256=sDeI2OIS9Inwhbn9jkFAXxOPnmmAHqsuHiiHfWjVnSA,4307
 meerschaum/connectors/poll.py,sha256=gIY9TvFBqMvMNQvR0O2No7koLLz2PjfExBr_Dsosgpg,7363
 meerschaum/connectors/api/APIConnector.py,sha256=xe1Bsbnh5PBNR2r5yr6iqJ1UozEKXWJBZnUU0qdXC7c,4934
 meerschaum/connectors/api/__init__.py,sha256=JwKrGtuE5aOd2VnsRwudFBYyBf5IxczOwPVdNvCUgSQ,205
@@ -201,10 +201,10 @@ meerschaum/core/Plugin/__init__.py,sha256=UXg64EvJPgI1PCxkY_KM02-ZmBm4FZpLPIQR_u
 meerschaum/core/User/_User.py,sha256=CApB7Y0QJL6S9QOCCfrG4SbPuPXJ9AsAYQ5pASMP_Aw,6527
 meerschaum/core/User/__init__.py,sha256=lJ7beIZTG9sO4dAi3367fFBl17dXYEWHKi7HoaPlDyk,193
 meerschaum/jobs/_Executor.py,sha256=ZUsQl0hgU0HW_F9bQCfm8KwrdyTBLCrfxsSnbJOwtWI,1575
-meerschaum/jobs/_Job.py,sha256=V8CDNc4hlkMrF0B8DCiNRxU2n2yLdU41OtHU367WUCY,28433
+meerschaum/jobs/_Job.py,sha256=a0bND2kun57FZk8lthO7J6SQseVpkGhn7hmCo0_am-E,28759
 meerschaum/jobs/_LocalExecutor.py,sha256=v_zvU1vgJDy-iiztXS5gnMayJ0UZnW48qJj3OSB6o-k,2195
-meerschaum/jobs/_SystemdExecutor.py,sha256=eBqbkhQmwxwAcX5QoOHJyYJahGS0_uSd8BtbNJomd1E,20832
-meerschaum/jobs/__init__.py,sha256=6Vfwpxs64Y4aou70n0HTzZPvCdw_obb6x0FdUuljvwY,10046
+meerschaum/jobs/_SystemdExecutor.py,sha256=Us3MH3KmAJxjLJPJPmegBlZy8HExgRIylNPb7Wro-qk,20933
+meerschaum/jobs/__init__.py,sha256=Lhox8AboqyKmRyq13elSHq85rSDEuz0AQkoFW3PVzr8,10662
 meerschaum/plugins/_Plugin.py,sha256=q1B4gVAO2BGA-PIR0HI3-O9q1n8BaT7tSANIyW7gUPg,34084
 meerschaum/plugins/__init__.py,sha256=3Hg9yyfkN0TxPPTnlt6pi53znjRIAR92WpG3zEKYm10,26152
 meerschaum/plugins/bootstrap.py,sha256=qg9MQ1YAU8ShwGqWDl38WjiXLIxDPl95pSIGDLN9rOw,11423
@@ -233,7 +233,7 @@ meerschaum/utils/daemon/_names.py,sha256=Prf7xA2GWDbKR_9Xq9_5RTTIf9GNWY3Yt0s4tEU
 meerschaum/utils/dtypes/__init__.py,sha256=JR9PViJTzhukZhq0QoPIs73HOnXZZr8OmfhAAD4OAUA,6261
 meerschaum/utils/dtypes/sql.py,sha256=IkEOyB63je-rCLHM6WwFzGbCerYk1zobL1cXkWqmTa4,14638
 meerschaum/utils/formatting/__init__.py,sha256=NcNPxXRSnKZAIBxAD0ictCjVBzYzFtOwpf2CDMfr4_Y,15354
-meerschaum/utils/formatting/_jobs.py,sha256=ezUAqEetTxFNoontyJq8fbqg8ntzYgq_AdNRpPZzPAw,6817
+meerschaum/utils/formatting/_jobs.py,sha256=izsqPJhTtUkXUUtWnbXtReYsUYwulXtci3pBj72Ne64,6637
 meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZvAQAqef4A,19492
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=jsjf_GMXBpGNBbpT7skTUZrHZl5HooFzffRDc4hz5Tc,3786
@@ -242,11 +242,11 @@ meerschaum/utils/packages/_packages.py,sha256=GzbJ0kxW_EQogXmY4vguRkUyad42cshFs7
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=bLAWnllKDuE_z6bLk7gLh4mI3Sp1j5hsboTqPKOQq84,24361
-meerschaum-2.3.0rc1.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.3.0rc1.dist-info/METADATA,sha256=Rc_33sXeMLhZQ14qcInaTWYrQ_N2SfvO4cR9cCbOWrI,24009
-meerschaum-2.3.0rc1.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.3.0rc1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-meerschaum-2.3.0rc1.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.3.0rc1.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.3.0rc1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.3.0rc1.dist-info/RECORD,,
+meerschaum-2.3.0rc2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.3.0rc2.dist-info/METADATA,sha256=e_ahh83m8FwVMO1VezxSC_WnK-XJoDUNzmIkFgXbFs8,24009
+meerschaum-2.3.0rc2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.3.0rc2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+meerschaum-2.3.0rc2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.3.0rc2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.3.0rc2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.3.0rc2.dist-info/RECORD,,