rda-python-dbms 2.0.6__py3-none-any.whl → 2.0.8__py3-none-any.whl

rda_python_dbms/pgbackup.py

@@ -50,7 +50,7 @@ class PgBackup(PgFile):
             elif option == 'o':
                self.override = True
             else:
-               self.pglog("{}: unknow option".format(arg), self.LGEREX)
+               self.pglog("{}: unknown option".format(arg), self.LGEREX)
       self.cmdlog("pgbackup {}".format(' '.join(argv)))
    
    # start actions

rda_python_dbms/pgchksum.py

@@ -176,7 +176,7 @@ class PgChksum(PgCMD, PgSplit):
    # get the checksum filelist for wfile
    def get_checksum_wfilelist(self):
       self.PVALS['TYPE'] = "Web"
-      self.PVALS['BUCKET'] = 'rda-data'
+      self.PVALS['BUCKET'] = 'gdex-data'
       flds = "wid, wfile, type, locflag, data_size, checksum, date_modified, time_modified"
       if self.PGSUM['f']:
          pgrecs = self.pgmhget('wfile', 'wid, dsid', {'wfile' : self.PGSUM['f']})
@@ -211,11 +211,15 @@ class PgChksum(PgCMD, PgSplit):
          cnt = len(pgrecs['wid']) if pgrecs else 0
          wfrecs = {}
          if cnt > 0:
+            tmpcnt = 0
             for i in range(cnt):
                dsid = pgrecs['dsid'][i]
                pgrec = self.pgget_wfile(dsid, flds, 'wid = {}'.format(pgrecs['wid'][i]))
-               pgrec['dsid'] = dsid
-               self.addrecord(wfrecs, pgrec, i)
+               if pgrec:
+                  pgrec['dsid'] = dsid
+                  self.addrecord(wfrecs, pgrec, tmpcnt)
+                  tmpcnt += 1
+            cnt = tmpcnt
       if cnt > 0:
          if fcnt == 0 or fcnt > cnt: self.PGSUM['c'] = cnt
          self.PGSUM['f'] = wfrecs
@@ -226,7 +230,7 @@ class PgChksum(PgCMD, PgSplit):
    # get the checksum filelist for sfile
    def get_checksum_sfilelist(self):
       self.PVALS['TYPE'] = "Saved"
-      self.PVALS['BUCKET'] = 'rda-decsdata'
+      self.PVALS['BUCKET'] = 'gdex-decsdata'
       flds = "sid, sfile, dsid, type, locflag, data_size, checksum, date_modified, time_modified"
       hcnd = {}
       fcnt = self.PGSUM['c']
@@ -331,7 +335,7 @@ class PgChksum(PgCMD, PgSplit):
          locflag = pgrec['locflag']
          if locflag == 'O':
             fname = "{}/{}".format(pgrec['dsid'], pgrec['wfile'])
-            self.evaluate_object_file(fname, pgrec, 'rda-data', cnts)
+            self.evaluate_object_file(fname, pgrec, self.PVALS['BUCKET'], cnts)
          else:
             fname = pgrec['wfile']
             if not re.match(r'^/', fname):
@@ -348,7 +352,7 @@ class PgChksum(PgCMD, PgSplit):
          locflag = pgrec['locflag']
          if locflag == 'O':
             fname = "{}/{}".format(pgrec['dsid'], pgrec['sfile'])
-            self.evaluate_object_file(fname, pgrec, 'rda-decsdata', cnts)
+            self.evaluate_object_file(fname, pgrec, self.PVALS['BUCKET'], cnts)
          else:
             fname = pgrec['sfile']
             if not re.match(r'^/', fname):

rda_python_dbms/pgdbdump.py

@@ -12,7 +12,7 @@ import sys
 import re
 import os
 from os import path as op
-from rda_python_common.pg_Util import PgUtil
+from rda_python_common.pg_util import PgUtil
 
 class PgDBDump(PgUtil):
    def __init__(self):
