rda-python-dsarch 3.0.8__tar.gz → 3.0.10__tar.gz

{rda_python_dsarch-3.0.8/src/rda_python_dsarch.egg-info → rda_python_dsarch-3.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.8
+Version: 3.0.10
 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.8 → rda_python_dsarch-3.0.10}/pyproject.toml

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

{rda_python_dsarch-3.0.8 → rda_python_dsarch-3.0.10}/src/rda_python_dsarch/dsarch.py

@@ -45,6 +45,7 @@ class DsArch(PgArch, PgMeta):
       MODCNT   -- number of existing records modified during the current action
       OVERRIDE -- non-zero when the -OE (OverrideExist) flag is active
       TARFILES -- dict mapping tar archive paths to their member-file metadata
+      BCKNOTES -- dict mapping backup IDs to their bfile.note member/move history
       VINDEX   -- dict mapping version indices to version records
       CHGGRPS  -- dict of group indices whose file-number counts need updating
       ERRMSG   -- accumulated error message string for the current action
@@ -54,6 +55,7 @@ class DsArch(PgArch, PgMeta):
       super().__init__()  # initialize parent class
       self.ERRCNT = self.RETSTAT = self.ALLCNT = self.ADDCNT = self.MODCNT = self.OVERRIDE = 0
       self.TARFILES = {}
+      self.BCKNOTES = {}
       self.VINDEX = {}
       self.CHGGRPS = {}
       self.ERRMSG = ''
@@ -1639,6 +1641,7 @@ class DsArch(PgArch, PgMeta):
          tofile = "{}/{}".format(todir, op.basename(bfile))
          tarfile = "{}/{}".format(tardir, op.basename(bfile))
          self.TARFILES[pgrec['bid']] = tarfile
+         self.BCKNOTES[pgrec['bid']] = pgrec['note']
          tinfo = self.check_local_file(tarfile, 0, self.PGOPT['extlog'])
          if tinfo:
             self.pglog(tarfile + ": tar file exists already", self.PGOPT['wrnlog'])
@@ -1707,10 +1710,8 @@ class DsArch(PgArch, PgMeta):
                self.pglog("{}: Backup tar file of Backup Id {} is not downloaded".format(wfile, pgrec['bid']), self.PGOPT['wrnlog'])
                continue
             tarfile = self.TARFILES[pgrec['bid']]
+            self.make_local_directory(tardir, self.PGOPT['extlog'])
             ainfo = self.get_backup_member_file(pgrec, tarfile, tardir)
-            tarcmd = "tar -xvf {} -C {} {}".format(tarfile, tardir, wfile)
-            self.pgsystem(tarcmd, self.PGOPT['extlog'], 5)
-            ainfo = self.check_local_file(afile, 0, self.PGOPT['extlog'])
             if not ainfo:
                self.pglog("{}: Error untar File {}".format(tarfile, afile), self.PGOPT['wrnlog'])
                continue
@@ -1744,8 +1745,9 @@ class DsArch(PgArch, PgMeta):
          Path to the extracted file, or None on failure.
       """
       mfile = wfile = pgrec['wfile'] if 'wfile' in pgrec else pgrec['sfile']
-      note = pgrec['note']
-      while not re.search(r'{}<:>'.format(mfile), note):
+      # the member list and move history are on bfile.note, not on the wfile/sfile record
+      note = self.BCKNOTES.get(pgrec['bid'])
+      while note and not re.search(r'{}<:>'.format(mfile), note):
          ms = re.search(r'>MV .* File (\S+) To .*{}'.format(mfile), note)
          if not ms: break
          mfile = ms.group(1)
@@ -1813,10 +1815,8 @@ class DsArch(PgArch, PgMeta):
                self.pglog("{}: Backup tar file of Backup Id {} is not downloaded".format(sfile, pgrec['bid']), self.PGOPT['wrnlog'])
                continue
             tarfile = self.TARFILES[pgrec['bid']]
+            self.make_local_directory(tardir, self.PGOPT['extlog'])
             ainfo = self.get_backup_member_file(pgrec, tarfile, tardir)
-            tarcmd = "tar -xvf {} -C {} {}".format(tarfile, tardir, sfile)
-            self.pgsystem(tarcmd, self.PGOPT['extlog'], 5)
-            ainfo = self.check_local_file(afile, 0, self.PGOPT['extlog'])
             if not ainfo:
                self.pglog("{}: Error untar File {}".format(tarfile, afile), self.PGOPT['wrnlog'])
                continue

{rda_python_dsarch-3.0.8 → rda_python_dsarch-3.0.10/src/rda_python_dsarch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.8
+Version: 3.0.10
 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