rda-python-common 3.0.23__tar.gz → 3.0.24__tar.gz

{rda_python_common-3.0.23/src/rda_python_common.egg-info → rda_python_common-3.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.23
+Version: 3.0.24
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.23`).  If the import
+You should see the installed version (currently `3.0.24`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.23 → rda_python_common-3.0.24}/README.md

@@ -165,7 +165,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.23`).  If the import
+You should see the installed version (currently `3.0.24`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.23 → rda_python_common-3.0.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "3.0.23"
+version = "3.0.24"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_common-3.0.23 → rda_python_common-3.0.24}/src/rda_python_common/__init__.py

@@ -22,7 +22,7 @@ object that existing callers expect.
 
 from . import PgLOG, PgUtil, PgDBI, PgFile, PgLock, PgCMD, PgSIG, PgOPT, PgSplit
 
-__version__ = "3.0.23"
+__version__ = "3.0.24"
 
 __all__ = [
    "PgLOG",

{rda_python_common-3.0.23 → rda_python_common-3.0.24}/src/rda_python_common/pg_file.py

@@ -878,6 +878,11 @@ class PgFile(PgUtil, PgSIG):
       objects sharing a key prefix. Each object is downloaded individually and
       keeps its position relative to the prefix under todir.
 
+      A member already staged under todir at the object's size and no older than
+      the object itself is left alone, so a store whose download was cut short
+      (by a batch walltime, say) resumes where it stopped instead of starting
+      over, and a second copy into the same directory costs nothing.
+
       Args:
          todir (str): Destination local directory path.
          fromdir (str): Object key prefix (source path in the bucket).
@@ -890,7 +895,9 @@ class PgFile(PgUtil, PgSIG):
       if not bucket: bucket = self.PGLOG['OBJCTBKT']
       ms = re.match(r'^(.+)/$', fromdir)
       if ms: fromdir = ms.group(1)
-      flist = self.object_glob(fromdir, bucket, 0, logact)
+      # opt 1 adds the LastModified the 'lo' listing already carries; it is only
+      # bits 2 and 8 that would cost a metadata call per key
+      flist = self.object_glob(fromdir, bucket, 1, logact)
       if flist == self.FAILURE: return self.FAILURE
       prefix = fromdir + '/'
       keys = [key for key in flist if key.startswith(prefix)]
@@ -898,8 +905,14 @@ class PgFile(PgUtil, PgSIG):
          return self.lmsg(fromdir, "{}-{} to copy to {}".format(self.OHOST, self.PGLOG['MISSFILE'], todir), logact)
       plen = len(prefix)
       for key in keys:
+         oinfo = flist[key]
          tofile = "{}/{}".format(todir, key[plen:])
-         if not self.object_get_local(tofile, key, flist[key]['data_size'], bucket, logact): return self.FAILURE
+         linfo = self.check_local_file(tofile, 1, logact)
+         # an unparsable LastModified leaves date_modified unset; download again then
+         if linfo and 'date_modified' in oinfo and linfo['data_size'] == oinfo['data_size'] and \
+            self.cmptime(linfo['date_modified'], linfo['time_modified'],
+                         oinfo['date_modified'], oinfo['time_modified']) >= 0: continue
+         if not self.object_get_local(tofile, key, oinfo['data_size'], bucket, logact): return self.FAILURE
       return self.SUCCESS
 
    # Copy a remote file to object

{rda_python_common-3.0.23 → rda_python_common-3.0.24/src/rda_python_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.23
+Version: 3.0.24
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.23`).  If the import
+You should see the installed version (currently `3.0.24`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.