TNO Intern

Commit acbc7df7 authored by Arjo Segers's avatar Arjo Segers
Browse files

Moved listing class to seperate module.

parent bec3b384

doc/source/pymod-cso_listing.rst

0 → 100644
+5 −0
Original line number Diff line number Diff line 
.. Documentation for module.



.. Import documentation from ".py" file:

.. automodule:: cso.cso_listing

doc/source/pymods.rst

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ Overview of the Python module(s) and classes. 
   pymod-cso_s5p

   pymod-cso_viirs

   pymod-cso_file

   pymod-cso_listing

   pymod-cso_gridded

   pymod-cso_superobs

   pymod-cso_colocate

src/cso/__init__.py

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
# 2025-02, Arjo Segers

#   Support VIIRS AOD data.

#

# 2026-07, Arjo Segers

#   Use new `cso_listing` module.

#





# -------------------------------------------------
@@ -35,6 +38,7 @@ The ``cso`` module is the top level access to the various 
Actual implementations can be found in submodules:



* :py:mod:`cso.cso_file`

* :py:mod:`cso.cso_listing`

* :py:mod:`cso.cso_inquire`

* :py:mod:`cso.cso_dataspace`

* :py:mod:`cso.cso_pal`
@@ -138,6 +142,7 @@ except: 


# import entities from sub-modules:

from .cso_file import *

from .cso_listing import *

from .cso_inquire import *

from .cso_dataspace import *

from .cso_colhub import *

src/cso/cso_catalogue.py

+5 −1
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 
#   Extended unit conversions.

#   Fixed string formatting.

#

# 2026-07, Arjo Segers

#   Use new `cso_listing` module.

#





########################################################################
@@ -319,6 +322,7 @@ class CSO_Catalogue(CSO_CatalogueBase): 


        # tools:

        from . import cso_file

        from . import cso_listing

        from . import cso_plot



        # setup graphics back-end:
@@ -353,7 +357,7 @@ class CSO_Catalogue(CSO_CatalogueBase): 
            raise Exception

        # endif

        # read listing:

        lst = cso_file.CSO_Listing(lstfile, indent=indent)

        lst = cso_listing.CSO_Listing(lstfile, indent=indent)

        # subset of files in timerange:

        xlst = lst.Select(tr=(t1, t2))

        # number of records:

src/cso/cso_colhub.py

+12 −9
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
# 2026-04, Arjo Segers

#   Skip files that cannot be accessed, for example a broken link.

#

# 2026-07, Arjo Segers

#   Use new `cso_listing` module.

#



########################################################################

###
@@ -162,7 +165,7 @@ class CSO_ColHubMirror_Inquire(utopya.UtopyaRc): 
        import fnmatch



        # tools:

        from . import cso_file

        from . import cso_listing



        # info ...

        logging.info(f"{indent}")
@@ -190,7 +193,7 @@ class CSO_ColHubMirror_Inquire(utopya.UtopyaRc): 


            # initiallize for (re)creation,

            # define extra columns to ensure correct content even for empty files:

            listing = cso_file.CSO_Listing( columns=["orbit","processing","collection","processor_version","production_time","href"] )

            listing = cso_listing.CSO_Listing( columns=["orbit","processing","collection","processor_version","production_time","href"] )



            # archive directories

            archive_dirs = self.GetSetting("dir").split()
@@ -402,7 +405,7 @@ class CSO_ColHubMirror_Missing(utopya.UtopyaRc): 
        import fnmatch



        # tools:

        from . import cso_file

        from . import cso_listing



        # info ...

        logging.info(f"{indent}")
@@ -430,7 +433,7 @@ class CSO_ColHubMirror_Missing(utopya.UtopyaRc): 


            # initiallize for (re)creation,

            # define extra columns to ensure correct content even for empty files:

            listing = cso_file.CSO_Listing( columns=["orbit","processing","collection","processor_version","production_time","href"] )

            listing = cso_listing.CSO_Listing( columns=["orbit","processing","collection","processor_version","production_time","href"] )





            # table with all available files:
@@ -441,7 +444,7 @@ class CSO_ColHubMirror_Missing(utopya.UtopyaRc): 
            )

            listfile_all = filedate.strftime(listfile_all)

            # read:

            listing_all = cso_file.CSO_Listing(listfile_all)

            listing_all = cso_listing.CSO_Listing(listfile_all)



            # table with currently already available files:

            listfiles = self.GetSetting("curr.file").split(";")
@@ -456,7 +459,7 @@ class CSO_ColHubMirror_Missing(utopya.UtopyaRc): 
                listfile = filedate.strftime(listfile)

                listfile = listfile.strip()

                # read:

                listings_curr.append(cso_file.CSO_Listing(listfile))

                listings_curr.append(cso_listing.CSO_Listing(listfile))

            # endfor



            # extract orbits:
@@ -651,7 +654,7 @@ class CSO_ColHubMirror_Cleanup(utopya.UtopyaRc): 
        import fnmatch



        # tools:

        from . import cso_file

        from . import cso_listing



        # info ...

        logging.info(f"{indent}")
@@ -669,7 +672,7 @@ class CSO_ColHubMirror_Cleanup(utopya.UtopyaRc): 
        )

        listfile1 = filedate1.strftime(listfile1)

        # read:

        listing1 = cso_file.CSO_Listing(listfile1)

        listing1 = cso_listing.CSO_Listing(listfile1)



        # table files in extra archive:

        listfile2= self.GetSetting("mirror2.file")
@@ -679,7 +682,7 @@ class CSO_ColHubMirror_Cleanup(utopya.UtopyaRc): 
        )

        listfile2 = filedate2.strftime(listfile2)

        # read:

        listing2 = cso_file.CSO_Listing(listfile2)

        listing2 = cso_listing.CSO_Listing(listfile2)



        # remove duplicate files? if not, rename:

        remove_duplicates = self.GetSetting("mirror2.remove_duplicates", totype="bool")