added message template so it would work

pyogp/lib/base/data/__init__.py

@@ -0,0 +1,3 @@
+from pkg_resources import resource_string
+
+msg_tmpl = resource_string(__name__, 'message_template.msg')

pyogp/lib/base/makepacketbody.py

@@ -1,11 +1,12 @@
 import re
 import packet
 import pprint
+from data import msg_tmpl
 
 def parse_packets():
     dic = {}
     count = 0
-    lines = open("../../linden/scripts/messages/message_template.msg", ).xreadlines()
+    lines = open(msg_tmpl, ).xreadlines()
     #results = re.match("^\t([^\t{}]+.+)",line) #gets packet headers
     #results  = re.match("^\t\t([^{}]+.+)",line) #gets packet blocks
     #results  = re.match("^\t\t([{}]+.+)",line)  #gets block data
@@ -44,8 +45,9 @@ def parse_packets():
             parts = parts.split()
             parts.remove('{')
             parts.remove('}')
-            current_var = packet.PacketBlockVariable(parts[0], parts[1])
-            current_block.addVar(current_var)
+            #current_var = packet.PacketBlockVariable(parts[0], parts[1])
+            #current_block.addVar(current_var)
+            current_block.addVar(parts[0], parts[1])
 
     return dic
 
@@ -58,25 +60,27 @@ def print_packet_list(packet_list):
             print '\t' + block.name
             
             for var in block.vars:
-                print '\t\t' + var.name + '   ' + var.lltype
+                print '\t\t' + var #var.name + '   ' + var.lltype
 
 def get_all_types(packet_list):
     type_set = set([])
     for packet in packet_list:
         for block in packet_list[packet].blocks:
-            for var in block.vars:
-                type_set.add(var.lltype)                
+            for var in block.vars.keys():
+                #print var
+                type_set.add(var)#var.lltype)                
 
     type_list = list(type_set)
     type_list.sort()
     return type_list
 
 def main():
-    p_list = parse_packets()
+    #p_list = parse_packets()
     #print_packet_list(p_list)
 
-    p_typelist = get_all_types(p_list)
-    pprint.pprint(p_typelist)
+    #p_typelist = get_all_types(p_list)
+    #pprint.pprint(p_typelist)
+    return
     
 if __name__ == "__main__":
     main()

pyogp/lib/base/makepacketdict.py

@@ -24,10 +24,11 @@ $/LicenseInfo$
 """
 
 import re
+from data import msg_tmpl
 
 def makereversepacketdict():
     rev_dict = {}
-    for line in open("../../linden/scripts/messages/message_template.msg", ).xreadlines():
+    for line in open(msg_tmpl, ).xreadlines():
         results = re.match("^\t([^\t{}]+.+)",line)
         if results:
             aline = results.group(1)
@@ -42,7 +43,7 @@ def makereversepacketdict():
 
 def makepacketdict():
     dict = {}
-    for line in open("../../linden/scripts/messages/message_template.msg", ).xreadlines():
+    for line in open(msg_tmpl, ).xreadlines():
         results = re.match("^\t([^\t{}]+.+)",line)
         if results:
             aline = results.group(1)

pyogp/lib/base/packet.py

@@ -44,27 +44,34 @@ LOW_FREQUENCY_MESSAGE    = '\xFF\xFF'
 MEDIUM_FREQUENCY_MESSAGE = '\xFF'
 HIGH_FREQUENCY_MESSAGE   = ''
 
-class PacketBlockVariable():
+"""class PacketBlockVariable():
     def __init__(self, name, tp):
         self.name = name
-        self.lltype = tp
+        self.lltype = tp"""
 
 class PacketBlock():
     def __init__(self, header):
         self.header = header
         self.name = header[0]
-        self.vars = []
+        self.vars = {}
+        #self.vars = []
 
-    def addVar(self, var):
-        self.vars.append(var)
+    #def addVar(self, var):
+        #self.vars.append(var)
+
+    def addVar(self, name, typename):
+        self.vars[name] = tp
 
     def getVar(self, index):
         return self.vars[index]
 
-    def getVarByName(self, name):
+    """def getVarByName(self, name):
         for var in self.vars:
             if var.name == name:
-                return var
+                return var"""
+
+    def getVarByName(self, name):
+        return self.vars[name]
 
         return None