1.0.1rc2 (#41)

mikeqfu · web-flow · commit af0fe9cb3bf1 · 2025-03-18T20:32:58.000Z
diff --git a/pyrcs/data/.metadata b/pyrcs/data/.metadata
@@ -5,7 +5,7 @@
     "Author": "Qian Fu",
     "Affiliation": "School of Engineering, University of Birmingham",
     "Email": "q.fu@bham.ac.uk",
-    "Version": "1.0.1rc1",
+    "Version": "1.0.1rc2",
     "License": "MIT License",
     "First release": "August 2019"
 }
diff --git a/pyrcs/line_data/elr_mileage.py b/pyrcs/line_data/elr_mileage.py
@@ -95,7 +95,6 @@ def _parse_mileages(mileages):
             miles_chains = mileage_.map(mileage_to_mile_chain)  # Warning: Might contain issues!
 
         else:
-            # miles_chains = mileage.map(lambda x: re.sub(r'/?\d+\.\d+km/?', '', x))
             miles_chains = mileage.str.replace(r'/?\d+\.\d+km/?', '', regex=True)
             mileage_ = miles_chains.map(mile_chain_to_mileage)
 
@@ -123,13 +122,6 @@ def _parse_mileages(mileages):
 
 
 def _parse_node(node):
-    # node_x = node_x.replace(
-    #     ' with Freightliner terminal', ' & Freightliner Terminal').replace(
-    #     ' with curve to', ' with').replace(
-    #     ' (0.37 long)', '')
-    # pat = re.compile(
-    #     r'\w+.*( \(\d+\.\d+\))?(/| and \w+)? with '
-    #     r'([A-Z]){3}(\d)?( \(\d+\.\d+\))?')
     pat = re.compile(r'\w+.*( \(\d+\.\d+\))?(/| and \w+)? with ([A-Z]).*(\d)?( \(\d+\.\d+\))?')
 
     if re.match(pat, node):
