diff --git a/dandi/organize.py b/dandi/organize.py index c54f7e04c..e686f60ab 100644 --- a/dandi/organize.py +++ b/dandi/organize.py @@ -9,7 +9,6 @@ from collections.abc import Sequence from copy import deepcopy from enum import Enum -import logging import os import os.path as op from pathlib import Path, PurePosixPath @@ -312,24 +311,22 @@ def _assign_obj_id(metadata, non_unique): non_unique_paths = sorted(non_unique) # provide more information to the user - def get_msg(path, indent=" "): + def get_msg(path): in_paths = non_unique[path] - return ( - f"{len(in_paths)} paths 'compete' for the path {path!r}:" - + f"\n{indent}".join([""] + in_paths) + return f"{len(in_paths)} paths 'compete' for the path {path!r}:" + "\n ".join( + [""] + in_paths ) msg += "\n " + get_msg(non_unique_paths[0]) if len(non_unique) > 1: - if not lgr.isEnabledFor(logging.DEBUG): - msg += ( - " Rerun with logging at DEBUG level '-l debug' " - "to see {len(non_unique) - 1} more cases." - ) - else: - for ex_path in non_unique_paths[1:]: - msg += "\n " + get_msg(ex_path) - lgr.info("%s\n We will try adding _obj- based on crc32 of object_id", msg) + msg += f"\n {len(non_unique) - 1} more case(s) are listed at DEBUG level." + lgr.info("%s", msg) + if len(non_unique) > 1: + msg = "Additional non-unique paths:" + for ex_path in non_unique_paths[1:]: + msg += "\n " + get_msg(ex_path) + lgr.debug("%s", msg) + lgr.info("We will try adding _obj- based on crc32 of object_id") seen_obj_ids = {} # obj_id: object_id seen_object_ids = {} # object_id: path recent_nwb_msg = "NWB>=2.1.0 standard (supported by pynwb>=1.1.0)."