cloud-files 4.27.0__py3-none-any.whl → 6.0.0__py3-none-any.whl

cloudfiles_cli/cloudfiles_cli.py

@@ -1,5 +1,6 @@
 from collections import defaultdict
 from concurrent.futures import ProcessPoolExecutor
+from datetime import datetime, timezone
 from functools import partial
 import itertools
 import json
@@ -16,8 +17,7 @@ import sys
 # High Sierra and above when we are using
 # a thread before forking. Instead, don't fork,
 # spawn entirely new processes.
-import multiprocess.context as ctx
-ctx._force_start_method('spawn')
+mp.set_start_method("spawn", force=True)
 
 import click
 import pathos.pools
@@ -25,9 +25,10 @@ import pathos.pools
 import cloudfiles
 import cloudfiles.paths
 from cloudfiles import CloudFiles
+from cloudfiles.monitoring import TransmissionMonitor, IOSampler, IOEnum
 from cloudfiles.resumable_tools import ResumableTransfer
 from cloudfiles.compression import transcode
-from cloudfiles.paths import extract, get_protocol
+from cloudfiles.paths import extract, get_protocol, find_common_buckets
 from cloudfiles.lib import (
   mkdir, toabs, sip, toiter, 
   first, red, green,
@@ -83,15 +84,20 @@ def license():
     print(f.read())
 
 @main.command()
-@click.option('--shortpath', is_flag=True, default=False, help='Don\'t print the common base path for each listed path.')
-@click.option('--flat', is_flag=True, default=False, help='Only produce a single level of directory hierarchy.')
-@click.option('-e','--expr',is_flag=True, default=False, help='Use a limited regexp language (e.g. [abc123]\{3\}) to generate prefixes.')
+@click.option('--shortpath', is_flag=True, default=False, help='Don\'t print the common base path for each listed path.',show_default=True)
+@click.option('--flat', is_flag=True, default=False, help='Only produce a single level of directory hierarchy.',show_default=True)
+@click.option('-e','--expr',is_flag=True, default=False, help=r'Use a limited regexp language (e.g. [abc123]{3}) to generate prefixes.', show_default=True)
+@click.option('--no-auth',is_flag=True, default=False, help='Uses the http API for read-only operations.', show_default=True)
 @click.argument("cloudpath")
-def ls(shortpath, flat, expr, cloudpath):
+def ls(shortpath, flat, expr, cloudpath, no_auth):
   """Recursively lists the contents of a directory."""
   cloudpath = normalize_path(cloudpath)
 
-  _, flt, prefix = get_mfp(cloudpath, True)
+  no_sign_request = no_auth # only affects s3
+  if no_auth and 's3://' not in cloudpath:
+    cloudpath = cloudfiles.paths.to_https_protocol(cloudpath)
+
+  _, flt, prefix, suffix = get_mfp(cloudpath, True)
   epath = extract(cloudpath)
   if len(epath.path) > 0:
     if prefix == "" and flt == False:
@@ -100,7 +106,7 @@ def ls(shortpath, flat, expr, cloudpath):
 
   flat = flat or flt
 
-  cf = CloudFiles(cloudpath)
+  cf = CloudFiles(cloudpath, no_sign_request=no_sign_request)
   iterables = []
   if expr:
     # TODO: make this a reality using a parser
@@ -122,6 +128,10 @@ def ls(shortpath, flat, expr, cloudpath):
     iterables = [ cf.list(prefix=prefix, flat=flat) ]
 
   iterables = itertools.chain(*iterables)
+
+  if suffix:
+    iterables = ( x for x in iterables if x.endswith(suffix) )
+
   for pathset in sip(iterables, 1000):
     if not shortpath:
       pathset = [ cloudpathjoin(cloudpath, pth) for pth in pathset ]
@@ -146,6 +156,7 @@ def exprgen(prefix, matches):
 
   return finished_prefixes
 
+SUFFIX_REGEXP = re.compile(r'\*([\w\d\-\._]+)$')
 
 def get_mfp(path, recursive):
   """many,flat,prefix"""
@@ -153,6 +164,13 @@ def get_mfp(path, recursive):
   flat = not recursive
   many = recursive
   prefix = ""
+  suffix = ""
+
+  matches = SUFFIX_REGEXP.search(path)
+  if matches is not None:
+    suffix = matches.groups()[0]
+    path = path.removesuffix(suffix)
+
   if path[-2:] == "**":
     many = True
     flat = False
@@ -162,7 +180,20 @@ def get_mfp(path, recursive):
     flat = True
     prefix = os.path.basename(path[:-1])
 
-  return (many, flat, prefix)
+  return (many, flat, prefix, suffix)
+
+@main.command("mkdir")
+@click.argument("paths", nargs=-1)
+def _mkdir(paths):
+  """
+  Create paths on the local file system.
+  """
+  for path in paths:
+    path = normalize_path(path)
+    protocol = get_protocol(path)
+
+    if protocol == "file":
+      mkdir(path.replace("file://", "", 1))
 
 @main.command()
 @click.argument("source", nargs=-1)
@@ -173,38 +204,61 @@ def get_mfp(path, recursive):
 @click.option('-b', '--block-size', default=128, help="Number of files to download at a time.", show_default=True)
 @click.option('--part-bytes', default=int(1e8), help="Composite upload threshold in bytes. Splits a file into pieces for some cloud services like gs and s3.", show_default=True)
 @click.option('--no-sign-request', is_flag=True, default=False, help="Use s3 in anonymous mode (don't sign requests) for the source.", show_default=True)
+@click.option('--resumable', is_flag=True, default=False, help="http->file transfers will dowload to .part files while they are in progress.", show_default=True)
+@click.option('--flight-time', is_flag=True, default=False, help="Save a Gantt chart of the file transfer to the local directory.", show_default=True)
+@click.option('--io-rate', is_flag=True, default=False, help="Save a chart of bitrate estimated based on file sizes and transmission duration.", show_default=True)
+@click.option('--machine-io-rate', is_flag=True, default=False, help="Save a chart of bitrate based on 4 Hz sampling OS network counters for the entire machine.", show_default=True)
+@click.option('--machine-io-rate-buffer-sec', default=600, help="Circular buffer length in seconds. Only allocated if chart enabled. 1 sec = 96 bytes", show_default=True)
 @click.pass_context
 def cp(
   ctx, source, destination, 
   recursive, compression, progress, 
   block_size, part_bytes, no_sign_request,
+  resumable, 
+  flight_time, io_rate, 
+  machine_io_rate, machine_io_rate_buffer_sec,
 ):
   """
   Copy one or more files from a source to destination.
 
   If source is "-" read newline delimited filenames from stdin.
   If destination is "-" output to stdout.
-
-  Note that for gs:// to gs:// transfers, the gsutil
-  tool is more efficient because the files never leave
-  Google's network.
   """
   use_stdout = (destination == '-')
   if len(source) > 1 and not ispathdir(destination) and not use_stdout:
     print("cloudfiles: destination must be a directory for multiple source files.")
     return
 
+  network_sampler = None
+  if machine_io_rate:
+    network_sampler = IOSampler(
+      buffer_sec=machine_io_rate_buffer_sec,
+      interval=0.25,
+    )
+    network_sampler.start_sampling()
+
   for src in source:
     _cp_single(
       ctx, src, destination, recursive, 
       compression, progress, block_size, 
-      part_bytes, no_sign_request
+      part_bytes, no_sign_request,
+      resumable, flight_time, io_rate,
     )
 
+  if machine_io_rate:
+    filename = f"./cloudfiles-cp-measured-io-{_timestamp()}.png"
+    network_sampler.stop_sampling()
+    network_sampler.plot_histogram(
+      resolution=1.0,
+      filename=filename,
+    )
+    print(f"Saved chart: {filename}")
+
 def _cp_single(
   ctx, source, destination, recursive, 
   compression, progress, block_size,
-  part_bytes, no_sign_request
+  part_bytes, no_sign_request,
+  resumable, gantt, io_rate,
 ):
   use_stdin = (source == '-')
   use_stdout = (destination == '-')
@@ -214,8 +268,8 @@ def _cp_single(
 
   nsrc = normalize_path(source)
   ndest = normalize_path(destination)
-
-  issrcdir = (ispathdir(source) or CloudFiles(nsrc).isdir()) and use_stdin == False
+  
+  issrcdir = (use_stdin == False) and (ispathdir(source) or CloudFiles(nsrc).isdir())
   isdestdir = (ispathdir(destination) or CloudFiles(ndest).isdir())
 
   recursive = recursive and issrcdir
@@ -238,7 +292,7 @@ def _cp_single(
 
   # The else clause here is to handle single file transfers
   srcpath = nsrc if issrcdir else os.path.dirname(nsrc)
-  many, flat, prefix = get_mfp(nsrc, recursive)
+  many, flat, prefix, suffix = get_mfp(nsrc, recursive)
 
   if issrcdir and not many:
     print(f"cloudfiles: {source} is a directory (not copied).")
@@ -250,7 +304,10 @@ def _cp_single(
     xferpaths = [ x.replace("\n", "") for x in xferpaths ]
     prefix = os.path.commonprefix(xferpaths)
     xferpaths = [ x.replace(prefix, "") for x in xferpaths ]
-    srcpath = cloudpathjoin(srcpath, prefix)
+    srcpath = prefix
+    if srcpath == "":
+      print(f"cloudfiles: No common prefix found. Currently only one bucket at a time is supported for STDIN.")
+      return
   elif many:
     xferpaths = CloudFiles(
       srcpath, no_sign_request=no_sign_request
@@ -270,8 +327,15 @@ def _cp_single(
     compression = False
 
   if not isinstance(xferpaths, str):
+    if suffix:
+      xferpaths = ( x for x in xferpaths if x.endswith(suffix) )
+
     if parallel == 1:
-      _cp(srcpath, destpath, compression, progress, block_size, part_bytes, no_sign_request, xferpaths)
+      _cp(
+        srcpath, destpath, compression,
+        progress, block_size, part_bytes,
+        no_sign_request, resumable, gantt, io_rate, xferpaths
+      )
       return 
 
     total = None
@@ -281,14 +345,22 @@ def _cp_single(
       pass
 
     if use_stdout:
-      fn = partial(_cp_stdout, no_sign_request, srcpath)
+      fn = partial(_cp_stdout, srcpath, no_sign_request, False, False)
     else:
-      fn = partial(_cp, srcpath, destpath, compression, False, block_size, part_bytes, no_sign_request)
+      fn = partial(
+        _cp, srcpath, destpath, compression, False, 
+        block_size, part_bytes, no_sign_request, resumable, False, False,
+      )
 
+    tms = []
     with tqdm(desc="Transferring", total=total, disable=(not progress)) as pbar:
       with pathos.pools.ProcessPool(parallel) as executor:
-        for _ in executor.imap(fn, sip(xferpaths, block_size)):
+        for tm in executor.imap(fn, sip(xferpaths, block_size)):
           pbar.update(block_size)
+          tms.append(tm)
+
+    tm = TransmissionMonitor.merge(tms)
+    del tms
   else:
     cfsrc = CloudFiles(srcpath, progress=progress, no_sign_request=no_sign_request)
     if not cfsrc.exists(xferpaths):
@@ -296,7 +368,7 @@ def _cp_single(
       return
 
     if use_stdout:
-      _cp_stdout(srcpath, xferpaths)
+      _cp_stdout(srcpath, no_sign_request, gantt, io_rate, xferpaths)
       return
 
     cfdest = CloudFiles(
@@ -310,26 +382,238 @@ def _cp_single(
     else:
       new_path = os.path.basename(ndest)
 
-    cfsrc.transfer_to(cfdest, paths=[{
+    tm = cfsrc.transfer_to(cfdest, paths=[{
       "path": xferpaths,
       "dest_path": new_path,
-    }], reencode=compression)
+    }], reencode=compression, resumable=resumable)
+
+  ts = _timestamp()
+
+  if io_rate:
+    filename = f"./cloudfiles-cp-est-io-{ts}.png"
+    tm.plot_histogram(filename=filename)
+    print(f"Saved chart: {filename}")
 
-def _cp(src, dst, compression, progress, block_size, part_bytes, no_sign_request, paths):
+  if gantt:
+    filename = f"./cloudfiles-cp-flight-time-{ts}.png"
+    tm.plot_gantt(filename=filename)
+    print(f"Saved chart: {filename}")
+
+def _cp(
+  src, dst, compression, progress, 
+  block_size, part_bytes, 
+  no_sign_request, resumable, gantt, io_rate,
+  paths
+):
   cfsrc = CloudFiles(src, progress=progress, composite_upload_threshold=part_bytes, no_sign_request=no_sign_request)
   cfdest = CloudFiles(dst, progress=progress, composite_upload_threshold=part_bytes)
-  cfsrc.transfer_to(
+  tm = cfsrc.transfer_to(
     cfdest, paths=paths, 
-    reencode=compression, block_size=block_size
+    reencode=compression, block_size=block_size,
+    resumable=resumable,
   )
 
-def _cp_stdout(src, no_sign_request, paths):
+  ts = _timestamp()
+
+  if io_rate:
+    filename = f"./cloudfiles-cp-est-io-{ts}.png"
+    tm.plot_histogram(filename=filename)
+    print(f"Saved chart: {filename}")
+
+  if gantt:
+    filename = f"./cloudfiles-cp-flight-time-{ts}.png"
+    tm.plot_gantt(filename=filename)
+    print(f"Saved chart: {filename}")
+
+  return tm
+
+def _timestamp():
+  now = datetime.now(timezone.utc)
+  return now.strftime("%Y-%m-%d_%H-%M-%S.%f")[:-5] + "Z"
+
+def _cp_stdout(src, no_sign_request, gantt, io_rate, paths):
   paths = toiter(paths)
   cf = CloudFiles(src, progress=False, no_sign_request=no_sign_request)
-  for res in cf.get(paths):
+  results, tm = cf.get(paths, return_recording=True)
+
+  ts = _timestamp()
+
+  if io_rate:
+    tm.plot_histogram(filename=f"./cloudfiles-cp-est-io-{ts}.png")
+
+  if gantt:
+    tm.plot_gantt(filename=f"./cloudfiles-cp-flight-time-{ts}.png")
+
+  for res in results:
     content = res["content"].decode("utf8")
     sys.stdout.write(content)
 
+  return tm
+
+@main.command()
+@click.argument("source", nargs=-1)
+@click.argument("destination", nargs=1)
+@click.option('--progress', is_flag=True, default=False, help="Show transfer progress.", show_default=True)
+@click.option('-b', '--block-size', default=128, help="Number of files to download at a time.", show_default=True)
+@click.option('--part-bytes', default=int(1e8), help="Composite upload threshold in bytes. Splits a file into pieces for some cloud services like gs and s3.", show_default=True)
+@click.option('--no-sign-request', is_flag=True, default=False, help="Use s3 in anonymous mode (don't sign requests) for the source.", show_default=True)
+@click.pass_context
+def mv(
+  ctx, source, destination, 
+  progress, block_size, 
+  part_bytes, no_sign_request,
+):
+  """
+  Move one or more files from a source to destination.
+
+  If source is "-" read newline delimited filenames from stdin.
+  If destination is "-" output to stdout.
+  """
+  if len(source) > 1 and not ispathdir(destination):
+    print("cloudfiles: destination must be a directory for multiple source files.")
+    return
+
+  ctx.ensure_object(dict)
+  parallel = int(ctx.obj.get("parallel", 1))
+
+  for src in source:
+    _mv_single(
+      src, destination, 
+      progress, block_size, 
+      part_bytes, no_sign_request,
+      parallel
+    )
+
+def _mv_single(
+  source, destination, 
+  progress, block_size,
+  part_bytes, no_sign_request,
+  parallel
+):
+  use_stdin = (source == '-')
+
+  nsrc = normalize_path(source)
+  ndest = normalize_path(destination)
+
+  issrcdir = (ispathdir(source) or CloudFiles(nsrc).isdir()) and use_stdin == False
+  isdestdir = (ispathdir(destination) or CloudFiles(ndest).isdir())
+
+  ensrc = cloudfiles.paths.extract(nsrc)
+  endest = cloudfiles.paths.extract(ndest)
+
+  if ensrc.protocol == "file" and endest.protocol == "file" and issrcdir:
+    shutil.move(nsrc.replace("file://", ""), ndest.replace("file://", ""))
+    return
+
+  recursive = issrcdir
+
+  # For more information see:
+  # https://cloud.google.com/storage/docs/gsutil/commands/cp#how-names-are-constructed
+  # Try to follow cp rules. If the directory exists,
+  # copy the base source directory into the dest directory
+  # If the directory does not exist, then we copy into
+  # the dest directory.
+  # Both x* and x** should not copy the base directory
+  if recursive and nsrc[-1] != "*":
+    if isdestdir:
+      if nsrc[-1] == '/':
+        nsrc = nsrc[:-1]
+      ndest = cloudpathjoin(ndest, os.path.basename(nsrc))
+
+  # The else clause here is to handle single file transfers
+  srcpath = nsrc if issrcdir else os.path.dirname(nsrc)
+  many, flat, prefix, suffix = get_mfp(nsrc, recursive)
+
+  if issrcdir and not many:
+    print(f"cloudfiles: {source} is a directory (not copied).")
+    return
+
+  xferpaths = os.path.basename(nsrc)
+  if use_stdin:
+    xferpaths = sys.stdin.readlines()
+    xferpaths = [ x.replace("\n", "") for x in xferpaths ]
+    prefix = os.path.commonprefix(xferpaths)
+    xferpaths = [ x.replace(prefix, "") for x in xferpaths ]
+    srcpath = prefix
+    if srcpath == "":
+      print(f"cloudfiles: No common prefix found. Currently only one bucket at a time is supported for STDIN.")
+      return
+  elif many:
+    xferpaths = CloudFiles(
+      srcpath, no_sign_request=no_sign_request
+    ).list(prefix=prefix, flat=flat)
+
+  destpath = ndest
+  if isinstance(xferpaths, str):
+    destpath = ndest if isdestdir else os.path.dirname(ndest)
+  elif not isdestdir:
+    if os.path.exists(ndest.replace("file://", "")):
+      print(f"cloudfiles: {ndest} is not a directory (not copied).")
+      return
+
+  if not isinstance(xferpaths, str):
+    if suffix:
+      xferpaths = ( x for x in xferpaths if x.endswith(suffix) )
+
+    if parallel == 1:
+      _mv(srcpath, destpath, progress, block_size, part_bytes, no_sign_request, xferpaths)
+      return 
+
+    total = None
+    try:
+      total = len(xferpaths)
+    except TypeError:
+      pass
+
+    fn = partial(_mv, srcpath, destpath, False, block_size, part_bytes, no_sign_request)
+
+    with tqdm(desc="Moving", total=total, disable=(not progress)) as pbar:
+      with pathos.pools.ProcessPool(parallel) as executor:
+        for _ in executor.imap(fn, sip(xferpaths, block_size)):
+          pbar.update(block_size)
+  else:
+    cfsrc = CloudFiles(srcpath, progress=progress, no_sign_request=no_sign_request)
+    if not cfsrc.exists(xferpaths):
+      print(f"cloudfiles: source path not found: {cfsrc.abspath(xferpaths).replace('file://','')}")
+      return
+
+    cfdest = CloudFiles(
+      destpath, 
+      progress=progress, 
+      composite_upload_threshold=part_bytes,
+    )
+
+    cfsrc.move(xferpaths, ndest)
+
+def _mv(src, dst, progress, block_size, part_bytes, no_sign_request, paths):
+  cfsrc = CloudFiles(src, progress=progress, composite_upload_threshold=part_bytes, no_sign_request=no_sign_request)
+  cfdest = CloudFiles(dst, progress=progress, composite_upload_threshold=part_bytes)
+  cfsrc.moves(
+    cfdest, paths=paths, block_size=block_size
+  )
+
+@main.command()
+@click.argument("sources", nargs=-1)
+@click.option('--progress', is_flag=True, default=False, help="Show transfer progress.", show_default=True)
+@click.option('--no-sign-request', is_flag=True, default=False, help="Use s3 in anonymous mode (don't sign requests) for the source.", show_default=True)
+@click.pass_context
+def touch(
+  ctx, sources,
+  progress, no_sign_request,
+):
+  """Create file if it doesn't exist."""
+  sources = list(map(normalize_path, sources))
+  sources = [ src.replace("precomputed://", "") for src in sources ]
+  pbar = tqdm(total=len(sources), desc="Touch", disable=(not progress))
+
+  clustered = find_common_buckets(sources)
+
+  with pbar:
+    for bucket, items in clustered.items():
+      cf = CloudFiles(bucket, no_sign_request=no_sign_request, progress=False)
+      cf.touch(items)
+      pbar.update(len(items))
+
 @main.group("xfer")
 def xfergroup():
   """
@@ -449,7 +733,7 @@ def rm(ctx, paths, recursive, progress, block_size):
   singles = []
   multiples = []
   for path in paths:
-    many, flat, prefix = get_mfp(path, recursive)
+    many, flat, prefix, suffix = get_mfp(path, recursive)
     if ispathdir(path) and not many:
       print(f"cloudfiles: {path}: is a directory.")
       return
@@ -468,7 +752,8 @@ def _rm_singles(paths, progress, parallel, block_size):
   for path in paths:
     npath = normalize_path(path)
     extracted = cloudfiles.paths.extract(npath)
-    cfgroups[(extracted.protocol, extracted.bucket)].append(extracted.path)
+    normalized_protocol = cloudfiles.paths.asprotocolpath(extracted)
+    cfgroups[(normalized_protocol, extracted.bucket)].append(extracted.path)
   
   for group, paths in cfgroups.items():
     cfpath = f"{group[0]}://{group[1]}/"
@@ -489,13 +774,15 @@ def _rm_many(path, recursive, progress, parallel, block_size):
   isdir = (ispathdir(path) or CloudFiles(npath).isdir()) 
   recursive = recursive and isdir
 
-  many, flat, prefix = get_mfp(path, recursive)
+  many, flat, prefix, suffix = get_mfp(path, recursive)
 
   cfpath = npath if isdir else os.path.dirname(npath)
   xferpaths = os.path.basename(npath)
 
   if many:
     xferpaths = CloudFiles(cfpath).list(prefix=prefix, flat=flat)
+    if suffix:
+      xferpaths = ( x for x in xferpaths if x.endswith(suffix) )
 
   if parallel == 1 or not many:
     __rm(cfpath, progress, xferpaths)
@@ -515,14 +802,22 @@ def __rm(cloudpath, progress, paths):
 @click.option('-c', '--grand-total', is_flag=True, default=False, help="Sum a grand total of all inputs.")
 @click.option('-s', '--summarize', is_flag=True, default=False, help="Sum a total for each input argument.")
 @click.option('-h', '--human-readable', is_flag=True, default=False, help='"Human-readable" output. Use unit suffixes: Bytes, KiB, MiB, GiB, TiB, PiB, and EiB.')
-def du(paths, grand_total, summarize, human_readable):
+@click.option('-N', '--count-files', is_flag=True, default=False, help='Also report the number of files.')
+def du(paths, grand_total, summarize, human_readable, count_files):
   """Display disk usage statistics."""
   results = []
+
+  list_data = False
+
   for path in paths:
     npath = normalize_path(path)
     if ispathdir(path):
       cf = CloudFiles(npath)
-      results.append(cf.size(cf.list()))
+      if summarize:
+        results.append(cf.subtree_size())
+      else:
+        list_data = True
+        results.append(cf.size(cf.list()))
     else:
       cf = CloudFiles(os.path.dirname(npath))
       sz = cf.size(os.path.basename(npath))
@@ -551,8 +846,15 @@ def du(paths, grand_total, summarize, human_readable):
       return f"{(val / 2**60):.2f} EiB"
 
   summary = {}
+  num_files = 0
   for path, res in zip(paths, results):
-    summary[path] = sum(res.values())
+    if list_data:
+      summary[path] = sum(res.values())
+      num_files += len(res)
+    else:
+      summary[path] = res["num_bytes"]
+      num_files += res["N"]
+
     if summarize:
       print(f"{SI(summary[path])}\t{path}")
 
@@ -562,7 +864,10 @@ def du(paths, grand_total, summarize, human_readable):
         print(f"{SI(size)}\t{pth}")
 
   if grand_total:
-    print(f"{SI(sum(summary.values()))}\ttotal") 
+    print(f"{SI(sum(summary.values()))}\tbytes total")
+
+  if count_files:
+    print(f"{num_files}\tfiles total") 
 
 @main.command()
 @click.argument('paths', nargs=-1)
@@ -572,10 +877,13 @@ def head(paths):
   for path in paths:
     npath = normalize_path(path)
     npath = re.sub(r'\*+$', '', path)
-    many, flat, prefix = get_mfp(path, False)
+    many, flat, prefix, suffix = get_mfp(path, False)
     if many:
       cf = CloudFiles(npath)
-      res = cf.head(cf.list(prefix=prefix, flat=flat))
+      lst = cf.list(prefix=prefix, flat=flat)
+      if suffix:
+        lst = ( x for x in lst if x.endswith(suffix) )
+      res = cf.head(lst)
       results.update(res)
     else:
       cf = CloudFiles(os.path.dirname(npath))

cloud_files-4.27.0.dist-info/RECORD

@@ -1,26 +0,0 @@
-cloudfiles/__init__.py,sha256=pLB4CcV2l3Jgv_ni1520Np1pfzFj8Cpr87vNxFT3rNI,493
-cloudfiles/buckets.py,sha256=eRAYdDfvVpNyJyK5ryDRMwgNJUeEuFBJ6doWU2JkAcA,74
-cloudfiles/cloudfiles.py,sha256=QlrQlU94gqNhKWyOuP0xe58UEwk2x8wtZ7n9LKiyLpM,44854
-cloudfiles/compression.py,sha256=pqYdpu5vfFv-094BpfZ2pgRjVu7ESM9pAZC09P6E8bY,6150
-cloudfiles/connectionpools.py,sha256=aL8RiSjRepECfgAFmJcz80aJFKbou7hsbuEgugDKwB8,4814
-cloudfiles/exceptions.py,sha256=H2IcMlZoy2Bsn-6wCPwyLDjg66LZCyxtcf3s_p21FDw,770
-cloudfiles/gcs.py,sha256=_njJ7TpqwrHCjPHRGkBN5alCrCWKM2m9qdy5DhxMZ7U,3718
-cloudfiles/interfaces.py,sha256=4ICm7tnS8HHK5IKw-HYD653V-qndprPRK8e1cxUYKgA,36782
-cloudfiles/lib.py,sha256=fEqL5APu_WQhl2yxqQbwE7msHdu7U8pstAJw6LgoKO0,5142
-cloudfiles/paths.py,sha256=xadVh5Vw8wAack1cws5dzVIlYQ3r8h8lrP43umUSuT0,10547
-cloudfiles/resumable_tools.py,sha256=pK-VcoPjQ2BjGjvlvH4dDCBf6lNsqHG-weiBgxVFbzA,5838
-cloudfiles/scheduler.py,sha256=DqDANmOpB3NdzFgJDNMMibRIkCrXQqIh2XGL8GWoc9c,3668
-cloudfiles/secrets.py,sha256=791b5a8nWSBYtlleGzKeoYIR5jl-FI1bw6INRM4Wy-0,5295
-cloudfiles/threaded_queue.py,sha256=Nl4vfXhQ6nDLF8PZpSSBpww0M2zWtcd4DLs3W3BArBw,7082
-cloudfiles/typing.py,sha256=f3ZYkNfN9poxhGu5j-P0KCxjCCqSn9HAg5KiIPkjnCg,416
-cloudfiles_cli/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
-cloudfiles_cli/__init__.py,sha256=Wftt3R3F21QsHtWqx49ODuqT9zcSr0em7wk48kcH0WM,29
-cloudfiles_cli/cloudfiles_cli.py,sha256=eETIOK4QyztQcpA4ZRny21SobLtcrPDlzZ_JaKBmmmA,28449
-cloud_files-4.27.0.dist-info/AUTHORS,sha256=7E2vC894bbLPO_kvUuEB2LFZZbIxZn23HabxH7x0Hgo,266
-cloud_files-4.27.0.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
-cloud_files-4.27.0.dist-info/METADATA,sha256=7xdozjXt0yT1OKZV47M9dWeip9PUx9Wj9adUcO0qZ_M,26804
-cloud_files-4.27.0.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-cloud_files-4.27.0.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
-cloud_files-4.27.0.dist-info/pbr.json,sha256=C4Xk2iNLylqeAReQ_DjwEN6rVj4PC_6x96XsvMs7138,46
-cloud_files-4.27.0.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
-cloud_files-4.27.0.dist-info/RECORD,,

cloud_files-4.27.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "e4b04bf", "is_release": true}

cloudfiles/buckets.py

@@ -1,10 +0,0 @@
-
-
-
-
-
-class Bucket:
-	def __init__(self, cloudpath, secrets=None):
-		pass
-
-