Merge pull request #2 from NASA-IMPACT/sr_hdf

Return invalid for fmask valid pixels less than 2%.

parse_fmask/parse_fmask.py

@@ -1,4 +1,5 @@
 import click
+import re
 
 
 @click.command()
@@ -7,11 +8,16 @@
     type=click.STRING,
 )
 def main(fmaskoutput):
-    lines = fmaskoutput.splitlines()
-    if "0.00%" in lines[len(lines) - 3]:
-        click.echo("invalid")
-    else:
+    result = re.search(r"\d+%|([0-9]\d?)\.\d", fmaskoutput)
+    if result is None:
         click.echo("valid")
+    else:
+        clear_percentage = result.group()
+        value = float(clear_percentage)
+        if value < 2:
+            click.echo("invalid")
+        else:
+            click.echo("valid")
 
 
 if __name__ == "__main__":

tests/test_parse_fmask.py

@@ -3,16 +3,7 @@
 
 
 def test_parse_fmask_invalid():
-    fmaskoutput = \
-        """Fmask 4.2 start ...
-        Cloud/cloud shadow/snow dilated by 3/3/0 pixels.
-        probability threshold of 20.00%.
-        or calculate TOA reflectances.
-        potential clouds, cloud shadows, snow, and water.
-        clear pixel in this image (clear-sky pixels = 102Fmask 4.2 finished (3.95 minutes)
-        for L1C_T37WFN_A017436_20200708T084600 with 0.00% clear pixels
-        Input file size is 5490, 5490
-        0...10...20...30...40...50...60...70...80...90...100 - done."""
+    fmaskoutput = "for L1C_T37WFN_A017436_20200708T084600 with 0.01% clear pixels"
 
     runner = CliRunner(echo_stdin=True)
     result = runner.invoke(main, [
@@ -23,16 +14,18 @@ def test_parse_fmask_invalid():
 
 
 def test_parse_fmask_valid():
-    fmaskoutput = \
-        """Fmask 4.2 start ...
-        Cloud/cloud shadow/snow dilated by 3/3/0 pixels.
-        probability threshold of 20.00%.
-        or calculate TOA reflectances.
-        potential clouds, cloud shadows, snow, and water.
-        clear pixel in this image (clear-sky pixels = 102Fmask 4.2 finished (3.95 minutes)
-        for L1C_T37WFN_A017436_20200708T084600 with 99.01% clear pixels
-        Input file size is 5490, 5490
-        0...10...20...30...40...50...60...70...80...90...100 - done."""
+    fmaskoutput = "for L1C_T23XNB_A017440_20200708T152810 with 21.03% clear pixels"
+
+    runner = CliRunner(echo_stdin=True)
+    result = runner.invoke(main, [
+        fmaskoutput
+    ], catch_exceptions=False)
+    assert result.exit_code == 0
+    assert result.stdout == "valid\n"
+
+
+def test_parse_fmask_no_percent():
+    fmaskoutput = "for L1C_T23XNB_A017440_20200708T152810 with clear pixels"
 
     runner = CliRunner(echo_stdin=True)
     result = runner.invoke(main, [