i.sentinel.download: add S3OL1 product types (#865)

* add S3OL1 product types

* fix minor bugs with -s flag

src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.html

@@ -28,11 +28,18 @@ <h3>Copernicus Open Access Hub</h3>
     <li>S2MSI1C: Top-Of-Atmosphere reflectances in cartographic geometry (Level-1C)</li>
   </ul>
   </li>
-  <li>Sentinel-3 (OLCI and SLSTR instrument data products at level 2; available from April 2018 to present day)
-  (optical) <a href="https://sentinel.esa.int/web/sentinel/missions/sentinel-3/data-products">products</a>:
+  <li>Sentinel-3 (OLCI and SLSTR instrument data products at level 2, for OLCI sensor also Level 1;
+  available from April 2018 to present day) (optical)
+  <a href="https://sentinel.esa.int/web/sentinel/missions/sentinel-3/data-products">products</a>:
   <ul>
-    <li>S3OL2LFR: Land and atmosphere geophysical parameters</li>
-    <li>S3OL2LRR: Land and atmosphere geophysical parameters at reduced resolution</li>
+    <li>S3OL1EFR: Land colour and atmosphere TOA radiances at full resolution</li>
+    <li>S3OL1ERR: Land colour and atmosphere TOA radiances at reduced resolution</li>
+    <li>S3OL1RAC: Dark offset and gain coefficients from radiometric calibration</li>
+    <li>S3OL1SAC: Wavelength characterisation from spectral calibration</li>
+    <li>S3OL2WFR: Ocean colour, water and atmosphere geophysical parameters</li>
+    <li>S3OL2WRR: Ocean colour, water and atmosphere geophysical parameters at reduced resolution</li>
+    <li>S3OL2LFR: Land colour and atmosphere geophysical parameters</li>
+    <li>S3OL2LRR: Land colour and atmosphere geophysical parameters at reduced resolution</li>
     <li>S3SL2LST: Land Surface Temperature</li>
     <li>S3SL2FRP: Fire Radiative Power</li>
     <li>S3SR2LAN: Land Surface Height</li>

src/imagery/i.sentinel/i.sentinel.download/i.sentinel.download.py

@@ -69,7 +69,7 @@
 # % description: Sentinel product type to filter
 # % label: USGS Earth Explorer only supports S2MSI1C
 # % required: no
-# % options: SLC,GRD,OCN,S2MSI1C,S2MSI2A,S2MSI2Ap,S3OL2LFR,S3OL2LRR,S3SL2LST,S3SL2FRP,S3SY2SYN,S3SY2VGP,S3SY2VG1,S3SY2V10,S3SY2AOD,S3SR2LAN
+# % options: SLC,GRD,OCN,S2MSI1C,S2MSI2A,S2MSI2Ap,S3OL1EFR,S3OL1ERR,S3OL1SPC,S3OL1RAC,S3OL2WFR,S3OL2WRR,S3OL2LFR,S3OL2LRR,S3SL2LST,S3SL2FRP,S3SY2SYN,S3SY2VGP,S3SY2VG1,S3SY2V10,S3SY2AOD,S3SR2LAN
 # % answer: S2MSI2A
 # % guisection: Filter
 # %end
@@ -170,6 +170,7 @@
 import fnmatch
 import hashlib
 import os
+import re
 import xml.etree.ElementTree as ET
 import shutil
 import sys
@@ -319,8 +320,6 @@ def get_bbox_from_S2_UTMtile(tile):
 
 def check_s2l1c_identifier(identifier, source="esa"):
     # checks beginning of identifier string for correct pattern
-    import re
-
     if source == "esa":
         expression = "^(S2[A-B]_MSIL1C_20[0-9][0-9][0-9][0-9])"
         test = re.match(expression, identifier)
@@ -736,7 +735,9 @@ def skip_existing(self, output, pattern_file):
             return
         # Check for previously downloaded scenes
         existing_files = [
-            f for f in os.listdir(output) if re.search(r".zip$|.safe$|.ZIP$|.SAFE$", f)
+            os.path.join(output, f)
+            for f in os.listdir(output)
+            if re.search(r".zip$|.safe$|.ZIP$|.SAFE$", f)
         ]
         if len(existing_files) <= 1:
             return