rda-python-common 1.0.43__py3-none-any.whl → 1.0.45__py3-none-any.whl

rda_python_common/PgFile.py

@@ -1636,7 +1636,10 @@ def local_file_stat(file, fstat, opt, logact):
 
    info = {}
    info['isfile'] = (1 if stat.S_ISREG(fstat.st_mode) else 0)
-   info['data_size'] = fstat.st_size if info['isfile']  else local_path_size(file)
+   if info['isfile'] == 0 and logact&PgLOG.PFSIZE:
+      info['data_size'] = local_path_size(file)
+   else:
+      info['data_size'] = fstat.st_size
    info['fname'] = op.basename(file)
    if not opt: return info
    if opt&64 and info['isfile'] and info['data_size'] < PgLOG.PGLOG['MINSIZE']:
@@ -1661,7 +1664,7 @@ def local_file_stat(file, fstat, opt, logact):
    if opt&8:
       info['gid'] = fstat.st_gid
       info['group'] = grp.getgrgid(info['gid']).gr_name
-   if opt&32: info['checksum'] = get_md5sum(file, 0, logact)
+   if opt&32 and info['isfile']: info['checksum'] = get_md5sum(file, 0, logact)
 
    return info
 
@@ -2302,16 +2305,18 @@ def get_md5sum(file, count = 0, logact = 0):
    if count > 0:
       checksum = [None]*count
       for i in range(count):
-         chksm = PgLOG.pgsystem(cmd + file[i], logact, 20)
-         if chksm:
-            ms = re.search(r'(\w{32})', chksm)
-            if ms: checksum[i] = ms.group(1)
+         if op.isfile(file[i]):
+            chksm = PgLOG.pgsystem(cmd + file[i], logact, 20)
+            if chksm:
+               ms = re.search(r'(\w{32})', chksm)
+               if ms: checksum[i] = ms.group(1)
    else:
-      chksm = PgLOG.pgsystem(cmd + file, logact, 20)
       checksum = None
-      if chksm:
-         ms = re.search(r'(\w{32})', chksm)
-         if ms: checksum = ms.group(1)
+      if op.isfile(file):
+         chksm = PgLOG.pgsystem(cmd + file, logact, 20)
+         if chksm:
+            ms = re.search(r'(\w{32})', chksm)
+            if ms: checksum = ms.group(1)
 
    return checksum
 
@@ -2573,7 +2578,7 @@ def local_file_size(file, opt = 0, logact = 0):
       if opt&4: lmsg(file, PgLOG.PGLOG['MISSFILE'], logact)
       return -1   # file not eixsts
       
-   info = check_local_file(file, 0, logact)
+   info = check_local_file(file, 0, logact|PgLOG.PFSIZE)
    if info:
       if info['isfile'] and info['data_size'] < PgLOG.PGLOG['MINSIZE']:
          if opt:

rda_python_common/PgLOG.py

@@ -67,6 +67,7 @@ ADDTBL = (0x200000)  # action to add a new table if it does not exist
 SKPTRC = (0x400000)  # action to skip tracing when log errors
 UCNAME = (0x800000)  # action to change query field names to upper case
 UCLWEX = (0x800015)  # UCNAME|MSGLOG|WARNLG|EXITLG
+PFSIZE = (0x1000000)  # total file size under a path
 
 SUCCESS = 1   # Successful function call
 FINISH  = 2   # go through a function, including time out
@@ -473,7 +474,7 @@ def write_message(msg, file, logact):
       if logact&BRKLIN: OUT.write("\n")
       if logact&SEPLIN: OUT.write(PGLOG['SEPLINE'])
    OUT.write(msg)
-   if errlog and not logact&(EMLALL|SKPTRC): OUT.write(get_call_trace())
+   if errlog and file and not logact&(EMLALL|SKPTRC): OUT.write(get_call_trace())
    if doclose: OUT.close()
 
 #

{rda_python_common-1.0.43.dist-info → rda_python_common-1.0.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.43
+Version: 1.0.45
 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

{rda_python_common-1.0.43.dist-info → rda_python_common-1.0.45.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rda_python_common/PgCMD.py,sha256=EYjG2Z4zEnvsXE1z-jt5UaNoEKxnOYYiMMzvW6HrKA4,20597
 rda_python_common/PgDBI.py,sha256=nAov-B-B9XZ7p7rX1ZU4TcjAItSXVq18yD0Xe80TkwY,74962
-rda_python_common/PgFile.py,sha256=iVTgGX5WyUtphCAXiDc-JEIxvfH3W1hRh89huezdJzs,98827
-rda_python_common/PgLOG.py,sha256=g4v3sJnpeQyz4JxUMoPiKCf47NIGGg85jzWPIVzMd9g,55396
+rda_python_common/PgFile.py,sha256=CJqMlUzR47JkTRBsAWwfY-Fl_3IED-u5HuR19EtdDuo,99006
+rda_python_common/PgLOG.py,sha256=oZhZc18MdGTBimL4ggCWJbX_PwPK2uPmq1X-ZVhsTR4,55458
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
 rda_python_common/PgOPT.py,sha256=Q0e5dhfhOw8ha7y28s3SS8xBk_kdHSWjC8JfC--2rvU,56012
 rda_python_common/PgSIG.py,sha256=ZVM9Qz6yIFurwIQJtV5-CFbKOTdFsZ-Rs95SEpDFgNk,35795
 rda_python_common/PgSplit.py,sha256=QKPbF55m8KCTGmwVwL3uG_nuylCC4FSVfLuXeLjJHbE,8816
 rda_python_common/PgUtil.py,sha256=OqESKCd72b9g8m8jwjPJhXDtPYlW6G8oSOhwChvz2Cg,48600
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rda_python_common-1.0.43.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.43.dist-info/METADATA,sha256=4VkARzFwR3ev_B5ciO_i4Ub4dDJXdwoSecOh3sGw1-g,716
-rda_python_common-1.0.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.43.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.43.dist-info/RECORD,,
+rda_python_common-1.0.45.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.45.dist-info/METADATA,sha256=11wVhDAL3YtGCOVJfCgjLwYj9CJyM4XIHeXeX4Tp0PA,716
+rda_python_common-1.0.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_common-1.0.45.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.45.dist-info/RECORD,,