PyTransportNSWv2 2.0.1__tar.gz → 2.0.3__tar.gz

{PyTransportNSWv2-2.0.1 → PyTransportNSWv2-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 2.0.1
+Version: 2.0.3
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999

{PyTransportNSWv2-2.0.1 → PyTransportNSWv2-2.0.3}/PyTransportNSWv2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 2.0.1
+Version: 2.0.3
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999

{PyTransportNSWv2-2.0.1 → PyTransportNSWv2-2.0.3}/TransportNSWv2/TransportNSWv2.py

@@ -12,6 +12,15 @@ import re
 import json					#For the output
 import time
 
+# Global API variable
+api_calls = 0
+
+def increment_api_counter(source):
+    global api_calls
+    api_calls += 1
+    #print(str(api_calls) + " " + source)
+
+# Constants
 ATTR_DUE_IN = 'due'
 
 ATTR_ORIGIN_STOP_ID = 'origin_stop_id'
@@ -117,7 +126,10 @@ class TransportNSWv2(object):
                 error_code = 0
 
                 if not skip_api_calls:
+                    # Make the call and increment the API counter
                     response = requests.get(url, headers=header, timeout=5)
+                    increment_api_counter('stop_finder')
+
                 else:
                     # An earlier call resulted in an API key error so no point trying again
                     response.status_code = 401
@@ -195,7 +207,7 @@ class TransportNSWv2(object):
             origin_transport_type = [origin_transport_type]
 
         if isinstance(destination_transport_type, int):
-            destiation_transport_type = [destination_transport_type]
+            destination_transport_type = [destination_transport_type]
 
         if isinstance(alert_type, str):
             alert_type = alert_type.split('|')
@@ -242,6 +254,7 @@ class TransportNSWv2(object):
         # Otherwise store the response for the next steps
         try:
             response = requests.get(url, headers=header, timeout=10)
+            increment_api_counter('trip')
 
         except Exception as ex:
             raise TripError (f"Error '{str(ex)}' calling trip API for journey {name_origin} to {name_destination}")
@@ -256,7 +269,7 @@ class TransportNSWv2(object):
                 raise APIRateLimitExceeded("Error 'API rate limit exceeded' calling trip API for journey {name_origin} to {name_destination}")
 
             else:
-                raise TripError(f"Error '{str(response.status_cude)}' calling trip API for journey {name_origin} to {name_destination}")
+                raise TripError(f"Error '{str(response.status_code)}' calling trip API for journey {name_origin} to {name_destination}")
 
         result = response.json()
 
@@ -426,7 +439,7 @@ class TransportNSWv2(object):
 
                 current_journey_index = next_journey_index
 
-        json_output='{"journeys_to_return": ' + str(journeys_to_return) + ', "journeys_with_data": ' + str(found_journeys) + ', "journeys": [' + json_output + ']}'
+        json_output='{"journeys_to_return": ' + str(journeys_to_return) + ', "journeys_with_data": ' + str(found_journeys) + ', "api_calls": '  + str(api_calls) + ', "journeys": [' + json_output + ']}'
         return json_output
 
 
@@ -439,14 +452,16 @@ class TransportNSWv2(object):
             return None, None, None, None, None
 
         for journey_index in range (start_journey_index, journey_count, 1):
-            origin_leg = self._find_first_leg(journeys[journey_index]['legs'], origin_transport_type, strict, route_filter)
+            journey = journeys[journey_index]
+
+            origin_leg = self._find_first_leg(journey['legs'], origin_transport_type, strict, route_filter)
 
             if origin_leg is not None:
-                destination_leg = self._find_last_leg(journeys[journey_index]['legs'], destination_transport_type, strict)
+                destination_leg = self._find_last_leg(journey['legs'], destination_transport_type, strict)
 
             if origin_leg is not None and destination_leg is not None:
-                changes = self._find_changes(journeys[journey_index]['legs'], origin_leg, destination_leg)
-                return journeys[journey_index]['legs'], journey_index + 1, origin_leg, destination_leg, changes
+                changes = self._find_changes(journey['legs'], origin_leg, destination_leg)
+                return journey['legs'], journey_index + 1, origin_leg, destination_leg, changes
             else:
                 return None, None, None, None, None
 
@@ -510,24 +525,28 @@ class TransportNSWv2(object):
 
 
     def _find_changes(self, legs, origin_leg, destination_leg):
-        # Find out how often we have to change
+        # Find out how often we have to change.  Immediately return 0 if the origin and destination legs are the same
+        if origin_leg == destination_leg:
+            return 0
+
+        # Count the changes, each time we hit new non-walking leg is considered to be a change
         changes = 0
         bInJourney = False
 
         for leg in legs:
-            if leg == destination_leg:
-                # We've found the last leg (which oould be the same as the first leg), stop counting
-                return changes
-
             if leg == origin_leg:
-                # We've found the first leg, start counting
+                # We're in the journey so start capturing changes
                 bInJourney = True
-            else:
-                if bInJourney:
-                    leg_class = leg['transportation']['product']['class']
-                    if leg_class < 99:
+
+            elif bInJourney:
+                leg_class = leg['transportation']['product']['class']
+                if leg_class < 99:
+                    if leg != destination_leg:
                         changes += 1
 
+            if leg == destination_leg:
+                return changes
+
         # We should never get here!
         return 999
 
@@ -559,12 +578,14 @@ class TransportNSWv2(object):
         header = {'Accept': 'application/json', 'Authorization': auth}
 
         url_base_path = self._get_base_url(mode)
-
         url_mode_list = self._get_mode_list(mode, agencyid)
+
         if not url_mode_list is None:
             for mode_url in url_mode_list:
                 url = url_base_path + mode_url
                 response = requests.get(url, headers=header, timeout=10)
+                increment_api_counter(url)
+
                 # Only try and process the results if we got a good return code
                 if response.status_code == 200:
                     # Search the feed and see if we can match realtimetripid to trip_id

{PyTransportNSWv2-2.0.1 → PyTransportNSWv2-2.0.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="PyTransportNSWv2",
-    version="2.0.1",
+    version="2.0.3",
     author="andystewart999",
     author_email="andy.stewart@live.com",
     description="Get detailed per-trip transport information from TransportNSW",