Fixed bug and improved error handling

w-henderson · Nov 30, 2020 · e4c67d2 · e4c67d2
1 parent 5098dac
commit e4c67d2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/api.nim b/src/api.nim
@@ -87,12 +87,20 @@ proc loadDepartures(crs: string): Station =
 
         if len(stops) > 1:
             for i in 0..len(callingPointsObject)-1:
-                stops[i] = CallingPoint(
-                    name: callingPointsObject[i].attr("Name"),
-                    crs: callingPointsObject[i].attr("crs"),
-                    scheduledDeparture: parseTime(callingPointsObject[i].attr("ttdep")),
-                    expectedDeparture: parseTime(callingPointsObject[i].attr("etdep"))
-                )
+                try:
+                    stops[i] = CallingPoint(
+                        name: callingPointsObject[i].attr("Name"),
+                        crs: callingPointsObject[i].attr("crs"),
+                        scheduledDeparture: parseTime(callingPointsObject[i].attr("ttdep")),
+                        expectedDeparture: parseTime(callingPointsObject[i].attr("etdep"))
+                    )
+                except:
+                    stops[i] = CallingPoint(
+                        name: callingPointsObject[i].attr("Name"),
+                        crs: callingPointsObject[i].attr("crs"),
+                        scheduledDeparture: parseTime(callingPointsObject[i].attr("ttdep")),
+                        expectedDeparture: parseTime(callingPointsObject[i].attr("ttdep"))
+                    )
         try:
             stops[len(stops) - 1] = CallingPoint(
                 name: serviceXML.findAll("Destination1")[0].attr("name"),

diff --git a/src/nimtrains.nim b/src/nimtrains.nim
@@ -90,7 +90,7 @@ if paramCount() == 1:
     try:
         let services = loadDepartures(tryToParseName(paramStr(1)))
         renderStation(services)
-    except:
+    except StationNotFound:
         coloredWrite("[ERROR]: Can't find the specified station! If it's a full name instead of a CRS code, make sure it's in quote marks.\n", fgRed)
 
 # If given the wrong number of arguments throw an error

diff --git a/src/stations.nim b/src/stations.nim
@@ -3400,11 +3400,13 @@ var stationsRaw = """{
 import json
 import strutils
 
+type StationNotFound = object of ValueError
+
 # Parse the JSON stations data
 let stations: JsonNode = parseJson(stationsRaw)
 
 proc nameToCrs(name: string): string =
     for stat in stations.keys:
         if stations[stat]["name"].getStr().toLower() == name.toLower():
             return stat
-    raise newException(Exception, "Target doesn't exist.")
+    raise newException(StationNotFound, "Station not found.")