@@ -23,58 +23,80 @@ class PgDBDump(PgUtil):
       self.SNDACT = self.LOGWRN|self.SNDEML
       self.pname = self.hname = self.dname = None
 
-   # function to read_parameters
    def read_parameters(self):
-      # check command line for options
+      """
+      Parse command-line options and set instance variables.
+      Usage: pgdbdump [-b] -d DBNAME -h HostName [-p LocalPath]
+      """
       self.PGLOG['LOGFILE'] = "pgbackup.log"   # set log file
       argv = sys.argv[1:]
       option = None
       options = ['b', 'd', 'h', 'p']
-      for arg in argv:
+      i = 0
+      while i < len(argv):
+         arg = argv[i]
          ms = re.match(r'^-(\w)$', arg)
          if ms:
             option = ms.group(1)
-            if option not in options: self.pglog("{}: unknow option".format(arg), self.LGEREX)
-            if option == 'b': self.PGLOG['BCKGRND'] = 1
-         elif option == 'd':
-            self.dname = arg
-         elif option  == 'h':
-            self.hname = arg
-         elif option  == 'p':
-            self.pname = arg
+            if option not in options:
+               self.pglog(f"{arg}: unknown option", self.LGEREX)
+            if option == 'b':
+               self.PGLOG['BCKGRND'] = 1
+               option = None
+               i += 1
+               continue
+            # For options that require a value
+            if i + 1 >= len(argv):
+               self.pglog(f"Option -{option} requires a value", self.LGEREX)
+            val = argv[i+1]
+            if option == 'd':
+               self.dname = val
+            elif option == 'h':
+               self.hname = val
+            elif option == 'p':
+               self.pname = val
+            i += 2
+            option = None
+         else:
+            i += 1
       if not (self.dname and self.hname):
          print("Usage: pgdbdump [-b] -d DBNAME -h HostName [-p LocalPath]")
          print("  -b - background process and no screen output")
          print("  -d - PostgreSQL database name to dump at the current directory")
          print("  -h - Hostname the PostgreSQL server is running on")
          print("  -p - Local relative path to dump the database, defaults to <DBNAME>_backup_<TODAY>")
-         sys.exit(0)
+         sys.exit(1)
       self.cmdlog("pgdbdump {}".format(' '.join(argv)))
-      if not self.pname: self.pname = "{}_backup_{}".format(self.dname, self.curdate())
+      if not self.pname:
+         short_host = self.hname.split('.')[0] if self.hname else 'host'
+         today = self.curdate()
+         self.pname = f"{short_host}_{self.dname}_{today}"
 
-   # function to start_actions
    def start_actions(self):
+      """Perform the database dump and log actions."""
       self.pg_database_dbdump()
-      title = "pgdbdump: {}:{}".format(self.hname, self.dname, self.pname)
-      tmsg = "{} to {} under {}!".format(title, self.pname, os.getcwd())
+      title = f"pgdbdump: {self.hname}:{self.dname}:{self.pname}"
+      tmsg = f"{title} to {self.pname} under {os.getcwd()}!"
       self.set_email(tmsg, self.EMLTOP)
       self.pglog(title, self.SNDACT)
-      self.cmdlog()   
+      self.cmdlog()
 
-   #  bacup one database
    def pg_database_dbdump(self):
-      cmd = "pg_dump {} -h {} -U {} -w -Fd -j 16 -f {}/".format(self.dname, self.hname, self.USNAME, self.pname)
+      """Run pg_dump for the specified database and handle errors."""
+      cmd = f"pg_dump {self.dname} -h {self.hname} -U {self.USNAME} -w -Fd -j 16 -f {self.pname}/"
       if op.exists(self.pname):
