X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44c95f99098fa6c6acbfa82d4b6cbc6015eb6e39..8f987a9271eda80697b3a8fc53e7ebb0f93816f9:/sdk/python/arvados/commands/put.py diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py index cd55914614..ec4ae8fb6f 100644 --- a/sdk/python/arvados/commands/put.py +++ b/sdk/python/arvados/commands/put.py @@ -168,6 +168,8 @@ using a path-like pattern like 'subdir/*.txt', all text files inside 'subdir' directory, relative to the provided input dirs will be excluded. When using a filename pattern like '*.txt', any text file will be excluded no matter where is placed. +For the special case of needing to exclude only files or dirs directly below +the given input directory, you can use a pattern like './exclude_this.gif'. You can specify multiple patterns by using this argument more than once. """) @@ -191,6 +193,11 @@ Display machine-readable progress on stderr (bytes and, if known, total data size). """) +_group.add_argument('--silent', action='store_true', + help=""" +Do not print any debug messages to console. (Any error messages will still be displayed.) +""") + _group = run_opts.add_mutually_exclusive_group() _group.add_argument('--resume', action='store_true', default=True, help=""" @@ -241,7 +248,7 @@ def parse_arguments(arguments): """) # Turn on --progress by default if stderr is a tty. - if (not (args.batch_progress or args.no_progress) + if (not (args.batch_progress or args.no_progress or args.silent) and os.isatty(sys.stderr.fileno())): args.progress = True @@ -456,8 +463,8 @@ class ArvPutUploadJob(object): """ # If there aren't special files to be read, reset total bytes count to zero # to start counting. - if not any(filter(lambda p: not (os.path.isfile(p) or os.path.isdir(p)), - self.paths)): + if not any([p for p in self.paths + if not (os.path.isfile(p) or os.path.isdir(p))]): self.bytes_expected = 0 for path in self.paths: @@ -490,22 +497,20 @@ class ArvPutUploadJob(object): root_relpath = '' # Exclude files/dirs by full path matching pattern if self.exclude_paths: - dirs[:] = list(filter( - lambda d: not any( - [pathname_match(os.path.join(root_relpath, d), - pat) - for pat in self.exclude_paths]), - dirs)) - files = list(filter( - lambda f: not any( - [pathname_match(os.path.join(root_relpath, f), - pat) - for pat in self.exclude_paths]), - files)) + dirs[:] = [d for d in dirs + if not any(pathname_match( + os.path.join(root_relpath, d), pat) + for pat in self.exclude_paths)] + files = [f for f in files + if not any(pathname_match( + os.path.join(root_relpath, f), pat) + for pat in self.exclude_paths)] # Exclude files/dirs by name matching pattern if self.exclude_names is not None: - dirs[:] = list(filter(lambda d: not self.exclude_names.match(d), dirs)) - files = list(filter(lambda f: not self.exclude_names.match(f), files)) + dirs[:] = [d for d in dirs + if not self.exclude_names.match(d)] + files = [f for f in files + if not self.exclude_names.match(f)] # Make os.walk()'s dir traversing order deterministic dirs.sort() files.sort() @@ -705,6 +710,7 @@ class ArvPutUploadJob(object): elif file_in_local_collection.permission_expired(): # Permission token expired, re-upload file. This will change whenever # we have a API for refreshing tokens. + self.logger.warning("Uploaded file '{}' access token expired, will re-upload it from scratch".format(filename)) should_upload = True self._local_collection.remove(filename) elif cached_file_data['size'] == file_in_local_collection.size(): @@ -922,7 +928,7 @@ _machine_format = "{} {}: {{}} written {{}} total\n".format(sys.argv[0], def pathname_match(pathname, pattern): name = pathname.split(os.sep) # Fix patterns like 'some/subdir/' or 'some//subdir' - pat = [x for x in pattern.split(os.sep) if x != ''] + pat = [x for x in pattern.split(os.sep) if x != '' and x != '.'] if len(name) != len(pat): return False for i in range(len(name)): @@ -964,9 +970,12 @@ def desired_project_uuid(api_client, project_uuid, num_retries): def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr): global api_client - logger = logging.getLogger('arvados.arv_put') - logger.setLevel(logging.INFO) args = parse_arguments(arguments) + logger = logging.getLogger('arvados.arv_put') + if args.silent: + logger.setLevel(logging.WARNING) + else: + logger.setLevel(logging.INFO) status = 0 if api_client is None: api_client = arvados.api('v1') @@ -1011,35 +1020,37 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr): exclude_names = None if len(args.exclude) > 0: # We're supporting 2 kinds of exclusion patterns: - # 1) --exclude '*.jpg' (file/dir name patterns, will only match - # the name) - # 2) --exclude 'foo/bar' (file/dir path patterns, will match the + # 1) --exclude '*.jpg' (file/dir name patterns, will only match + # the name, wherever the file is on the tree) + # 2.1) --exclude 'foo/bar' (file/dir path patterns, will match the # entire path, and should be relative to # any input dir argument) + # 2.2) --exclude './*.jpg' (Special case for excluding files/dirs + # placed directly underneath the input dir) for p in args.exclude: # Only relative paths patterns allowed if p.startswith(os.sep): logger.error("Cannot use absolute paths with --exclude") sys.exit(1) if os.path.dirname(p): - # We don't support of path patterns with '.' or '..' + # We don't support of path patterns with '..' p_parts = p.split(os.sep) - if '.' in p_parts or '..' in p_parts: + if '..' in p_parts: logger.error( - "Cannot use path patterns that include '.' or '..'") + "Cannot use path patterns that include or '..'") sys.exit(1) # Path search pattern exclude_paths.append(p) else: # Name-only search pattern name_patterns.append(p) - # For name only matching, we can combine all patterns into a single regexp, - # for better performance. + # For name only matching, we can combine all patterns into a single + # regexp, for better performance. exclude_names = re.compile('|'.join( [fnmatch.translate(p) for p in name_patterns] )) if len(name_patterns) > 0 else None - # Show the user the patterns to be used, just in case they weren't specified inside - # quotes and got changed by the shell expansion. + # Show the user the patterns to be used, just in case they weren't + # specified inside quotes and got changed by the shell expansion. logger.info("Exclude patterns: {}".format(args.exclude)) # If this is used by a human, and there's at least one directory to be @@ -1133,7 +1144,7 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr): # Print the locator (uuid) of the new collection. if output is None: status = status or 1 - else: + elif not args.silent: stdout.write(output) if not output.endswith('\n'): stdout.write('\n')