traipse_dev: orpg/networking/mplay

annotate orpg/networking/mplay_messaging.py @ 183:0d9b746b5751 beta

Traipse Beta 'OpenRPG' {100115-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary (Beta) New Features: Added Bookmarks Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager New TrueDebug Class in orpg_log (See documentation for usage) Portable Mercurial Tip of the Day added, from Core and community New Reference Syntax added for custom PC sheets New Child Reference for gametree New Parent Reference for gametree New Gametree Recursion method, mapping, context sensitivity, and effeciency.. New Features node with bonus nodes and Node Referencing help added Dieroller structure from Core New DieRoller portability for odd Dice Added 7th Sea die roller; ie [7k3] = [7d10.takeHighest(3).open(10)] New 'Mythos' System die roller added Added new vs. die roller method for WoD; ie [3v3] = [3d10.vs(3)]. Included for Mythos roller also New Warhammer FRPG Die Roller (Special thanks to Puu-san for the support) New EZ_Tree Reference system. Push a button, Traipse the tree, get a reference (Beta!) Fixes: Fix to Text based Server Fix to Remote Admin Commands Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Fix to Map from gametree not showing to all clients Fix to gametree about menus Fix to Password Manager check on startup Fix to PC Sheets from tool nodes. They now use the tabber_panel Fix to Whiteboard ID to prevent random line or text deleting. Fixes to Server, Remote Server, and Server GUI Fix to Update Manager; cleaner clode for saved repositories Fixes made to Settings Panel and now reactive settings when Ok is pressed Fixes to Alternity roller's attack roll. Uses a simple Tuple instead of a Splice Fix to Use panel of Forms and Tabbers. Now longer enters design mode Fix made Image Fetching. New fetching image and new failed image Modified ID's to prevent non updated clients from ruining the fix. default_manifest.xml renamed to default_upmana.xml

author	sirebral
date	Fri, 15 Jan 2010 23:01:42 -0600
parents	6081bdc2b8d5
children	dcae32e219f1

rev	line source
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1 # Copyright (C) 2000-2001 The OpenRPG Project
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	2 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	3 # openrpg-dev@lists.sourceforge.net
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	4 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	5 # This program is free software; you can redistribute it and/or modify
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	6 # it under the terms of the GNU General Public License as published by
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	7 # the Free Software Foundation; either version 2 of the License, or
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	8 # (at your option) any later version.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	9 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	10 # This program is distributed in the hope that it will be useful,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	13 # GNU General Public License for more details.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	14 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	15 # You should have received a copy of the GNU General Public License
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	16 # along with this program; if not, write to the Free Software
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	17 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	18 # --
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	19 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	20 # File: mplay_messaging.py
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	21 # Author: Dj Gilcrease
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	22 # Maintainer:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	23 # Version:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	24 # $Id: mplay_messaging.py,v 1.5 2007/05/06 16:42:59 digitalxero Exp $
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	25 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	26 # Description: This file contains the code for the client / server messaging
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	27 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	28
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	29 __version__ = "$Id: mplay_messaging.py,v 1.5 2007/05/06 16:42:59 digitalxero Exp $"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	30
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	31 import socket
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	32 import Queue
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	33 import thread
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	34 import traceback
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	35 from threading import Event, Lock
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	36 from xml.sax.saxutils import escape
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	37 from struct import pack, unpack, calcsize
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	38 from string import *
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	39 from orpg.orpg_version import VERSION, PROTOCOL_VERSION, CLIENT_STRING, SERVER_MIN_CLIENT_VERSION
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	40 import os
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	41 import time
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	42
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	43 from orpg.tools.orpg_log import logger
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	44 from orpg.orpgCore import component
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	45
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	46 def myescape(data):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	47 return escape(data,{"\"":""})
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	48
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	49 class messenger:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	50 def __init__(self, args, *kwargs):
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	51 self.dir_struct = component.get("dir_struct") #used?
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	52 self.validate = component.get("validate") #used??
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	53 if kwargs.has_key('isServer'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	54 self.isServer = kwargs['isServer']
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	55 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	56 self.isServer = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	57 self.listen_event = Event()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	58 self.outbox = Queue.Queue(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	59 self.inbox_event = Event()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	60 self.inbox = Queue.Queue(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	61 self.startedEvent = Event()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	62 self.exitEvent = Event()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	63 self.sendThreadExitEvent = Event()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	64 self.recvThreadExitEvent = Event()
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	65 self.port = int(component.get("settings").get_setting("port")) ##used even?
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	66 self.ip = socket.gethostbyname(socket.gethostname())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	67 self.lensize = calcsize('i')
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	68 self.mplay_type = ('disconnected', 'connected',
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	69 'disconnecting', 'group change', 'group change failed')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	70 self.status = self.mplay_type[0]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	71 self.alive = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	72 self.sock = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73 self.version = VERSION
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	74 self.protocol_version = PROTOCOL_VERSION
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	75 self.client_string = CLIENT_STRING
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	76 self.minClientVersion = SERVER_MIN_CLIENT_VERSION
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	77 self.id = "0"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	78 self.group_id = "0"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	79 self.name = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	80 self.role = "GM"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	81 self.ROLE_GM = "GM"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	82 self.ROLE_PLAYER = "PLAYER"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	83 self.ROLE_LURKER = "LURKER"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	84 self.text_status = "Idle"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	85 self.statLock = Lock()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	86 self.useroles = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	87 self.lastmessagetime = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	88 self.connecttime = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	89 self.timeout_time = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	90 self.ignorelist = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	91 self.players = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	92 self.groups = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	93
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	94 #Setup Stuff from the Server
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	95 """
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	96 if kwargs.has_key('inbox'): self.inbox = kwargs['inbox']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	97 if kwargs.has_key('sock'): self.sock = kwargs['sock']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	98 if kwargs.has_key('ip'): self.ip = kwargs['ip']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	99 if kwargs.has_key('role'): self.role = kwargs['role']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	100 if kwargs.has_key('id'): self.id = kwargs['id']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	101 if kwargs.has_key('group_id'): self.group_id = kwargs['group_id']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	102 if kwargs.has_key('name'): self.name = kwargs['name']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	103 if kwargs.has_key('version'): self.version = kwargs['version']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	104 if kwargs.has_key('protocol_version'): self.protocol_version = kwargs['protocol_version']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	105 if kwargs.has_key('client_string'): self.client_string = kwargs['client_string']
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	106 """
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	107
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	108 ### Alpha ###
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	109 self.inbox = kwargs['inbox'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	110 self.sock = kwargs['sock'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	111 self.ip = kwargs['ip'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	112 self.role = kwargs['role'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	113 self.id = kwargs['id'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	114 self.group_id = kwargs['group_id'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	115 self.name = kwargs['name'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	116 self.version = kwargs['version'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	117 self.protocol_version = kwargs['protocol_version'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	118 self.client_string = kwargs['client_string'] or pass
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	119
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	120
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	121 def build_message(self, args, *kwargs):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	122 message = '<' + args[0]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	123
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	124 #Setup the attributes of the message
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	125 if len(kwargs) > 0:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	126 for attrib in kwargs.keys():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	127 message += ' ' + attrib + '="' + str(kwargs[attrib]) + '"'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	128
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	129 #Add the actual message if there is one
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	130 if len(args) > 1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	131 #Close the first part
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	132 message += '>'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	133 message += escape(args[1])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	134 #Close the whole thing
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	135 message += '</' + args[0] + '>'
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	136 else: message += ' />'
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	137 return message
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	138
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	139 def disconnect(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	140 self.set_status(2)
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	141 logger.debug("client stub " + self.ip +" disconnecting...")
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	142 logger.debug("closing sockets...")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	143 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	144 self.sock.shutdown( 2 )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	145 except:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	146 logger.general("Caught exception:\n" + traceback.format_exc())
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	147 self.set_status(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	148
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	149 def reset(self, sock):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	150 self.disconnect()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	151 self.sock = sock
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	152 self.initialize_threads()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	153
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	154 def update_role(self, role):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	155 self.useroles = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	156 self.role = role
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	157
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	158 def use_roles(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	159 return self.useroles
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	160
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	161 def update_self_from_player(self, player):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	162 try:
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	163 (self.name, self.ip, self.id, self.text_status,
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	164 self.version, self.protocol_version, self.client_string,role) = player
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	165 except:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	166 logger.general("Exception: messenger->update_self_from_player():\n" + traceback.format_exc())
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	167
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	168 def toxml(self, act):
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	169 logger.exception("DEPRECIATED! messenger->toxml()")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	170 xml_data = self.build_message('player',
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	171 name=myescape(self.name),
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	172 action=act,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	173 id=self.id,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	174 group_id=self.group_id,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	175 ip=self.ip,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	176 status=self.text_status,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	177 version=self.version,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	178 protocol_version=self.protocol_version,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	179 client_string=self.client_string
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	180 )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	181 return xml_data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	182
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	183 def get_status(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	184 self.statLock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	185 status = self.status
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	186 self.statLock.release()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	187 return status
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	188
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	189 def my_role(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	190 return self.role
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	191
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	192 def set_status(self, status):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	193 self.statLock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	194 self.status = status
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	195 self.statLock.release()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	196
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	197 def initialize_threads(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	198 "Starts up our threads (2) and waits for them to make sure they are running!"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	199 self.status = 'connected'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	200 self.sock.setblocking(1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	201
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	202 # Confirm that our threads have started
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	203 thread.start_new_thread( self.sendThread,(0,) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	204 thread.start_new_thread( self.recvThread,(0,) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	205 self.startedEvent.set()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	206
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	207 def __str__(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	208 return "%s(%s)\nIP:%s\ngroup_id:%s\n%s (%s)" % (self.name, self.id, self.ip, self.group_id, self.idle_time(), self.connected_time())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	209
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	210 # idle time functions added by snowdog 3/31/04
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	211 def update_idle_time(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	212 self.lastmessagetime = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	213
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	214 def idle_time(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	215 curtime = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	216 idletime = curtime - self.lastmessagetime
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	217 return idletime
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	218
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	219 def idle_status(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	220 idletime = self.idle_time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	221 idlemins = idletime / 60
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	222 status = "Unknown"
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	223 if idlemins < 3: status = "Active"
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	224 elif idlemins < 10: status = "Idle ("+str(int(idlemins))+" mins)"
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	225 else: status = "Inactive ("+str(int(idlemins))+" mins)"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	226 return status
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	227
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	228 def connected_time(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	229 curtime = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	230 timeoffset = curtime - self.connecttime
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	231 return timeoffset
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	232
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	233 def connected_time_string(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	234 "returns the time client has been connected as a formated time string"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	235 ct = self.connected_time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	236 d = int(ct/86400)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	237 h = int( (ct-(86400*d))/3600 )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	238 m = int( (ct-(86400d)-(3600h))/60)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	239 s = int( (ct-(86400d)-(3600h)-(60*m)) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	240 cts = zfill(d,2)+":"+zfill(h,2)+":"+zfill(m,2)+":"+zfill(s,2)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	241 return cts
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	242
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	243 def clear_timeout(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	244 self.timeout_time = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	245
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	246 def check_time_out(self):
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	247 if self.timeout_time == None: self.timeout_time = time.time()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	248 curtime = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	249 diff = curtime - self.timeout_time
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	250 if diff > 1800: return 1
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	251 else: return 0
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	252
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	253 def send(self, msg):
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	254 if self.get_status() == 'connected': self.outbox.put(msg)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	255
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	256 def change_group(self, group_id, groups):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	257 old_group_id = str(self.group_id)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	258 groups[group_id].add_player(self.id)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	259 groups[old_group_id].remove_player(self.id)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	260 self.group_id = group_id
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	261 self.outbox.put(self.toxml('group'))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	262 msg = groups[group_id].game_map.get_all_xml()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	263 self.send(msg)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	264 return old_group_id
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	265
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	266 def take_dom(self, xml_dom):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	267 self.name = xml_dom.getAttribute("name")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	268 self.text_status = xml_dom.getAttribute("status")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	269
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	270 def add_msg_handler(self, tag, function, core=False):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	271 if not self.msg_handlers.has_key(tag):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	272 self.msg_handlers[tag] = function
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	273 if core: self.core_msg_handlers.append(tag)
dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	274 else: print 'XML Messages ' + tag + ' already has a handler'
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	275
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	276 def remove_msg_handler(self, tag):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	277 if self.msg_handlers.has_key(tag) and not tag in self.core_msg_handlers:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	278 del self.msg_handlers[tag]
135 dcf4fbe09b70 Traipse Beta 'OpenRPG' {091010-00} sirebral parents: 100 diff changeset	279 else: print 'XML Messages ' + tag + ' already deleted'
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	280
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	281 #Message Handaling
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	282 def message_handler(self, arg):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	283 xml_dom = None
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	284 logger.note("message handler thread running...", ORPG_NOTE)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	285 while self.alive or self.status == 'connected':
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	286 data = None
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	287 try: data = self.inbox.get(0)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	288 except Queue.Empty:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	289 time.sleep(0.25) #sleep 1/4 second
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	290 continue
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	291 bytes = len(data)
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	292 if bytes < 5: continue
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	293 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	294 thread.start_new_thread(self.parse_incoming_dom,(str(data),))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	295 #data has been passed... unlink from the variable references
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	296 #so data in passed objects doesn't change (python passes by reference)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	297 del data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	298 data = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	299 except Exception, e:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	300 logger.general(traceback.format_exc())
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	301 if xml_dom: xml_dom.unlink()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	302 if xml_dom: xml_dom.unlink()
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	303 logger.note("message handler thread exiting...")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	304 self.inbox_event.set()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	305
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	306 def parse_incoming_dom(self, data):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	307 xml_dom = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	308 try:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	309 xml_dom = component.get("xml").parseXml(data)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	310 xml_dom = xml_dom._get_documentElement()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	311 self.message_action(xml_dom, data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	312
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	313 except Exception, e:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	314 logger.general("Error in parse of inbound message. Ignoring message.")
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	315 logger.general("\tOffending data(" + str(len(data)) + "bytes)=" + data)
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	316 logger.general("Exception=" + traceback.format_exc())
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	317 if xml_dom: xml_dom.unlink()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	318
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	319 def message_action(self, xml_dom, data):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	320 tag_name = xml_dom._get_tagName()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	321 if self.msg_handlers.has_key(tag_name):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	322 self.msg_handlers[tag_name](xml_dom, data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	323 else:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	324 logger.general("Unknown Message Type")
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	325 logger.general(data)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	326 #Message Action thread expires and closes here.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	327 return
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	328
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	329 #Privet functions
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	330 def sendThread( self, arg ):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	331 "Sending thread. This thread reads from the data queue and writes to the socket."
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	332 # Wait to be told it's okay to start running
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	333 self.startedEvent.wait()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	334
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	335 # Loop as long as we have a connection
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	336 while( self.get_status() == 'connected' ):
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	337 try: readMsg = self.outbox.get( block=1 )
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	338 except Exception, text:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	339 logger.exception("Exception: messenger->sendThread(): " + str(text)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	340 # If we are here, it's because we have data to send, no doubt!
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	341 if self.status == 'connected':
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	342 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	343 # Send the entire message, properly formated/encoded
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	344 sent = self.sendMsg( self.sock, readMsg )
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	345 except: logger.exception("Exception: messenger->sendThread():\n" + traceback.format_exc()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	346 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	347 # If we are not connected, purge the data queue
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	348 logger.note("Data queued without a connection, purging data from queue...")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	349 self.sendThreadExitEvent.set()
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	350 logger.note( "sendThread has terminated...")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	351
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	352 def sendMsg( self, sock, msg ):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	353 """Very simple function that will properly encode and send a message to te
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	354 remote on the specified socket."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	355
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	356 # Calculate our message length
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	357 length = len( msg )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	358
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	359 # Encode the message length into network byte order
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	360 lp = pack( 'i', socket.htonl( length ) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	361
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	362 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	363 # Send the encoded length
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	364 sentl = sock.send( lp )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	365 # Now, send the message the the length was describing
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	366 sentm = sock.send( msg )
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	367 if self.isServer: logger.debug("('data_sent', " + str(sentl+sentm) + ")")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	368 return sentm
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	369 except socket.error, e:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	370 logger.exception("Socket Error: messenger->sendMsg(): " + traceback.format_exc())
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	371 except:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	372 logger.exception("Exception: messenger->sendMsg(): " + traceback.format_exc())
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	373
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	374 def recvThread( self, arg ):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	375 "Receiving thread. This thread reads from the socket and writes to the data queue."
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	376
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	377 # Wait to be told it's okay to start running
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	378 self.startedEvent.wait()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	379 while( self.get_status() == 'connected' ):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	380 readMsg = self.recvMsg( self.sock )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	381
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	382 # Make sure we didn't get disconnected
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	383 bytes = len( readMsg )
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	384 if bytes == 0: break
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	385 # Check the length of the message
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	386 bytes = len( readMsg )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	387 # Make sure we are still connected
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	388 if bytes == 0: break
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	389 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	390 # Pass along the message so it can be processed
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	391 self.inbox.put( readMsg )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	392 self.update_idle_time() #update the last message time
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	393 if bytes == 0:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	394 logger.note("Remote has disconnected!")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	395 self.set_status(2)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	396 self.outbox.put( "" ) # Make sure the other thread is woken up!
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	397 self.sendThreadExitEvent.set()
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	398 logger.note("messenger->recvThread() has terminated...")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	399
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	400 def recvData( self, sock, readSize ):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	401 """Simple socket receive method. This method will only return when the exact
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	402 byte count has been read from the connection, if remote terminates our
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	403 connection or we get some other socket exception."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	404 data = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	405 offset = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	406 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	407 while offset != readSize:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	408 frag = sock.recv( readSize - offset )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	409
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	410 # See if we've been disconnected
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	411 rs = len( frag )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	412 if rs <= 0:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	413 # Loudly raise an exception because we've been disconnected!
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	414 raise IOError, "Remote closed the connection!"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	415 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	416 # Continue to build complete message
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	417 offset += rs
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	418 data += frag
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	419 except socket.error, e:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	420 logger.exception("Socket Error: messenger->recvData(): " + str(e))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	421 data = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	422 return data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	423
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	424 def recvMsg( self, sock ):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	425 """This method now expects to receive a message having a 4-byte prefix length. It will ONLY read
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	426 completed messages. In the event that the remote's connection is terminated, it will throw an
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	427 exception which should allow for the caller to more gracefully handles this exception event.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	428
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	429 Because we use strictly reading ONLY based on the length that is told to use, we no longer have to
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	430 worry about partially adjusting for fragmented buffers starting somewhere within a buffer that we've
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	431 read. Rather, it will get ONLY a whole message and nothing more. Everything else will remain buffered
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	432 with the OS until we attempt to read the next complete message."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	433
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	434 msgData = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	435 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	436 lenData = self.recvData( sock, self.lensize )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	437
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	438 # Now, convert to a usable form
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	439 (length,) = unpack( 'i', lenData )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	440 length = socket.ntohl( length )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	441 # Read exactly the remaining amount of data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	442 msgData = self.recvData( sock, length )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	443
152 6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	444 if self.isServer: logger.debug("('data_recv', " + str(length+4) + ")")
6081bdc2b8d5 Traipse Beta 'OpenRPG' {091125-00} sirebral parents: 135 diff changeset	445 except: logger.exception("Exception: messenger->recvMsg():\n" + traceback.format_exc())
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	446 return msgData
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	447
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	448 if __name__ == "__main__":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	449 test = messenger(None)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	450 print test.build_message('hello', "This is a test message", attrib1="hello world", attrib2="hello world2", attrib3="hello world3")

Mercurial > traipse_dev

annotate orpg/networking/mplay_messaging.py @ 183:0d9b746b5751 beta