-         self.pglog(self.pname + ": Dumping directory exists, remove it", self.ERRACT)
-      elif not self.pgsystem(cmd, self.LOGACT, 257):
-         self.pglog("{}: Error dumping database\n{}".format(self.dname, self.PGLOG['SYSERR']), self.ERRACT)
+         self.pglog(self.pname + ": Dumping directory exists, aborting to avoid overwrite.", self.ERRACT)
+         sys.exit(2)
+      if not self.pgsystem(cmd, self.LOGACT, 257):
+         self.pglog(f"{self.dname}: Error dumping database\n{self.PGLOG['SYSERR']}", self.ERRACT)
+         sys.exit(3)
 
-# main function to excecute this script
+# main function to execute this script
 def main():
-   object = PgDBDump()
-   object.read_parameters()
-   object.start_actions()
-   object.pgexit(0)
+   pgdb = PgDBDump()
+   pgdb.read_parameters()
+   pgdb.start_actions()
+   pgdb.pgexit(0)
 
 # call main() to start program
-if __name__ == "__main__": main()
+if __name__ == "__main__": main()

rda_python_dbms/pgdbrestore.py

@@ -35,7 +35,7 @@ class PgDBRestore(PgDBI):
          ms = re.match(r'^-(\w)$', arg)
          if ms:
             option = ms.group(1)
-            if option not in options: self.pglog("{}: unknow option".format(arg), self.LGEREX)
+            if option not in options: self.pglog("{}: unknown option".format(arg), self.LGEREX)
             if option == 'b': self.PGLOG['BCKGRND'] = 1
          elif option == 'd':
             self.dname = arg
@@ -61,7 +61,7 @@ class PgDBRestore(PgDBI):
       self.pglog(title, self.SNDACT)
       self.cmdlog()   
 
-   #  bacup one database
+   #  restore one database
    def pg_database_dbrestore(self):
       cmd = "pg_restore -d {} -h {} -U {} -w -j 16 -Fd {}".format(self.dname, self.hname, self.USNAME, self.pname)
       if not op.exists(self.pname):
@@ -69,7 +69,7 @@ class PgDBRestore(PgDBI):
       elif not self.pgsystem(cmd, self.LOGACT, 257):
          self.pglog("{}: Error restoring database\n{}".format(self.dname, self.PGLOG['SYSERR']), self.ERRACT)
 
-# main function to excecute this script
+# main function to execute this script
 def main():
    object = PgDBRestore()
    object.read_parameters()

{rda_python_dbms-2.0.6.dist-info → rda_python_dbms-2.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dbms
-Version: 2.0.6
+Version: 2.0.8
 Summary: RDA Python Package to manage PostreSQL databases
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dbms

{rda_python_dbms-2.0.6.dist-info → rda_python_dbms-2.0.8.dist-info}/RECORD

@@ -9,11 +9,11 @@ rda_python_dbms/pg_ddl.py,sha256=77Cil6eBKf5S5g7yWcN9m5dLZlpY3_USFQBKcaP4fiU,544
 rda_python_dbms/pg_ddllib.py,sha256=-zawllfUCe7QZNvza-u5TAYKP4yilC9K6TetHhoGenU,44265
 rda_python_dbms/pg_schema.py,sha256=Vsf5fKENYIOgMKE3yS0TkXhg-aeHZ2nYzpvltFAcdFY,5520
 rda_python_dbms/pg_seq.py,sha256=wNxqsyIjcTplJErPirZ-VkZ8HS4mgQUwPz8Xwd12kYA,4914
-rda_python_dbms/pgbackup.py,sha256=8LaRE7SeRT1hq0_oUby9lcjHSjKZI0YC_jXqtT5LNRo,4248
-rda_python_dbms/pgchksum.py,sha256=6B_FpHpY9iChIONsbwaZO_Uzk-1ala134-8QCg3hFek,21670
+rda_python_dbms/pgbackup.py,sha256=IuP3nQEEVR86YlSZuGyqsdz1-O9rgET76FnWB7iL3xk,4249
+rda_python_dbms/pgchksum.py,sha256=8jfBncptxp57Gr2t66Kk9MFt5Z_aXfozOGZPaohKGwM,21802
 rda_python_dbms/pgcmptables.py,sha256=LQ4KK4JuQs2z3nBdINWYgyiGu2MF9RZjS5_cAktbs6k,47123
-rda_python_dbms/pgdbdump.py,sha256=vM-J3VfEDTXD97OV0Ke3BJzNiXxuMQS0Ut1SxkqujkU,3170
-rda_python_dbms/pgdbrestore.py,sha256=aL1cfUQcNFlLCHBCGP3FPRc8biJfTxftq9lm_Ou8KHA,3108
+rda_python_dbms/pgdbdump.py,sha256=8d-1z16Y2DyJnQqex2wFu5svChKgncPnzdQ-iUftHg8,3831
+rda_python_dbms/pgdbrestore.py,sha256=d12hl1r6usK1oGIFAPVWUB_KkIH04PPlugxVSnLOX1g,3110
 rda_python_dbms/pgddl.py,sha256=kHTtWzetAwaS8GEG9x8KBLwW-RqMJ-2cbGDlYtJOSH8,6198
 rda_python_dbms/pgddl.usg,sha256=7ly6YbusvyIy9yQn9reGIUtZQ5Wiehp9-DKDgfjqSBE,2267
 rda_python_dbms/pgschema.py,sha256=ZLkRy2vgfkRYWQ95bGXkz13n5LR5wrdki6WV5ZA8eL0,6293
@@ -954,9 +954,9 @@ rda_python_dbms/tables/obsua/wind_5v2_0.json,sha256=NehMFE-GMNlD5Bh_fiacfSOmZWkr
 rda_python_dbms/tables/obsua/wind_60v2_0.json,sha256=jOyQgD5ph7YBMuQfvYz1Ln6X_-_Vdhl36HBexOHZ1dA,1067
 rda_python_dbms/tables/obsua/wind_8v2_0.json,sha256=5wtCThmFeOyiAGH_Qv3_jrXjhjo9b87ehlpI9QQY2SM,1064
 rda_python_dbms/tables/obsua/wind_9v2_0.json,sha256=7OKFUicOn15LL_WuF1VE_L8DjxsHmRP4uBnopuMIeTg,1064
-rda_python_dbms-2.0.6.dist-info/licenses/LICENSE,sha256=Uky6fiiVw7cakFVRtVpzg-mvqOQ-WcA_H8lHqhPRg58,1101
-rda_python_dbms-2.0.6.dist-info/METADATA,sha256=YCh1izP8qpeuqP_Yzss3wMjPMDl-xff7ketsaYxoqLM,617
-rda_python_dbms-2.0.6.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-rda_python_dbms-2.0.6.dist-info/entry_points.txt,sha256=iti6iZS2OEeBqO5aHlWeMFcbuwN_2assidP0qeSkQ6E,346
-rda_python_dbms-2.0.6.dist-info/top_level.txt,sha256=4T1ShNUMyiqmwDIuDL7pDOm_S-6zWWW3Vy6OdAzYA4c,16
-rda_python_dbms-2.0.6.dist-info/RECORD,,
+rda_python_dbms-2.0.8.dist-info/licenses/LICENSE,sha256=Uky6fiiVw7cakFVRtVpzg-mvqOQ-WcA_H8lHqhPRg58,1101
+rda_python_dbms-2.0.8.dist-info/METADATA,sha256=yGW3Ewn-Bd1Nu5TcvSLrB9vj5-aUQ6Hm55XeL2eibAg,617
+rda_python_dbms-2.0.8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rda_python_dbms-2.0.8.dist-info/entry_points.txt,sha256=iti6iZS2OEeBqO5aHlWeMFcbuwN_2assidP0qeSkQ6E,346
+rda_python_dbms-2.0.8.dist-info/top_level.txt,sha256=4T1ShNUMyiqmwDIuDL7pDOm_S-6zWWW3Vy6OdAzYA4c,16
+rda_python_dbms-2.0.8.dist-info/RECORD,,

{rda_python_dbms-2.0.6.dist-info → rda_python_dbms-2.0.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any