Merge pull request #223 from pnuu/bugfix-downloader-skip-empty-lines

Bugfix `Downloader` handling of trailing empty lines

Author: pnuu

pyorbital/tests/test_tlefile.py

@@ -499,10 +499,10 @@ def test_from_mmam_xml(self):
 }
 
 
-class TestDownloader(unittest.TestCase):
+class TestDownloader:
     """Test TLE downloader."""
 
-    def setUp(self):
+    def setup_method(self):
         """Create a downloader instance."""
         from pyorbital.tlefile import Downloader
         self.config = {}
@@ -648,11 +648,20 @@ def test_fetch_spacetrack_success(self, requests):
         assert res[0].line1 == LINE1
         assert res[0].line2 == LINE2
 
-    def test_read_tle_files(self):
+    @pytest.mark.parametrize(
+        "tle_lines", [(LINE1, LINE2),
+                      (LINE1, LINE2, ""),
+                      (LINE1, LINE2, "", ""),
+                      (LINE0, LINE1, LINE2),
+                      (LINE0, LINE1, LINE2, ""),
+                      (LINE0, LINE1, LINE2, "", ""),
+                      ]
+    )
+    def test_read_tle_files(self, tle_lines):
         """Test reading TLE files from a file system."""
         from tempfile import TemporaryDirectory
 
-        tle_text = "\n".join((LINE0, LINE1, LINE2))
+        tle_text = "\n".join(tle_lines)
 
         save_dir = TemporaryDirectory()
         with save_dir:

pyorbital/tlefile.py

@@ -415,23 +415,34 @@ def _decode_lines(fid, l_0, platform, only_first, open_is_dummy=False):
     designator = "1 " + SATELLITES.get(platform, "")
     tle = ""
     l_0 = _decode(l_0)
-    if l_0.strip() == platform:
-        l_1 = _decode(next(fid))
-        l_2 = _decode(next(fid))
-        tle = _merge_tle_from_two_lines(l_1, l_2)
+    if l_0.strip() == platform and platform != "":
+        tle = _decode_lines_with_platform_header(fid)
     elif l_0.strip().startswith(designator):
-        if (platform in SATELLITES or not only_first) or open_is_dummy:
-            l_1 = l_0
-            l_2 = _decode(next(fid))
-            tle = _merge_tle_from_two_lines(l_1, l_2)
-            if platform:
-                LOGGER.debug("Found platform %s, ID: %s", platform, SATELLITES[platform])
+        tle = _decode_lines_without_platform_header(fid, l_0, platform, only_first, open_is_dummy)
     elif l_0.startswith(platform) and platform not in SATELLITES:
         LOGGER.debug("Found a possible match: %s?", str(l_0.strip()))
 
     return tle
 
 
+def _decode_lines_with_platform_header(fid):
+    l_1 = _decode(next(fid))
+    l_2 = _decode(next(fid))
+    tle = _merge_tle_from_two_lines(l_1, l_2)
+    return tle
+
+
+def _decode_lines_without_platform_header(fid, l_0, platform, only_first, open_is_dummy):
+    tle = ""
+    if (platform in SATELLITES or not only_first) or open_is_dummy:
+        l_1 = l_0
+        l_2 = _decode(next(fid))
+        tle = _merge_tle_from_two_lines(l_1, l_2)
+        if platform:
+            LOGGER.debug("Found platform %s, ID: %s", platform, SATELLITES[platform])
+    return tle
+
+
 def _merge_tle_from_two_lines(l_1, l_2):
     """Merge line1 and line2 to fulle TLE string."""
     return l_1.strip() + "\n" + l_2.strip()