rda-python-dsarch 3.0.14__tar.gz → 3.0.15__tar.gz

{rda_python_dsarch-3.0.14/src/rda_python_dsarch.egg-info → rda_python_dsarch-3.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.14
+Version: 3.0.15
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch

{rda_python_dsarch-3.0.14 → rda_python_dsarch-3.0.15}/pyproject.toml

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

{rda_python_dsarch-3.0.14 → rda_python_dsarch-3.0.15}/src/rda_python_dsarch/dsarch.py

@@ -534,7 +534,7 @@ class DsArch(PgArch, PgMeta):
             if self.PGSIG['BPROC'] < 2:
                if not fnames: fnames = self.get_field_keys(tname, None, "G")  # get setting fields if not yet
                info = None
-               if warch:
+               if afile:   # also when already in place, so a directory gets its real total size
                   info = self.check_local_file(afile, 1, self.PGOPT['emerol']|self.PFSIZE)
                elif oarch:
                   info = self.check_object_file(ofile, bucket, 1, self.PGOPT['emerol'])
@@ -926,10 +926,8 @@ class DsArch(PgArch, PgMeta):
                   bgcnt += 1
             if self.PGSIG['BPROC'] < 2:
                if not fnames: fnames = self.get_field_keys(tname, None, "G")  # get setting fields if not yet
-               info = None
-               if sarch:
-                  info = self.check_local_file(afile, 1, self.PGOPT['emerol']|self.PFSIZE)
-               elif pgrec:
+               info = self.check_local_file(afile, 1, self.PGOPT['emerol']|self.PFSIZE)   # also when already in place
+               if not info and pgrec:
                   info = self.get_file_origin_info(sfile, pgrec)
                sid = self.set_one_savedfile(i, pgrec, sfile, fnames, type, info)
                if not sid:

{rda_python_dsarch-3.0.14 → rda_python_dsarch-3.0.15}/src/rda_python_dsarch/pg_meta.py

@@ -639,6 +639,9 @@ class PgMeta(PgCMD, PgSplit):
       d = self.metadata_dataset_id(dsid)
       if d not in self.META[c]: self.META[c][d] = []
       f = fmt.lower()
+      if f == "zarr":   # gatherxml has no reader for Zarr stores
+         self.pglog("{}-{}: Skip 'gatherxml' for Data Format '{}'".format(dsid, file, fmt), self.LOGWRN)
+         return 0
       if f == "netcdf": f = "cf" + f
       if not lfile: lfile = op.basename(file)
       self.META[c][d].append([file, f, lfile, mfile])

{rda_python_dsarch-3.0.14 → rda_python_dsarch-3.0.15/src/rda_python_dsarch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.14
+Version: 3.0.15
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch