Merge pull request #34 from tgoulder4/32-2-lowercase-findtrains-param…

…eter 32 2 lowercase findtrains parameter
tgoulder4 · Aug 27, 2023 · 8069544 · 8069544
2 parents 025c030 + 859a6c0
commit 8069544
Show file tree

Hide file tree

Showing 30 changed files with 23,619 additions and 26,270 deletions.
diff --git a/dist/src/findTrains.js b/dist/src/findTrains.js
@@ -25,13 +25,13 @@ const findStationNameAndCode = (stationNameOrCode) => {
     // console.log(
     //   `stationName: ${stationName}, stationCode: ${stationCode}, stationNameOrCode: ${stationNameOrCode}`
     // );
-    const match = stationNameOrCode.match(/^[A-Z]{3}$/);
+    const match = stationNameOrCode.trim().match(/^[A-Za-z]{3}$/);
     if (match) {
         // console.log(`match: ${match}`);
-        const jsonMatch = stationLocations[match[0]];
+        const jsonMatch = stationLocations[match[0].toUpperCase()];
         if (jsonMatch) {
-            stationName = stationLocations[match[0]].station_name;
-            stationCode = match[0];
+            stationName = jsonMatch.station_name;
+            stationCode = match[0].toUpperCase();
         }
         else {
             stationName = null;
@@ -80,7 +80,7 @@ function findTrains(stationNameOrCode, dateOfDeparture = getCurrentDayTime("YYYY
         };
         const services = [];
         //rate limiter
-        yield new Promise((r) => setTimeout(r, 500));
+        // await new Promise((r) => setTimeout(r, 500));
         const res = yield fetch(`https://www.realtimetrains.co.uk/search/detailed/gb-nr:${stationCode}/${dateOfDeparture}/${timeOfDeparture}`);
         const $ = cheerio.load(yield res.text());
         for (const el of $("a.service").toArray()) {

diff --git a/dist/src/index.js b/dist/src/index.js
@@ -7,15 +7,15 @@ module.exports = {
     trackTrain: trackTrain_1.trackTrain,
 };
 // const util = require("util");
-// trackTrain("G59487").then((emitter) => {
-//   emitter.on("journey", (data) => {
-//     console.log(util.inspect(data, false, null, true));
-//   });
-//   emitter.on("information", (data) => {
-//     console.log(util.inspect(data, false, null, true));
-//   });
-// });
+// // trackTrain("G59487").then((emitter) => {
+// //   emitter.on("journey", (data) => {
+// //     console.log(util.inspect(data, false, null, true));
+// //   });
+// //   emitter.on("information", (data) => {
+// //     console.log(util.inspect(data, false, null, true));
+// //   });
+// // });
 // (async () => {
-//   const data = await findTrains("BHM");
-//   console.log(util.inspect(data, false, null, true));
+//   const data = await getHTML("testServiceID", "2023-01-01");
+//   console.log(`DATA IS THIS: ${data}`);
 // })();