rda-python-miscs 1.0.4__tar.gz → 1.0.6__tar.gz

{rda_python_miscs-1.0.4/src/rda_python_miscs.egg-info → rda_python_miscs-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_miscs
-Version: 1.0.4
+Version: 1.0.6
 Summary: RDA Python package to hold RDA miscellaneous utility programs
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-miscs

{rda_python_miscs-1.0.4 → rda_python_miscs-1.0.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_miscs"
-version = "1.0.4"
+version = "1.0.6"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_miscs-1.0.4 → rda_python_miscs-1.0.6}/src/rda_python_miscs/bashqsub.py

@@ -24,7 +24,7 @@ DEFMODS = {
 }
 
 DEFLIBS = {
-   'default' : "conda activate /glade/work/rdadata/conda-envs/pg-casper",
+   'default' : "conda activate /glade/work/gdexdata/conda-envs/pg-casper",
 }
 
 SWAPMODS = {

{rda_python_miscs-1.0.4 → rda_python_miscs-1.0.6}/src/rda_python_miscs/gdexls.py

@@ -9,7 +9,7 @@
 #            https://github.com/NCAR/rda-utility-programs.git
 #            2025-09-21 copied from rdals to gdexls
 #   Purpose: list files/directories in a local directory and show additional
-#            information recorded in RDADB if any
+#            information recorded in GDEXDB if any
 #
 #    Github: https://github.com/NCAR/rda-python-miscs.git
 #
@@ -31,7 +31,7 @@ CLMT = 500   # reformat list if count reach this limit
 WIDTHS = [0, 0, 0]   # WIDTHS for formated display
 ALIGNS = [0, 1, 1]   # alignment, 0 - left; 1 - right
 
-RDALS = {
+GDEXLS = {
    'd' : 0,     # 1 to list directory information only
    'f' : 0,     # 1 to list file information only
    'N' : 0,     # 1 to list files unformatted
@@ -70,9 +70,9 @@ def main():
       ms = re.match(r'-(\w)$', arg)
       if ms:
          option = ms.group(1)
-         if option not in RDALS: PgLOG.pglog(arg + ": Unknown Option", PgLOG.LGEREX)
+         if option not in GDEXLS: PgLOG.pglog(arg + ": Unknown Option", PgLOG.LGEREX)
          if 'dfNr'.find(option) > -1:
-            RDALS[option] = 1
+            GDEXLS[option] = 1
             option = defopt
          continue
       if not option: PgLOG.pglog(arg + ": Value provided without option", PgLOG.LGEREX)
@@ -81,9 +81,9 @@ def main():
          defopt = None
       else:
          if option == 'R':
-            RDALS[option] = int(arg)
+            GDEXLS[option] = int(arg)
          else:
-            RDALS[option] = arg
+            GDEXLS[option] = arg
          option = defopt
    
    if not LINFO['files']:
@@ -92,10 +92,10 @@ def main():
          sys.stderr.write(LINFO['curdir'] + ": Empty directory\n")
          PgLOG.pgexit(1)
 
-   if not (RDALS['d'] or RDALS['f']):
-      RDALS['d'] = RDALS['f'] = 1   # list both directories and files as default
-   if not RDALS['D']: RDALS['D'] = '|' if RDALS['N'] else "  "    # default delimiter for no format display
-   if not RDALS['R'] and RDALS['r']: RDALS['R'] = 1000
+   if not (GDEXLS['d'] or GDEXLS['f']):
+      GDEXLS['d'] = GDEXLS['f'] = 1   # list both directories and files as default
+   if not GDEXLS['D']: GDEXLS['D'] = '|' if GDEXLS['N'] else "  "    # default delimiter for no format display
+   if not GDEXLS['R'] and GDEXLS['r']: GDEXLS['R'] = 1000
 
    display_top_list(LINFO['files'])   # display or cache file/directory list
    if LINFO['pcnt'] > 0: display_format_list()   # if some left over
@@ -115,7 +115,7 @@ def main():
          msg += "{} File{}".format(LINFO['fcnt'], s)
       print("Total {} displayed".format(msg))
    elif (LINFO['dcnt'] + LINFO['gcnt'] + LINFO['fcnt']) == 0:
-      sys.stderr.write((LINFO['tpath'] if LINFO['tpath'] else LINFO['curdir']) + ": No RDA data information found\n")
+      sys.stderr.write((LINFO['tpath'] if LINFO['tpath'] else LINFO['curdir']) + ": No GDEX data information found\n")
       PgLOG.pgexit(1)
    
    PgLOG.pgexit(0)
@@ -140,7 +140,7 @@ def display_top_list(files):
       if not re.match(r'^/', file): file = PgLOG.join_paths(LINFO['curdir'], file)
       LINFO['tpath'] = (op.dirname(file) if display else file) + "/"
       if display: display_line(file, isdir)
-      if isdir and (RDALS['R'] or not display or not LINFO['dsid']):
+      if isdir and (GDEXLS['R'] or not display or not LINFO['dsid']):
          fs = sorted(glob.glob(file + "/*"))
          display_list(fs, 1)
          if LINFO['pcnt'] > CLMT: display_format_list()
@@ -153,7 +153,7 @@ def display_list(files, level):
    for file in files:
       isdir = 1 if op.isdir(file) else 0
       display_line(file, isdir)
-      if isdir and level < RDALS['R']:
+      if isdir and level < GDEXLS['R']:
          fs = sorted(glob.glob(file + "/*"))
          display_list(fs, level+1)
          if LINFO['pcnt'] > CLMT: display_format_list()
@@ -179,7 +179,7 @@ def display_line(file, isdir):
       LINFO['dhome'] = "{}/{}".format(PgLOG.PGLOG['DSDHOME'], LINFO['dsid'])
       if LINFO['dhome'] == file:
          file = re.sub(r'^{}'.format(LINFO['tpath']), '', file, 1)
-         if RDALS['d']:
+         if GDEXLS['d']:
             title = pgrec['title'] if pgrec['title'] else ''
             display_record(["D" + file, pgrec['ns'], str(pgrec['nc']), title])
          LINFO['dcnt'] += 1
@@ -192,7 +192,7 @@ def display_line(file, isdir):
          return
 
    if isdir:
-      if RDALS['d']:   # check and display group info for directory
+      if GDEXLS['d']:   # check and display group info for directory
          pgrec = PgDBI.pgget("dsgroup", "title, (dwebcnt + nwebcnt) nc, (dweb_size + nweb_size) ns",
                              "dsid = '{}' AND webpath = '{}'".format(LINFO['dsid'], wfile), PgLOG.LGEREX)
          if pgrec:
@@ -201,7 +201,7 @@ def display_line(file, isdir):
             display_record(["G" + file, pgrec['ns'], str(pgrec['nc']), title])
             LINFO['gcnt'] += 1
 
-   elif RDALS['f']:   # check and display file info
+   elif GDEXLS['f']:   # check and display file info
       pgrec = PgSplit.pgget_wfile(LINFO['dsid'], "data_size, data_format, note",
                           "wfile = '{}'".format(wfile), PgLOG.LGEREX)
       if pgrec:
@@ -219,8 +219,8 @@ def display_line(file, isdir):
 def display_record(disp):
 
    disp[1] = get_float_string(disp[1])
-   if RDALS['N']:
-      print(RDALS['D'].join(disp))
+   if GDEXLS['N']:
+      print(GDEXLS['D'].join(disp))
    else:
       LINFO['pgrecs'].append(disp)
       LINFO['pcnt'] += 1
@@ -240,7 +240,7 @@ def display_format_list():
             disp[i] = "{:>{}}".format(disp[i], WIDTHS[i])
          else:
             disp[i] = "{:{}}".format(disp[i], WIDTHS[i])
-      print(RDALS['D'].join(disp))
+      print(GDEXLS['D'].join(disp))
 
    LINFO['pcnt'] = 0
 
@@ -271,7 +271,7 @@ def get_real_path(path):
    elif re.match(r'^/gpfs/csfs1/', path):
       path = re.sub(r'^/gpfs/csfs1', '/glade/campaign', path, 1)
 
-   return path
+   return op.realpath(path)
 
 #
 # call main() to start program

{rda_python_miscs-1.0.4 → rda_python_miscs-1.0.6}/src/rda_python_miscs/gdexls.usg

@@ -18,10 +18,10 @@
 
       - Option -d, list directory information only. Directory information
         is included as default. Add this option to exclude file information;
- 
+
       - Option -f, list file information only. File information
         is included as default. Add this option to exclude directory information;
- 
+
       - Option -N, list files unformatted;
 
       - Option -h, display this help document;
@@ -42,19 +42,19 @@
 
   This utility program can be executed anywhere. Nothing is displayed if neither
   directory nor file information pre-gathered in database.
-  
-  For examples, to check directories and files of ds277.6, you can
-     
-     1. Change into the dataset home data directory as 'cd /PathTo/ds277.6' and
+
+  For examples, to check directories and files of d277006, you can
+
+     1. Change into the dataset home data directory as 'cd /PathTo/d277006' and
         execute 'gdexls'; add recursive option '-r' to check directories and files
         further into the sub-directories, or change directory into a sub-directory
         to check files inside of it.
-     
-     2. Pass an absolute path to gdexls as 'gdexls /PathTo/ds277.6/' or as
-        'gdexls /PathTo/ds277.6/*'; without the ending by '/' or an appended
+
+     2. Pass an absolute path to gdexls as 'gdexls /PathTo/d277006/' or as
+        'gdexls /PathTo/d277006/*'; without the ending by '/' or an appended
         wildcard symbol '*' information of the dataset itself is check unless
         the recursive option '-r' or '-R RecursiveLevel' is present
-     
+
      3. If the current directory is in another dataset home data directory,
-        such as /PathTo/ds277.7, you can pass a relative path to gdexls
-        as  'gdexls ../ds277.6/' or as 'gdexls ../ds277.6/*'
+        such as /PathTo/d277006, you can pass a relative path to gdexls
+        as  'gdexls ../d277006/' or as 'gdexls ../d277006/*'

rda_python_miscs-1.0.6/src/rda_python_miscs/gdexls_standalone.py

@@ -0,0 +1,12 @@
+#!/glade/work/zji/conda-envs/pg-rda/bin/python
+# -*- coding: utf-8 -*-
+#  2025-09-23, zji@ucar.edu, created for a standalone version of gdexls
+import re
+import sys
+pgpath = '/glade/work/zji/conda-envs/pg-rda/lib/python3.10/site-packages'
+if pgpath not in sys.path: sys.path.insert(0, pgpath)
+
+from rda_python_miscs.gdexls import main
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

{rda_python_miscs-1.0.4 → rda_python_miscs-1.0.6}/src/rda_python_miscs/rdacp.py

@@ -101,7 +101,7 @@ def main():
       if ms:
          CINFO['tpath'] = ms.group(1)
       else:
-         tinfo = PgFile.check_rda_file(RDACP['t'], RDACP['th'], 0, PgLOG.LGWNEX)
+         tinfo = PgFile.check_gdex_file(RDACP['t'], RDACP['th'], 0, PgLOG.LGWNEX)
          if tinfo and tinfo['isfile'] == 0: CINFO['tpath'] = RDACP['t']
    PgLOG.PGLOG['FILEMODE'] = RDACP['F']
    PgLOG.PGLOG['EXECMODE'] = RDACP['D']
@@ -141,9 +141,9 @@ def copy_top_list(files):
    
    for file in files:
       if RDACP['th'] and not PgUtil.pgcmp(RDACP['th'], PgLOG.PGLOG['BACKUPNM'], 1):
-         info = PgFile.check_globus_file(file, 'rda-glade', 0, PgLOG.LGWNEX)
+         info = PgFile.check_globus_file(file, 'gdex-glade', 0, PgLOG.LGWNEX)
       else:
-         info = PgFile.check_rda_file(file, RDACP['fh'], 0, PgLOG.LGWNEX)
+         info = PgFile.check_gdex_file(file, RDACP['fh'], 0, PgLOG.LGWNEX)
       if not info:
          PgLOG.pglog("{}{}: {}".format(CINFO['fhost'], file, PgLOG.PGLOG['MISSFILE']), PgLOG.LOGERR)
          continue
@@ -165,7 +165,7 @@ def copy_top_list(files):
       if info['isfile']:
          CINFO['tcnt'] += copy_file(file, info['isfile'])
       elif dosub or RDACP['R']:
-         flist = PgFile.rda_glob(file, RDACP['fh'], 0, PgLOG.LGWNEX)
+         flist = PgFile.gdex_glob(file, RDACP['fh'], 0, PgLOG.LGWNEX)
          if flist: copy_list(flist, 1, file)
       else:
          PgLOG.pglog("{}{}: Add option -r to copy directory".format(CINFO['fhost'], file), PgLOG.LGEREX)
@@ -182,7 +182,7 @@ def copy_list(tlist, level, cdir):
          fcnt += copy_file(file, tlist[file]['isfile'])
          CINFO['cpflag'] |= (1 if tlist[file]['isfile'] else 2)
       elif level < RDACP['R']:
-         flist = PgFile.rda_glob(file, RDACP['fh'], 0, PgLOG.LGWNEX)
+         flist = PgFile.gdex_glob(file, RDACP['fh'], 0, PgLOG.LGWNEX)
          if flist: copy_list(flist, level+1, file)
 
    if fcnt > 1:   # display sub count if two or more files are copied
@@ -203,7 +203,7 @@ def copy_file(fromfile, isfile):
    else:
       tofile = RDACP['t']
  
-   return (1 if PgFile.copy_rda_file(tofile, fromfile, RDACP['th'], RDACP['fh'], PgLOG.LGWNEX) else 0)
+   return (1 if PgFile.copy_gdex_file(tofile, fromfile, RDACP['th'], RDACP['fh'], PgLOG.LGWNEX) else 0)
 
 #
 # call main() to start program

{rda_python_miscs-1.0.4 → rda_python_miscs-1.0.6}/src/rda_python_miscs/tcshqsub.py

@@ -24,7 +24,7 @@ DEFMODS = {
 }
 
 DEFLIBS = {
-   'default' : "conda activate /glade/work/rdadata/conda-envs/pg-casper",
+   'default' : "conda activate /glade/work/gdexdata/conda-envs/pg-casper",
 }
 
 SWAPMODS = {

{rda_python_miscs-1.0.4 → rda_python_miscs-1.0.6/src/rda_python_miscs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_miscs
-Version: 1.0.4
+Version: 1.0.6
 Summary: RDA Python package to hold RDA miscellaneous utility programs
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-miscs

{rda_python_miscs-1.0.4 → rda_python_miscs-1.0.6}/src/rda_python_miscs.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ src/rda_python_miscs/bashqsub.py
 src/rda_python_miscs/bashqsub.usg
 src/rda_python_miscs/gdexls.py
 src/rda_python_miscs/gdexls.usg
+src/rda_python_miscs/gdexls_standalone.py
 src/rda_python_miscs/pgwget.py
 src/rda_python_miscs/rdacp.py
 src/rda_python_miscs/rdacp.usg