Skip to content
Snippets Groups Projects
Commit 857d9ba2 authored by Petrus Hyvönen's avatar Petrus Hyvönen
Browse files

Using logging instead of printing.

parent edf1a881
No related branches found
No related tags found
1 merge request!22Fix logging issue 8
......@@ -106,25 +106,26 @@ s
import orekitdata
datafile = File(orekitdata.__path__[0])
if not datafile.exists():
print(f"""Unable to find orekitdata library folder,
logging.info(f"""Unable to find orekitdata library folder,
will try to load Orekit data using the folder or filename {filename}""")
else:
filename = orekitdata.__path__[0]
data_load_from_library_sucessful = True
except ImportError:
print(f"""Failed to load orekitdata library.
except ImportError as e:
logging.warning(f"""Failed to load orekitdata library.
Install with `pip install git+https://gitlab.orekit.org/orekit/orekit-data.git`
Will try to load Orekit data using the folder or filename {filename}""")
if not data_load_from_library_sucessful:
if filename is None:
print("filename argument was None, unable to load orekit data from file or folder")
return
logging.warning("filename argument was None, unable to load orekit data from file or folder")
raise FileNotFoundError("filename argument was None, unable to load orekit data from file or folder")
datafile = File(filename)
if not datafile.exists():
print('File or folder:', datafile.getAbsolutePath(), ' not found')
print("""
logging.warning('File or folder:', datafile.getAbsolutePath(), ' not found')
logging.warning("""
The Orekit library relies on some external data for physical models.
Typical data are the Earth Orientation Parameters and the leap seconds history,
......@@ -139,14 +140,18 @@ s
orekit.pyhelpers.download_orekit_data_curdir()
""")
return
raise FileNotFoundError('File or folder:', datafile.getAbsolutePath(), ' not found')
logging.debug('Loading Orekit data from:', datafile.getAbsolutePath())
if os.path.isdir(filename):
crawler = DirectoryCrawler(datafile)
elif os.path.isfile(filename):
crawler = ZipJarCrawler(datafile)
else:
print('filename ', filename, ' is neither a file nor a folder')
logging.warning('Could not load orekit data from filename: ', filename)
raise FileNotFoundError('Could not load orekit data from filename: ', filename)
DM.clearProviders()
DM.clearLoadedDataNames()
DM.resetFiltersToDefault()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment