From 554c21041ae06ec89de3265d78a300514b42355c Mon Sep 17 00:00:00 2001
From: Michael Smith <michael@hurts.ca>
Date: Sat, 11 Jun 2005 03:01:03 +0000
Subject: [PATCH] goodnight (times not parsed yet)

---
 CommandParser.py               | 60 ++++++++++++++++++++++++++++++++++++++++++
 tests/test_itinerary_parser.py |  4 ---
 2 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 CommandParser.py

diff --git a/CommandParser.py b/CommandParser.py
new file mode 100644
index 0000000..d024406
--- /dev/null
+++ b/CommandParser.py
@@ -0,0 +1,60 @@
+#
+# vi: set softtabstop=4 shiftwidth=4 tabstop=8 expandtab:
+
+"""Splits a command into source, destination, and time."""
+
+import sre
+
+import PlanTime
+
+class Command:
+    def __init__(self):
+        self.src = None
+        self.dest = None
+        self.time = None
+
+class CommandParseException(Exception):
+    pass
+
+class CommandParser:
+    def __init__(self, str):
+        self.cmd = None
+
+        self.parse(str)
+
+    def parse(self, str):
+        # Look for src and dest at the start of the string.
+        match = _full_rx.match(str)
+        if not match:
+            raise CommandParseException("Failed to extract source and "
+                                        "destination from command '%s'" % str);
+        self.cmd = Command()
+        self.cmd.src = match.group("src")
+        self.cmd.dest = match.group("dest")
+
+        # Now look for time constraints.
+        rule = match.group("rule")
+        timestr = match.group("time")
+        if rule and timestr:
+            ruleMap = {
+                "by": PlanTime.MUST_ARRIVE_BEFORE,
+                "at": PlanTime.MUST_LEAVE_AFTER,
+            }
+            self.cmd.time                   \
+                = PlanTime.PlanTime(self.decodeTime(timestr), ruleMap[rule])
+
+    def decodeTime(self, str):
+        raise CommandParseException("Unable to decode timespec '%s'" % str)
+
+_full_re = ("^\s*(?P<src>.*?)\s+to\s+(?P<dest>.*?)\s*"
+            # at this point the pattern either ends, or there's a timespec
+            "(?:$|(?P<rule>by|at)\s+(?P<time>.*?)\s*$)")
+_full_rx = sre.compile(_full_re)
+
+# 11:30
+# 11:30 pm
+# 1130 pm
+# 130 pm
+# 130
+_time_re = ("^(?P<hour>\d{1,2}):?(?P<min>\d\d)\s*(?i)(?P<mod>am?|pm?)?$")
+_time_rx = sre.compile(_time_re)
diff --git a/tests/test_itinerary_parser.py b/tests/test_itinerary_parser.py
index 226fcbc..7221e32 100755
--- a/tests/test_itinerary_parser.py
+++ b/tests/test_itinerary_parser.py
@@ -56,9 +56,5 @@ class TestLongItin(TestItinGrab):
         self.assertEquals(ie.direction, 'Baseline')
         self.assertEquals(ie.destination, 'MERIVALE / COLONNADE')
 
-    def testShortFormatter(self):
-        sf = ShortFormatter.ShortFormatter(self.entries)
-        print sf
-
 if __name__ == '__main__':
     unittest.main()
-- 
2.11.4.GIT