From f1a28be8161c8206409bb517045ff416baab86de Mon Sep 17 00:00:00 2001
From: Gerrit Holl <gerrit.holl@dwd.de>
Date: Wed, 20 May 2020 15:14:40 +0200
Subject: [PATCH 1/2] GRIB: Add file pattern for NWCSAF input file names

For the GRIB reader, add the file pattern corresponding to the NWCSAF
input file type, which ends in ``.grib``.  So far ``.grib2``, ``.grb``,
and ``.grb2`` are recognised, but not ``.grib``.
---
 satpy/etc/readers/grib.yaml           |  3 +++
 satpy/tests/reader_tests/test_grib.py | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/satpy/etc/readers/grib.yaml b/satpy/etc/readers/grib.yaml
index 0d82968e11..834612a326 100644
--- a/satpy/etc/readers/grib.yaml
+++ b/satpy/etc/readers/grib.yaml
@@ -17,6 +17,9 @@ file_types:
      # S-OSI_-NOR_-MULT-AHLDLI_FIELD-201805011200Z.grb.gz
      - '{stem}.grb'
      - '{stem}.grb2'
+     # NWCSAF input file name format:
+     # S_NWC_NWP_2017-03-14T00:00:00Z_002.grib
+     - 'S_NWC_NWP_{start_time:%Y-%m-%dT%H:%M:%S}Z_{forecast_time:3d}.grib'
 #  grib_ncep:
 #    file_reader: !!python/name:satpy.readers.grib.GRIBFileHandler
 #    file_patterns:
diff --git a/satpy/tests/reader_tests/test_grib.py b/satpy/tests/reader_tests/test_grib.py
index 5012c3fa9b..a94d0ca5e4 100644
--- a/satpy/tests/reader_tests/test_grib.py
+++ b/satpy/tests/reader_tests/test_grib.py
@@ -178,6 +178,21 @@ def test_init(self, pg):
         # make sure we have some files
         self.assertTrue(r.file_handlers)
 
+    def test_file_pattern(self):
+        """Test matching of file patterns."""
+        from satpy.readers import load_reader
+
+        filenames = [
+                "quinoia.grb",
+                "tempeh.grb2",
+                "tofu.grib2",
+                "falafel.grib",
+                "S_NWC_NWP_1900-01-01T00:00:00Z_999.grib"]
+
+        r = load_reader(self.reader_configs)
+        files = r.select_files_from_pathnames(filenames)
+        self.assertEqual(len(files), 4)
+
     @mock.patch('satpy.readers.grib.pygrib')
     def test_load_all(self, pg):
         """Test loading all test datasets"""

From 9fac7758f57b43421e2ecdc20e296841da7c8b11 Mon Sep 17 00:00:00 2001
From: Gerrit Holl <gerrit.holl@dwd.de>
Date: Wed, 20 May 2020 15:27:22 +0200
Subject: [PATCH 2/2] Fix spelling of quinoa

---
 satpy/tests/reader_tests/test_grib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/satpy/tests/reader_tests/test_grib.py b/satpy/tests/reader_tests/test_grib.py
index a94d0ca5e4..8fb5a3fbb9 100644
--- a/satpy/tests/reader_tests/test_grib.py
+++ b/satpy/tests/reader_tests/test_grib.py
@@ -183,7 +183,7 @@ def test_file_pattern(self):
         from satpy.readers import load_reader
 
         filenames = [
-                "quinoia.grb",
+                "quinoa.grb",
                 "tempeh.grb2",
                 "tofu.grib2",
                 "falafel.grib",