rda-python-dsquasar 2.0.0__tar.gz → 2.0.2__tar.gz

{rda_python_dsquasar-2.0.0 → rda_python_dsquasar-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsquasar
-Version: 2.0.0
+Version: 2.0.2
 Summary: RDA Python package to backup and recover RDA data archives to and from GLOBUS Quasar backup server
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsquasar

{rda_python_dsquasar-2.0.0 → rda_python_dsquasar-2.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dsquasar"
-version = "2.0.0"
+version = "2.0.2"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]
@@ -32,4 +32,3 @@ pythonpath = [
 
 [project.scripts]
 dsquasar = "rda_python_dsquasar.dsquasar:main"
-ds_quasar = "rda_python_dsquasar.ds_quasar:main"

rda_python_dsquasar-2.0.0/src/rda_python_dsquasar/ds_quasar.py → rda_python_dsquasar-2.0.2/src/rda_python_dsquasar/dsquasar.py

@@ -2,11 +2,12 @@
 #
 ##################################################################################
 #
-#     Title : ds_quasar
+#     Title : dsquasar
 #    Author : Zaihua Ji, zji@ucar.edu
 #      Date : 12/21/2020
 #             2025-02-05 transferred to package rda_python_dsquasar from
 #             https://github.com/NCAR/rda-utility-programs.git
+#            2025-12-03 convert to class DsQuasar
 #   Purpose : check Backup flags set in dataset.backflag and/or dsgroup.backflag of RDADB
 #             to gather Web and Saved bfiles, tar them into larger (> 2GB) bfiles, and
 #             back them up onto Quasar Backup Servers, at the Globus end points of
@@ -188,7 +189,7 @@ class DsQuasar(PgCMD, PgSplit):
          if self.sopts['E']:
             self.DTLACT = self.LGWNEM
             self.PGLOG['EMLMAX'] = 1024
-      if self.sopts['n']: self.dstart = 1
+      self.dstart = 0 if self.sopts['n'] else 1
       acts = self.PGBACK['action']
       if acts&self.CHKACT:
          self.check_backup_action()
@@ -927,7 +928,7 @@ class DsQuasar(PgCMD, PgSplit):
          self.object_copy_local(lfile, ofile, bucket, self.ERRACT)
          cinfo = self.check_local_file(lfile, 32, self.ERRACT)
          if not cinfo: return False
-         info['checksum'] = cinfo['checksum']
+         if 'checksum' in cinfo: info['checksum'] = cinfo['checksum']
          lname = 'OBS'
       else:
          lfile = "{}/{}/".format(chome, dsid)
@@ -938,14 +939,16 @@ class DsQuasar(PgCMD, PgSplit):
          lname = 'DSK'
       record = {}      
       msg = ''
-      checksum = info['checksum']
-      if not pgrec['checksum']:
-         msg = "Checksum misses"
-         record['checksum'] = checksum
-         pgrec['checksum'] = ''
-      elif checksum != pgrec['checksum']:
-         msg = "Checksum mismatch"
-         record['checksum'] = checksum
+      checksum = None
+      if 'checksum' in info:
+         checksum = info['checksum']
+         if not pgrec['checksum']:
+            msg = "Checksum misses"
+            record['checksum'] = checksum
+            pgrec['checksum'] = ''
+         elif checksum != pgrec['checksum']:
+            msg = "Checksum mismatch"
+            record['checksum'] = checksum
       if info['data_size'] != pgrec['data_size']:
          if msg: msg += ", "
          msg += "Size mismatch"
@@ -959,9 +962,11 @@ class DsQuasar(PgCMD, PgSplit):
       if msg:
          msg = "{}-{}-{}: {}".format(dsid, cate.upper(), fname, msg)
          msg += "\n{}:".format(lname)
-         msg += "{}/{}/{}/{}".format(checksum, info['data_size'], info['date_modified'], info['time_modified'])
+         if checksum: msg += "{}/".format(checksum)
+         msg += "{}/{}/{}".format(info['data_size'], info['date_modified'], info['time_modified'])
          msg += "\nDBS:"
-         msg += "{}/{}/{}/{}".format(pgrec['checksum'], pgrec['data_size'], pgrec['date_modified'], pgrec['time_modified'])
+         if checksum: msg += "{}/".format(pgrec['checksum'])
+         msg += "{}/{}/{}".format(pgrec['data_size'], pgrec['date_modified'], pgrec['time_modified'])
          self.pglog(msg, self.LOGACT)
          cid = cate + 'id'
          fcnd = "{} = {}".format(cid, pgrec[cid])

{rda_python_dsquasar-2.0.0 → rda_python_dsquasar-2.0.2}/src/rda_python_dsquasar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsquasar
-Version: 2.0.0
+Version: 2.0.2
 Summary: RDA Python package to backup and recover RDA data archives to and from GLOBUS Quasar backup server
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsquasar

{rda_python_dsquasar-2.0.0 → rda_python_dsquasar-2.0.2}/src/rda_python_dsquasar.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
-ds_quasar = rda_python_dsquasar.ds_quasar:main
 dsquasar = rda_python_dsquasar.dsquasar:main

{rda_python_dsquasar-2.0.0 → rda_python_dsquasar-2.0.2}/test/test_dsquasar.py

@@ -4,4 +4,3 @@ import pytest
 
 def test_dsquasar():
     import rda_python_dsquasar.dsquasar
-    import rda_python_dsquasar.ds_quasar