Changeset 743:6bc880ac41eb

Timestamp:

01/02/16 12:27:19 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Prepared the ACARS and PIREP objects for serialization (re #283).

Location:

src/mlx

Files:

• acars.py (modified) (1 diff)
• pirep.py (modified) (5 diffs)
• web.py (modified) (2 diffs)

src/mlx/acars.py

@@ -49 +49 @@
             return "Landed"
 
+    def _serialize(self):
+        """Serialize the ACARS object for JSON-RPC."""
+        bookedFlight = self.bookedFlight
+        state = self.state
+
+        attrs = {}
+        attrs["longitude"] = state.longitude
+        attrs["latitude"] = state.latitude
+        attrs["pilotName"] = self.pilotName
+        attrs["numPassengers"] = bookedFlight.numPassengers
+        attrs["blockTime"] = self.getBlockTimeText()
+        attrs["callsign"] = bookedFlight.callsign
+        attrs["aircraftTypeName"] = bookedFlight.aircraftTypeName
+        attrs["departureICAO"] = bookedFlight.departureICAO
+        attrs["arrivalICAO"] = bookedFlight.arrivalICAO
+        attrs["altitude"] = state.altitude
+        attrs["groundSpeed"] = state.groundSpeed
+        attrs["event"] = self.getEventText()
+        attrs["tailNumber"] = bookedFlight.tailNumber
+
+        return ([], attrs)
 
 #------------------------------------------------------------------------------

src/mlx/pirep.py

@@ -4 +4 @@
 import const
 import cPickle as pickle
+import datetime
+import time
 
 #------------------------------------------------------------------------------
@@ -19 +21 @@
 class PIREP(object):
     """A pilot's report of a flight."""
+    _flightTypes = { const.FLIGHTTYPE_SCHEDULED : "SCHEDULED",
+                     const.FLIGHTTYPE_OLDTIMER : "OT",
+                     const.FLIGHTTYPE_VIP : "VIP",
+                     const.FLIGHTTYPE_CHARTER : "CHARTER" }
+
     @staticmethod
     def _formatLine(timeStr, line):
@@ -24 +31 @@
         some other things."""
         return "[" + timeStr + "]-[" + line + "]"
+
+    @staticmethod
+    def formatTimestampForRPC(t):
+        """Format the given timestamp for RPC."""
+        return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(t))
 
     @staticmethod
@@ -91 +103 @@
         self.faultLineIndexes = logger.faultLineIndexes
 
+    @property
+    def flightTypeText(self):
+        """Get the text representation of the flight type."""
+        return PIREP._flightTypes[self.flightType]
+
+    @property
+    def blockTimeStartText(self):
+        """Get the beginning of the block time in string format."""
+        return PIREP.formatTimestampForRPC(self.blockTimeStart)
+
+    @property
+    def flightTimeStartText(self):
+        """Get the beginning of the flight time in string format."""
+        return PIREP.formatTimestampForRPC(self.flightTimeStart)
+
+    @property
+    def flightTimeEndText(self):
+        """Get the end of the flight time in string format."""
+        return PIREP.formatTimestampForRPC(self.flightTimeEnd)
+
+    @property
+    def blockTimeEndText(self):
+        """Get the end of the block time in string format."""
+        return PIREP.formatTimestampForRPC(self.blockTimeEnd)
+
     def getACARSText(self):
         """Get the ACARS text.
@@ -152 +189 @@
             print u"Failed saving PIREP to %s: %s" % (path, error)
             return error
+
+    def _serialize(self):
+        """Serialize the PIREP for JSON-RPC."""
+        attrs = {}
+        attrs["log"] = self.getACARSText()
+        attrs["numPassengers"] = self.numPassengers
+        attrs["numCrew"] = self.numCrew
+        attrs["cargoWeight"] = self.cargoWeight
+        attrs["bagWeight"] = self.bagWeight
+        attrs["mailWeight"] = self.mailWeight
+        attrs["flightType"] = self.flightTypeText
+        attrs["online"] = 1 if self.online else 0
+        attrs["blockTimeStart"] = self.blockTimeStartText
+        attrs["blockTimeEnd"] = self.blockTimeEndText
+        attrs["flightTimeStart"] = self.flightTimeStartText
+        attrs["flightTimeEnd"] = self.flightTimeEndText
+        attrs["timeComment"] = self.getTimeComment()
+        attrs["fuelUsed"] = self.fuelUsed
+        attrs["departureRunway"] = self.departureRunway
+        attrs["arrivalRunway"] = self.arrivalRunway
+        attrs["departureMETAR"] = self.departureMETAR
+        attrs["arrivalMETAR"] = self.arrivalMETAR
+        attrs["filedCruiseLevel"] = self.filedCruiseAltitude / 100.0
+        attrs["cruiseLevel"] = self.cruiseAltitude / 100.0
+        attrs["sid"] = self.sid
+        attrs["route"] = self.route
+        attrs["star"] = self.star
+        attrs["approachType"] = self.approachType
+        attrs["comments"] = self.comments
+        attrs["flightDefects"] = self.flightDefects
+        attrs["ratingText"] = self.getRatingText()
+        attrs["rating"] = max(0.0, self.rating)
+        attrs["flownDistance"] = self.flownDistance
+        # FIXME: it should be stored in the PIREP when it is sent later
+        attrs["flightDate"] = datetime.date.today().strftime("%Y-%m-%d")
+
+        return ([], attrs)

src/mlx/web.py

@@ -844 +844 @@
 class SendPIREP(Request):
     """A request to send a PIREP to the MAVA website."""
-    _flightTypes = { const.FLIGHTTYPE_SCHEDULED : "SCHEDULED",
-                     const.FLIGHTTYPE_OLDTIMER : "OT",
-                     const.FLIGHTTYPE_VIP : "VIP",
-                     const.FLIGHTTYPE_CHARTER : "CHARTER" }
-
     _latin2Encoder = codecs.getencoder("iso-8859-2")
 
@@ -877 +872 @@
         data["mail"] = str(pirep.mailWeight)
 
-        data["flttype"] = SendPIREP._flightTypes[pirep.flightType]
+        data["flttype"] = pirep.flightTypeText
         data["onoff"] = "1" if pirep.online else "0"
         data["bt_dep"] = util.getTimestampString(pirep.blockTimeStart)