@@ -954,29 +946,30 @@ def collect_mileage_file(self, elr, parsed=True, confirmation_required=True, dum
 
         elr_ = remove_punctuation(elr).upper()
 
-        if elr_ != '':
-
+        if elr_:
             if confirmed(f"To collect mileage file of \"{elr_}\"\n?", confirmation_required):
-
-                if verbose == 2:
-                    print(f"Collecting mileage file of \"{elr_}\"", end=" ... ")
+                if verbose in {True, 1}:
+                    message_ = "Collecting the mileage file"
+                    if not confirmation_required:
+                        message_ += f' of "{elr_}"'
+                    print(message_, end=" ... ")
 
                 try:
                     url = home_page_url() + f'/elrs/_mileages/{elr_[0]}/{elr_}.shtm'.lower()
                     source = requests.get(url=url, headers=fake_requests_headers())
 
                 except Exception as e:
                     print_inst_conn_err(verbose=verbose, e=e)
+                    return None
 
-                else:
-                    try:
-                        return self._collect_mileage_file(
-                            source=source, elr=elr_, parsed=parsed, dump_it=dump_it,
-                            verbose=verbose)
+                try:
+                    return self._collect_mileage_file(
+                        source=source, elr=elr_, parsed=parsed, dump_it=dump_it,
+                        verbose=verbose)
 
-                    except Exception as e:
-                        _print_failure_message(
-                            e=e, prefix="Errors:", verbose=verbose, raise_error=raise_error)
+                except Exception as e:
+                    _print_failure_message(
+                        e=e, prefix="Errors:", verbose=verbose, raise_error=raise_error)
 
     def fetch_mileage_file(self, elr, update=False, dump_dir=None, verbose=False,
                            raise_error=False):
@@ -1293,6 +1286,6 @@ def get_conn_mileages(self, start_elr, end_elr, update=False, **kwargs):
                 start_dest_mileage, conn_orig_mileage = '', ''
 
         else:
-            return [''] * 5
+            return tuple([''] * 5)
 
         return start_dest_mileage, conn_elr, conn_orig_mileage, conn_dest_mileage, end_orig_mileage
diff --git a/tests/test_elr_mileage.py b/tests/test_elr_mileage.py
@@ -10,13 +10,28 @@
 from pyrcs.line_data import ELRMileages
 
 
+def test__parse_mileages():
+    from pyrcs.line_data.elr_mileage import _parse_mileages
+
+    test_data = [['8.69 km', '10.12 km'], ['8.69', '10.12']]
+
+    for i, dat in enumerate(test_data):
+        test_mileages = pd.Series(data=dat, index=[0, 1], name='Mileage')
+        parsed_mileage = _parse_mileages(test_mileages)
+        assert parsed_mileage.columns.tolist() == ['Mileage', 'Mileage_Note', 'Miles_Chains']
+        if i == 0:
+            assert parsed_mileage['Mileage_Note'].str.contains('km').all()
+        else:
+            assert parsed_mileage['Mileage_Note'].tolist() == ['', '']
+
+
 class TestELRMileages:
 
     @pytest.fixture(scope='class')
     def em(self):
         return ELRMileages()
 
-    def test_collect_elr(self, em, capfd):
+    def test_collect_elr(self, em, capfd, monkeypatch):
         test_initials = ['a', 'q']
         for initial in test_initials:
             elr_codes = em.collect_elr(initial=initial, confirmation_required=False, verbose=True)
@@ -27,11 +42,27 @@ def test_collect_elr(self, em, capfd):
             assert f'beginning with "{test_initial}"' in out and "Done." in out
 
             assert isinstance(elr_codes, dict)
-            assert list(elr_codes.keys()) == [test_initial, 'Last updated date']
+            assert list(elr_codes.keys()) == [test_initial, em.KEY_TO_LAST_UPDATED_DATE]
 
             elrs_codes_dat = elr_codes[test_initial]
             assert isinstance(elrs_codes_dat, pd.DataFrame)
 
+        test_initial = 'B'
+
+        monkeypatch.setattr('builtins.input', lambda _: "No")
+        elr_codes = em.collect_elr(initial='b', verbose=True)
+        assert elr_codes is None
+
+        monkeypatch.setattr('builtins.input', lambda _: "Yes")
+        elr_codes = em.collect_elr(initial=test_initial, verbose=True)
+        out, _ = capfd.readouterr()
+        assert "Collecting the data" in out and "Done." in out
+
+        assert isinstance(elr_codes, dict)
+        assert list(elr_codes.keys()) == [test_initial, em.KEY_TO_LAST_UPDATED_DATE]
+        elrs_codes_dat = elr_codes[test_initial]
+        assert isinstance(elrs_codes_dat, pd.DataFrame)
+
     @pytest.mark.parametrize('update', [False, True])
     def test_fetch_elr(self, em, update):
         elrs_codes = em.fetch_elr(update=update, verbose=True)
@@ -42,24 +73,45 @@ def test_fetch_elr(self, em, update):
         elrs_codes_dat = elrs_codes[em.KEY]
         assert isinstance(elrs_codes_dat, pd.DataFrame)
 
-    def test_collect_mileage_file(self, em):
-        test_elrs = ['CJD', 'GAM', 'SLD', 'ELR']
+    def test_collect_mileage_file(self, em, monkeypatch, capfd):
+        test_elrs = ['GAM', 'SLD', 'ELR']
         for test_elr in test_elrs:
             test_mileage_file = em.collect_mileage_file(
                 elr=test_elr, confirmation_required=False, verbose=True)
-
+            out, _ = capfd.readouterr()
+            assert f'Collecting the mileage file of "{test_elr}" ... Done.' in out
             assert isinstance(test_mileage_file, dict)
             assert list(test_mileage_file.keys()) == ['ELR', 'Line', 'Sub-Line', 'Mileage', 'Notes']
             assert isinstance(test_mileage_file['Mileage'], pd.DataFrame)
 
+        test_elr = 'CJD'
+
+        monkeypatch.setattr('builtins.input', lambda _: "No")
+        test_mileage_file = em.collect_mileage_file(elr=test_elr, verbose=True)
+        assert test_mileage_file is None
+
+        monkeypatch.setattr('builtins.input', lambda _: "Yes")
+        test_mileage_file = em.collect_mileage_file(elr='CJD', verbose=True)
+        out, _ = capfd.readouterr()
+        assert 'Collecting the mileage file ... Done.' in out and "Done." in out
+        assert isinstance(test_mileage_file, dict)
+        assert list(test_mileage_file.keys()) == ['ELR', 'Line', 'Sub-Line', 'Mileage', 'Notes']
+        assert isinstance(test_mileage_file['Mileage'], pd.DataFrame)
+
     @pytest.mark.parametrize('update', [False, True])
-    def test_fetch_mileage_file(self, em, update):
+    def test_fetch_mileage_file(self, em, update, tmp_path, capfd):
         test_elrs = ['AAL', 'MLA']
         for test_elr in test_elrs:
             test_mileage_file = em.fetch_mileage_file(elr=test_elr, update=update, verbose=True)
             assert isinstance(test_mileage_file, dict)
             assert isinstance(test_mileage_file['Mileage'], (pd.DataFrame, dict))
 
+        test_mileage_file = em.fetch_mileage_file(elr='AAL', verbose=2, dump_dir=tmp_path)
+        out, _ = capfd.readouterr()
+        assert "Saving" in out and "Done." in out
+        assert isinstance(test_mileage_file, dict)
+        assert isinstance(test_mileage_file['Mileage'], (pd.DataFrame, dict))
+
     def test_search_conn(self, em):
         elr_1, elr_2 = 'AAM', 'ANZ'
 
@@ -78,6 +130,9 @@ def test_get_conn_mileages(self, em):
         conn = em.get_conn_mileages(start_elr='MAC3', end_elr='DBP1')
         assert conn == ('', '', '', '', '')
 
+        conn = em.get_conn_mileages(start_elr='MAC4', end_elr='DBP4')
+        assert conn == ('', '', '', '', '')
+
 
 if __name__ == '__main__':
     pytest.main()

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"Author": "Qian Fu",`
`6`	`6`	`"Affiliation": "School of Engineering, University of Birmingham",`
`7`	`7`	`"Email": "q.fu@bham.ac.uk",`
`8`		`- "Version": "1.0.1rc1",`
	`8`	`+ "Version": "1.0.1rc2",`
`9`	`9`	`"License": "MIT License",`
`10`	`10`	`"First release": "August 2019"`
`11`	`11`	`}`