traipse_dev: orpg/networking/gsclient.py comparison

comparison orpg/networking/gsclient.py @ 119:9314d63c0941 alpha

Traipse Alpha 'OpenRPG' {091029-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: Adds Bookmarks (Alpha) with cool Smiley Star and Plus Symbol images! Changes made to the map for increased portability. SnowDog has changes planned in Core, though. Added an initial push to the BCG. Not much to see, just shows off how it is re-writing Main code. Fix to remote admin commands Minor fix to texted based server, works in /System/ folder Some Core changes to gametree to correctly disply Pretty Print, thanks David! Fix to Splitter Nodes not being created. Added images to Plugin Control panel for Autostart feature Fix to massive amounts of images loading; from Core fix to gsclient so with_statement imports Added 'boot' command to remote admin Prep work in Pass tool for remote admin rankings and different passwords, ei, Server, Admin, Moderator, etc. Remote Admin Commands more organized, more prep work. Added Confirmation window for sent nodes. Minor changes to allow for portability to an OpenSUSE linux OS (hopefully without breaking) {091028} 00: Made changes to gametree to start working with Element Tree, mostly from Core Minor changes to Map to start working with Element Tree, from Core Preliminary changes to map efficiency, from FlexiRPG Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Changes to main.py to start working with Element Tree {091029} 00: Changes made to server to start working with Element Tree. Changes made to Meta Server Lib. Prepping test work for a multi meta network page. Minor bug fixed with mini to gametree Zoom Mouse plugin added. Known Issue: Disconnecting causes an server side error. XML data is not being passed correctly.

author	sirebral
date	Thu, 29 Oct 2009 20:35:28 -0500
parents	217fb049bd00
children	8827271fbe1b

comparison

equal deleted inserted replaced

-:217fb049bd00
+:9314d63c0941
 from orpg.tools.orpg_settings import settings
 import orpg.tools.rgbhex
 from orpg.orpgCore import component
 import traceback
 from orpg.tools.validate import validate
 from xml.etree.ElementTree import ElementTree, Element
 from xml.etree.ElementTree import fromstring, tostring
 gs_host = 1
 gs_join = 2
 who_name = cmp(yname, xname)
 who_user = cmp(yuser, xuser)
 if x.name.startswith(DEV_SERVER):
 if y.name.startswith(DEV_SERVER):
-if not who_name:
+if not who_name: return who_user
-return who_user
+else: return who_name
-else:
+else: return -1
-return who_name
-else:
-return -1
 elif y.name.startswith(DEV_SERVER): return 1
-elif not who_user:
+elif not who_user: return who_name
-return who_name
+else: return who_user
-else:
-return who_user
 def roomCmp(room1, room2):
-if int(room1) > int(room2):
+if int(room1) > int(room2): return 1
-return 1
+elif int(room1) < int(room2): return -1
-elif int(room1) < int(room2):
-return -1
 return 0
 class game_server_panel(wx.Panel):
 def __init__(self,parent):
 wx.Panel.__init__(self, parent, -1)
 self.bookmarks.getroot().append(server)
 item = wx.MenuItem(self.bookmarks_menu, wx.ID_ANY, name, name)
 open_rpg.get_component('frame').Bind(wx.EVT_MENU,
 self.on_bookmarks_menu, item)
 self.bookmarks_menu.AppendItem(item)
 self.save_bookmarks()
 def save_bookmarks(self):
 with open(dir_struct['user'] + 'server_bookmarks.xml', 'w') as f:
 self.bookmarks.write(f)
 def on_server_dbclick(self, evt=None):
 #make sure address is updated just in case list select wasn't done
-try:
+try: self.on_select(evt)
-self.on_select(evt)
+except: pass
-except:
-pass
 address = self.texts["address"].GetValue()
 if self.session.is_connected():
 if self.session.host_server == address :
 #currently connected to address. Do nothing.
 return
 self.frame.kill_mplay_session()
 self.do_connect(address)
 def on_room_dbclick(self, evt=None):
 #make sure address is updated just in case list select wasn't done
-try:
+try: self.on_select(evt)
-self.on_select(evt)
+except: pass
-except:
-pass
 group_id = str(self.room_list.GetItemData(self.cur_room_index))
 if self.NoGroups:
 self.NoGroups = False
 self.session.group_id = group_id
 self.on_server_dbclick()
 return
 if self.cur_room_index >= 0:
-if self.cur_room_index != 0:
+if self.cur_room_index != 0: self.set_lobbybutton(1);
-self.set_lobbybutton(1);
+else: self.set_lobbybutton(0);
-else:
-self.set_lobbybutton(0);
 group = self.session.get_group_info(group_id)
 pwd = ""
 if (group[2] == "True") or (group[2] == "1"):
 pwd = self.password_manager.GetPassword("room", group_id)
-else:
+else: pwd = ""
-pwd = ""
 self.session.send_join_group(group_id, pwd)
 def on_room_select(self,evt):
 self.cur_room_index = evt.m_itemIndex
 self.frame.status.set_connect_status(self.name)
 self.set_cur_room_text("Lobby")
 def gs_connect(self, evt):
 address = self.texts['address'].GetValue()
-try:
+try: dummy = self.name
-dummy = self.name
+except: self.name = `address`
-except:
-self.name = `address`
 self.do_connect(address)
 def gs_disconnect(self, evt):
 self.frame.kill_mplay_session()
 def gs_create_room(self, evt):
 self.do_create_group()
 def gs_join(self, evt):
-print 'here'
 self.do_join_group()
 def gs_join_lobby(self, evt):
 self.do_join_lobby()
 def refresh_room_list(self):
 self.room_list.DeleteAllItems()
 address = self.texts["address"].GetValue()
-try:
+try: cadder = self.session.host_server
-cadder = self.session.host_server
+except: cadder = ''
-except:
-cadder = ''
 if self.rmList.has_key(address) and len(self.rmList[address]) > 0 and cadder != address:
 groups = self.rmList[address]
 self.NoGroups = True
 else:
 self.NoGroups = False
 def refresh_server_list(self):
 try:
 self.svrList = []
 self.server_list.DeleteAllItems()
-xml_dom = meta_server_lib.get_server_list(["2"]);
+etreeEl = meta_server_lib.get_server_list(["2"]);
-node_list = xml_dom.getElementsByTagName('server')
+node_list = etreeEl.findall('server')
 hex = orpg.tools.rgbhex.RGBHex()
-color1 = settings.get_setting("RoomColor_Active")
+color1 = settings.get("RoomColor_Active")
-color2 = settings.get_setting("RoomColor_Locked")
+color2 = settings.get("RoomColor_Locked")
-color3 = settings.get_setting("RoomColor_Empty")
+color3 = settings.get("RoomColor_Empty")
-color4 = settings.get_setting("RoomColor_Lobby")
+color4 = settings.get("RoomColor_Lobby")
 if len(node_list):
 length = len(node_list)
 part = 0
 partLength = 1.0/length
 for n in node_list:
-if n.hasAttribute('id') and n.hasAttribute('name') and n.hasAttribute('num_users') and n.hasAttribute('address') and n.hasAttribute('port'):
+#if n.hasAttribute('id') and n.hasAttribute('name') and n.hasAttribute('num_users') and n.hasAttribute('address') and n.hasAttribute('port'):
-self.svrList.append(server_instance(n.getAttribute('id'), n.getAttribute('name'),
+self.svrList.append(server_instance(n.get('id'), n.get('name'),
-n.getAttribute('num_users'), n.getAttribute('address'),
+n.get('num_users'), n.get('address'),
-n.getAttribute('port')))
+n.get('port')))
-address = n.getAttribute('address') + ':' + n.getAttribute('port')
+address = n.get('address') + ':' + n.get('port')
 self.rmList[address] = []
-rooms = n.getElementsByTagName('room')
+rooms = n.findall('room')
 for room in rooms:
-pwd = room.getAttribute("pwd")
+self.rmList[address].append((room.get("id"), room.get("name"),
-id = room.getAttribute("id")
+room.get("pwd"), room.get("num_users")))
-name = room.getAttribute("name")
-nump = room.getAttribute("num_users")
-self.rmList[address].append((id, name, pwd, nump))
 self.svrList.sort(server_instance_compare)
 for n in self.svrList:
 i = self.server_list.GetItemCount()
 name = n.name
 self.server_list.SetColumnWidth(2, wx.LIST_AUTOSIZE)
 if self.serverNameSet == 0:
 self.texts["address"].SetValue("127.0.0.1:6774")
 self.serverNameSet = 1
-else:
+else: pass
-pass
 #  Allow xml_dom to be collected
-try:
-xml_dom.unlink()
-except:
-pass
 except Exception, e:
 print "Server List not available."
 traceback.print_exc()
 def failed_connection(self):
 if(self.cur_server_index >= 0):
-id = self.servers[self.cur_server_index].getAttribute('id')
+server_index = self.servers[self.cur_server_index]
-meta = self.servers[self.cur_server_index].getAttribute('meta')
-address = self.servers[self.cur_server_index].getAttribute('address')
-port = self.servers[self.cur_server_index].getAttribute('port')
 #  post_failed_connection will return a non-zero if the server
 #  was removed.  If it was, refresh the display
-if(meta_server_lib.post_failed_connection(id,meta=meta,address=address,port=port)):
+if(meta_server_lib.post_failed_connection(server_index.get('id'),
+meta=server_index.get('meta'), address=server_index.get('address'),
+port=server_index.get('port'))):
 self.refresh_server_list()
 def do_connect(self, address):
 chat = component.get('chat')
 chat.InfoPost("Locating server at " + address + "...")
-if self.session.connect(address):
+if self.session.connect(address): self.frame.start_timer()
-self.frame.start_timer()
 else:
 chat.SystemPost("Failed to connect to game server...")
 self.failed_connection()
 def do_join_lobby(self):
 self.cur_room_index = 0
-self.session.send_join_group("0","")
+self.session.send_join_group("0", "")
 self.set_lobbybutton(0);
 def do_join_group(self):
 if self.cur_room_index >= 0:
-if self.cur_room_index != 0:
+if self.cur_room_index != 0: self.set_lobbybutton(1);
-self.set_lobbybutton(1);
+else: self.set_lobbybutton(0);
-else:
-self.set_lobbybutton(0);
 group_id = str(self.room_list.GetItemData(self.cur_room_index))
 group = self.session.get_group_info(group_id)
 pwd = ""
 if (group[2] == "True") or (group[2] == "1"):
 pwd = self.password_manager.GetPassword("room", group_id)
 #dlg = wx.TextEntryDialog(self,"Password?","Join Private Room")
 #if dlg.ShowModal() == wx.ID_OK:
 #    pwd = dlg.GetValue()
 #dlg.Destroy()
-else:
+else: pwd = ""
-pwd = ""
+if pwd != None: #pwd == None means the user clicked "Cancel"
-if pwd != None: #pwd==None means the user clicked "Cancel"
+self.session.send_join_group(group_id, pwd)
-self.session.send_join_group(group_id,pwd)
 def do_create_group(self):
 name = self.texts["room_name"].GetValue()
 boot_pwd = self.texts["room_boot_pwd"].GetValue()
 minversion = self.texts["room_min_version"].GetValue()
 if loc > -1:
 b = name[:loc]
 e = name[loc+1:]
 name = b + "&#39;" + e
 oldloc = loc+1
-if self.buttons['gs_pwd'].GetValue():
+if self.buttons['gs_pwd'].GetValue(): pwd = self.texts["room_pwd"].GetValue()
-pwd = self.texts["room_pwd"].GetValue()
+else: pwd = ""
-else:
+if name == "": wx.MessageBox("Invalid Name","Error");
-pwd = ""
-if name == "":
-wx.MessageBox("Invalid Name","Error");
 else:
 msg = "%s is creating room \'%s.\'" % (self.session.name, name)
-self.session.send( msg )
+self.session.send(msg)
-self.session.send_create_group(name,pwd,boot_pwd,minversion)
+self.session.send_create_group(name, pwd, boot_pwd, minversion)
 self.set_lobbybutton(1); #enable the Lobby quickbutton
 #---------------------------------------------------------
 # [START] Snowdog: Updated Game Server Window 12/02
 #---------------------------------------------------------
 def on_size(self,evt):
 # set column widths for room list
 # set column widths for server list
 pass
 #---------------------------------------------------------
 # [END] Snowdog: Updated Game Server Window 12/02
 #---------------------------------------------------------
 def colorize_group_list(self, groups):
 try:
 hex = orpg.tools.rgbhex.RGBHex()
 for gr in groups:
 item_list_location = self.room_list.FindItemData(-1,int(gr[0]))
 if item_list_location != -1:
 item = self.room_list.GetItem(item_list_location)
-if gr[0] == "0":
+if gr[0] == "0": r,g,b = hex.rgb_tuple(settings.get("RoomColor_Lobby"))
-			r,g,b = hex.rgb_tuple(settings.get_setting("RoomColor_Lobby"))
 elif gr[3] <> "0":
 if gr[2] == "True" or gr[2] == "1":
+			   r,g,b = hex.rgb_tuple(settings.get("RoomColor_Locked"))
-			   r,g,b = hex.rgb_tuple(settings.get_setting("RoomColor_Locked"))
+			else: r,g,b = hex.rgb_tuple(settings.get("RoomColor_Active"))
-			else:
+else: r,g,b = hex.rgb_tuple(settings.get("RoomColor_Empty"))
-			   r,g,b = hex.rgb_tuple(settings.get_setting("RoomColor_Active"))
-else:
-			r,g,b = hex.rgb_tuple(settings.get_setting("RoomColor_Empty"))
 		    color = wx.Colour(red=r,green=g,blue=b)
 item.SetTextColour(color)
 self.room_list.SetItem(item)
-except:
+except: traceback.print_exc()
-traceback.print_exc()

Mercurial > traipse_dev

comparison orpg/networking/gsclient.py @ 119:9314d63c0941 alpha