From 703704a005939a3d932120d06bf0e7da534d7f70 Mon Sep 17 00:00:00 2001
From: Rossen Georgiev <zoorty@gmail.com>
Date: Sun, 18 Jan 2015 03:25:25 +0000
Subject: [PATCH] now able to parse object report format

---
 README.rst       |  1 +
 aprslib/parse.py | 31 +++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index 73c81c1..bb2d7a6 100644
--- a/README.rst
+++ b/README.rst
@@ -8,6 +8,7 @@ Parsing of packets is also possible, but the entire spec is not fully implemenet
 The following is supported:
 
 -  normal/compressed position reports
+-  objects
 -  mic-e position report
 -  messages (inc. telemetry, bulletins, etc)
 -  base91 comment telemetry extention
diff --git a/aprslib/parse.py b/aprslib/parse.py
index 43a5bf4..10371c4 100644
--- a/aprslib/parse.py
+++ b/aprslib/parse.py
@@ -119,7 +119,6 @@ def parse(packet):
         # , - invalid/test format
         # - - unused
         # . - reserved
-        # ; - object report
         # < - station capabilities
         # ? - general query format
         # T - telemetry report
@@ -130,7 +129,7 @@ def parse(packet):
         # _ - positionless weather report
         # { - user defined
         # } - 3rd party traffic
-        if packet_type in '#$%)*,;<?T[_{}':
+        if packet_type in '#$%)*,<?T[_{}':
             raise UnknownFormat("format is not supported", packet)
 
         # STATUS PACKET
@@ -163,17 +162,31 @@ def parse(packet):
             parsed.update(result)
 
         # postion report (regular or compressed)
-        elif (packet_type in '!=/@' or
+        elif (packet_type in '!=/@;' or
               0 <= body.find('!') < 40):  # page 28 of spec (PDF)
 
-            if packet_type not in '!=/@':
+            if packet_type not in '!=/@;':
                 prefix, body = body.split('!', 1)
                 packet_type = '!'
 
-            parsed.update({"messagecapable": packet_type in '@='})
+            if packet_type == ';':
+                logger.debug("Attempting to parse object report format")
+                match = re.findall(r"^([ -~]{9})(\*|_)", body)
+                if match:
+                    name, flag = match[0]
+                    parsed.update({
+                        'object_name': name,
+                        'alive': flag == '*',
+                        })
+
+                    body = body[10:]
+                else:
+                    raise ParseError("invalid format")
+            else:
+                parsed.update({"messagecapable": packet_type in '@='})
 
             # decode timestamp
-            if packet_type in "/@":
+            if packet_type in "/@;":
                 body, result = _parse_timestamp(body, packet_type)
                 parsed.update(result)
 
@@ -197,6 +210,12 @@ def parse(packet):
             body, result = _parse_comment(body)
             parsed.update(result)
 
+            if packet_type == ';':
+                parsed.update({
+                    'object_format': parsed['format'],
+                    'format': 'object',
+                    })
+
     # capture ParseErrors and attach the packet
     except ParseError as exp:
         exp.packet = packet