Message objects now use utils.Length for message.time.

Author: GraylinKim

sc2reader/objects.py

@@ -175,15 +175,14 @@ def __init__(self, time, player, x, y):
 
 class Message(object):
 
-    def __init__(self, time, sender, target, text):
-        self.time,self.sender,self.target,self.text = time,sender,target,text
-        self.seconds = time/16
+    def __init__(self, framestamp, sender, target, text):
+        self.framestamp,self.sender,self.target,self.text = framestamp,sender,target,text
+        self.time = Length(seconds=self.framestamp/16)
         self.sent_to_all = (self.target == 0)
         self.sent_to_allies = (self.target == 2)
 
     def __str__(self):
-        time = ((self.time/16)/60, (self.time/16)%60)
-        return "%s - Player %s - %s" % (time, self.sender.pid, self.text)
+        return "{0:>8} - {1:<14} - {2}".format(self.time, self.sender.name, self.text)
 
     def __repr__(self):
         return str(self)

sc2reader/processors/todict.py

@@ -40,9 +40,8 @@ def __getattr(object, name, default):
             'messages': [],
         }
         for message in player.messages:
-            msg_time = '%s:%s' % ((message.time/16)/60, (message.time/16)%60)
             p['messages'].append({
-                'time': msg_time,
+                'time': message.time.seconds,
                 'text': message.text,
                 'is_public': message.sent_to_all
             })

sc2reader/scripts/sc2printer.py

@@ -52,9 +52,7 @@ def doFile(filename, arguments):
     if arguments.messages:
         print "   Messages:"
         for message in replay.messages:
-            minutes, seconds = ((message.time/16)/60,(message.time/16)%60)
-            player_name = message.sender.name
-            print "      %02i:%02i %s:\t%s" % (minutes, seconds, player_name, message.text)
+            print message
     if arguments.version:
         print "   Version:  {0}".format(replay.release_string)
 
@@ -92,4 +90,4 @@ def main():
             doFile(file, arguments)
 
 if __name__ == '__main__':
-    main()
+    main()