Improve used sources listing

Author: svenseeberg

opendrift_leeway_webgui/simulation.py

@@ -80,12 +80,7 @@ def main():
     parser.add_argument(
         "--id", help="ID used for result image name.", default=str(uuid.uuid4())
     )
-    parser.add_argument(
-        "--no-web",
-        help="Disable fetching simulation data from web.",
-        action="store_true",
-        default=False,
-    )
+
     args = parser.parse_args()
 
     simulation = Leeway(loglevel=50)
@@ -95,8 +90,9 @@ def main():
         for data_file in os.listdir(INPUTDIR)
         if data_file.endswith(".nc")
     ]
+    sources = []
     if local_sources:
-        sources = local_sources
+        sources += local_sources
     elif not args.no_web:
         if os.environ.get("COPERNICUSMARINE_SERVICE_USERNAME") not in (
             None,
@@ -109,7 +105,9 @@ def main():
                 "cmems_mod_glo_phy_anfc_merged-uv_PT1H-i",
                 "cmems_obs-wind_glo_phy_nrt_l4_0.125deg_PT1H",
             ]
-            print("Using sources:\n - {}".format("\n - ".join(cmems_dataset_ids)))
+            print(
+                "Using CMEMS datasets:\n - {}".format("\n - ".join(cmems_dataset_ids))
+            )
             readers = []
             for dataset_id in cmems_dataset_ids:
                 try:
@@ -123,18 +121,16 @@ def main():
                     raise
                 readers.append(Reader(ds, name=dataset_id))
             simulation.add_reader(readers)
-            sources = [
+            sources += [
                 "https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd"
             ]
-            simulation.add_readers_from_list(sources, lazy=False)
-
     else:
-        sources = [
+        sources += [
             "https://tds.hycom.org/thredds/dodsC/GLBy0.08/latest",
             "https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd",
         ]
-        print("Using sources:\n - {}".format("\n - ".join(sources)))
-        simulation.add_readers_from_list(sources, lazy=False)
+    print("Using sources:\n - {}".format("\n - ".join(sources)))
+    simulation.add_readers_from_list(sources, lazy=False)
 
     reader_landmask = reader_global_landmask.Reader()
     simulation.add_reader([reader_landmask])