rda-python-common 1.0.42__tar.gz → 1.0.44__tar.gz

{rda_python_common-1.0.42 → rda_python_common-1.0.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.42
+Version: 1.0.44
 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.42 → rda_python_common-1.0.44}/pyproject.toml

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

{rda_python_common-1.0.42 → rda_python_common-1.0.44}/src/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'] == 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']:
@@ -1665,6 +1668,18 @@ def local_file_stat(file, fstat, opt, logact):
 
    return info
 
+#
+# get total size of files under a given path
+#
+def local_path_size(pname):
+
+   if not pname: pname = '.'   # To get size of current directory
+   size = 0
+   for path, dirs, files in os.walk(pname):
+      for f in files:
+         size += os.path.getsize(os.path.join(path, f))
+   return size
+
 #
 # check and get file status information of a file on remote host
 #
@@ -2557,11 +2572,11 @@ def rda_file_size(file, host, opt = 0, logact = 0):
 #
 def local_file_size(file, opt = 0, logact = 0):
 
-   if not op.isfile(file):
+   if not op.exists(file):
       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-1.0.42 → rda_python_common-1.0.44}/src/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

{rda_python_common-1.0.42 → rda_python_common-1.0.44}/src/rda_python_common.egg-info/PKG-INFO

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