traipse_dev: orpg/gametree/gametree.py comparison

comparison orpg/gametree/gametree.py @ 118:217fb049bd00 alpha

Traipse Alpha 'OpenRPG' {091028-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

author	sirebral
date	Wed, 28 Oct 2009 14:24:54 -0500
parents	37a11fea3304
children	9314d63c0941

comparison

equal deleted inserted replaced

-:0f18d16f3fe7
+:217fb049bd00
 #   $Id: gametree.py,v 1.68 2007/12/07 20:39:48 digitalxero Exp $
 #
 # Description: The file contains code fore the game tree shell
 #
+from __future__ import with_statement
 __version__ = "$Id: gametree.py,v 1.68 2007/12/07 20:39:48 digitalxero Exp $"
 from orpg.orpg_wx import *
 from orpg.orpg_windows import *
 from orpg.orpgCore import component
 from orpg.orpg_xml import xml
 from orpg.tools.validate import validate
 from orpg.tools.orpg_log import logger
 from orpg.tools.decorators import debugging
+from orpg.tools.orpg_settings import settings
 from orpg.gametree.nodehandlers import containers, forms, dnd3e, dnd35, chatmacro
 from orpg.gametree.nodehandlers import map_miniature_nodehandler
 from orpg.gametree.nodehandlers import minilib, rpg_grid, d20, StarWarsd20, voxchat
 from gametree_version import GAMETREE_VERSION
+from xml.etree.ElementTree import ElementTree, Element, parse
+from xml.etree.ElementTree import fromstring, tostring, XML, iselement
+from xml.parsers.expat import ExpatError
 STD_MENU_DELETE = wx.NewId()
 STD_MENU_DESIGN = wx.NewId()
 STD_MENU_USE = wx.NewId()
 STD_MENU_PP = wx.NewId()
 self.rename_flag = 1
 self.EditLabel(curSelection)
 evt.Skip()
 @debugging
-def locate_valid_tree(self, error, msg, dir, filename): ## --Snowdog 3/05
+def locate_valid_tree(self, error, msg): ## --Snowdog 3/05
 """prompts the user to locate a new tree file or create a new one"""
 response = wx.MessageDialog(self, msg, error, wx.YES|wx.NO|wx.ICON_ERROR)
 if response == wx.YES:
 file = None
-filetypes = "Gametree (*.xml)|*.xml|All files (*.*)|*.*"
+dlg = wx.FileDialog(self, "Locate Gametree file", dir_struct["user"],
-dlg = wx.FileDialog(self, "Locate Gametree file", dir, filename, filetypes,wx.OPEN | wx.CHANGE_DIR)
+filename[ ((filename.rfind(os.sep))+len(os.sep)):],
+"Gametree (*.xml)|*.xml|All files (*.*)|*.*",
+wx.OPEN | wx.CHANGE_DIR)
 if dlg.ShowModal() == wx.ID_OK: file = dlg.GetPath()
 dlg.Destroy()
 if not file: self.load_tree(error=1)
 else: self.load_tree(file)
 return
 return
 @debugging
 def load_tree(self, filename=dir_struct["user"]+'tree.xml', error=0):
 self.settings.set_setting("gametree", filename)
-tmp = None
+#check file exists
-xml_dom = None
+if not os.path.exists(filename):
-xml_doc = None
+emsg = "Gametree Missing!\n"+filename+" cannot be found.\n\n"\
+"Would you like to locate it?\n"\
+"(Selecting 'No' will cause a new default gametree to be generated)"
+self.locate_valid_tree("Gametree Error", emsg)
+return
+try:
+f = open(filename, "rb")
+tree = parse(f)
+self.xml_root = tree.getroot()
+except:
+f.close()
+self.xml_root = None
+### Alpha  ### Doing some work on Gametree to add Element Tree, slowly at first.
 try:
 logger.info("Reading Gametree file: " + filename + "...", True)
-tmp = open(filename,"r")
+xml_doc = xml.parseXml(tostring(self.xml_root))
-xml_doc = xml.parseXml(tmp.read())
-tmp.close()
 if xml_doc == None: pass
 else: xml_dom = xml_doc._get_documentElement()
 logger.info("done.", True)
+except: pass
-except IOError:
-emsg = "Gametree Missing!\n"+filename+" cannot be found.\n\n"\
+if not self.xml_root:
-"Would you like to locate it?\n"\
+os.rename(filename,filename+".corrupt")
-"(Selecting 'No' will cause a new default gametree to be generated)"
+emsg = "Your gametree is being regenerated.\n\n"\
-fn = filename[ ((filename.rfind(os.sep))+len(os.sep)):]
+"To salvage a recent version of your gametree\n"\
-self.locate_valid_tree("Gametree Error", emsg, dir_struct["user"], fn)
+"exit OpenRPG and copy the lastgood.xml file in\n"\
-logger.general(emsg)
+"your myfiles directory to "+filename+ "\n"\
+"in your myfiles directory.\n\n"\
+"lastgood.xml WILL BE OVERWRITTEN NEXT TIME YOU RUN OPENRPG.\n\n"\
+"Would you like to select a different gametree file to use?\n"\
+"(Selecting 'No' will cause a new default gametree to be generated)"
+self.locate_valid_tree("Corrupt Gametree!", emsg)
 return
-if not xml_dom:
+if self.xml_root.tag != "gametree":
-os.rename(filename,filename+".corrupt")
+emsg = filename+" does not appear to be a valid gametree file.\n\n"\
-fn = filename[ ((filename.rfind(os.sep))+len(os.sep)):]
+"Would you like to select a different gametree file to use?\n"\
-emsg = "Your gametree is being regenerated.\n\n"\
+"(Selecting 'No' will cause a new default gametree to be generated)"
-"To salvage a recent version of your gametree\n"\
+self.locate_valid_tree("Invalid Gametree!", emsg)
-"exit OpenRPG and copy the lastgood.xml file in\n"\
-"your myfiles directory to "+fn+ "\n"\
-"in your myfiles directory.\n\n"\
-"lastgood.xml WILL BE OVERWRITTEN NEXT TIME YOU RUN OPENRPG.\n\n"\
-"Would you like to select a different gametree file to use?\n"\
-"(Selecting 'No' will cause a new default gametree to be generated)"
-self.locate_valid_tree("Corrupt Gametree!", emsg, dir_struct["user"], fn)
-logger.general(emsg)
 return
-if xml_dom._get_tagName() != "gametree":
-fn = filename[ ((filename.rfind(os.sep))+len(os.sep)):]
-emsg = fn+" does not appear to be a valid gametree file.\n\n"\
-"Would you like to select a different gametree file to use?\n"\
-"(Selecting 'No' will cause a new default gametree to be generated)"
-self.locate_valid_tree("Invalid Gametree!", emsg, dir_struct["user"], fn)
-logger.debug(emsg)
-return
-# get gametree version - we could write conversion code here!
-self.master_dom = xml_dom
-logger.debug("Master Dom Set")
 try:
-version = self.master_dom.getAttribute("version")
+# version = self.xml_root.get("version")
 # see if we should load the gametree
-loadfeatures = int(self.settings.get_setting("LoadGameTreeFeatures"))
+loadfeatures = int(settings.get_setting("LoadGameTreeFeatures"))
 if loadfeatures:
-xml_dom = xml.parseXml(open(dir_struct["template"]+"feature.xml","r").read())
+features_tree = ET.parse(orpg.dirpath.dir_struct["template"]+"feature.xml")
-xml_dom = xml_dom._get_documentElement()
+self.xml_root.append(features_tree.getroot())
-xml_dom = self.master_dom.appendChild(xml_dom)
+settings.set("LoadGameTreeFeatures","0")
-self.settings.set_setting("LoadGameTreeFeatures","0")
 ## load tree
 logger.debug("Features loaded (if required)")
 self.CollapseAndReset(self.root)
-children = self.master_dom._get_childNodes()
+logger.note("Parsing Gametree Nodes ", True)
-logger.info("Parsing Gametree Nodes ", True)
+for xml_child in self.xml_root:
-for c in children:
+logger.note('.', True)
-print '.',
+self.load_xml(xml_child,self.root)
-self.load_xml(c,self.root)
+logger.note("done", True)
-logger.info("done", True)
 self.Expand(self.root)
-self.SetPyData(self.root,self.master_dom)
+self.SetPyData(self.root,self.xml_root)
 if error != 1:
-infile = open(filename, "rb")
+with open(filename, "rb") as infile:
-outfile = open(dir_struct["user"]+"lastgood.xml", "wb")
+with open(dir_struct["user"]+"lastgood.xml", "wb") as outfile:
 outfile.write(infile.read())
 else: logger.info("Not overwriting lastgood.xml file.", True)
 except Exception, e:
-logger.general(traceback.format_exc())
+logger.exception(traceback.format_exc())
 wx.MessageBox("Corrupt Tree!\nYour game tree is being regenerated. To\nsalvage a recent version of your gametree\nexit OpenRPG and copy the lastgood.xml\nfile in your myfiles directory\nto "+filename+ "\nin your myfiles directory.\nlastgood.xml WILL BE OVERWRITTEN NEXT TIME YOU RUN OPENRPG.")
 os.rename(filename,filename+".corrupt")
 validate.config_file("tree.xml","default_tree.xml")
 self.load_tree(error=1)
 logger.debug(ret_string)
 return ret_string
 @debugging
 def on_receive_data(self, data, player):
+if iselement(data):
+tostring(data)
 beg = string.find(data,"<tree>")
 end = string.rfind(data,"</tree>")
 data = data[6:end]
 self.insert_xml(data)
 f = wx.FileDialog(self,"Select a file", self.last_save_dir,"","HTML (*.html)|*.html",wx.SAVE)
 if f.ShowModal() == wx.ID_OK:
 item = self.GetSelection()
 obj = self.GetPyData(item)
 type = f.GetFilterIndex()
-file = open(f.GetPath(),"w")
+with open(f.GetPath(),"w") as f:
-data = "<html><head><title>"+obj.master_dom.getAttribute("name")+"</title></head>"
+data = "<html><head><title>"+obj.xml.get("name")+"</title></head>"
 data += "<body bgcolor=\"#FFFFFF\" >"+obj.tohtml()+"</body></html>"
 for tag in ("</tr>","</td>","</th>","</table>","</html>","</body>"):
 data = data.replace(tag,tag+"\n")
-file.write(data)
+f.write(data)
-file.close()
 self.last_save_dir, throwaway = os.path.split( f.GetPath() )
 f.Destroy()
 os.chdir(dir_struct["home"])
 @debugging
 players.remove(me)
 dlg = orpgMultiCheckBoxDlg( None, opts, "Select Players:", "Send To", [] )
 if dlg.ShowModal() == wx.ID_OK:
 item = self.GetSelection()
 obj = self.GetPyData(item)
-xmldata = "<tree>" + xml.toxml(obj) + "</tree>"
+xmldata = "<tree>" + tostring(obj.xml) + "</tree>"
 selections = dlg.get_selections()
 if len(selections) == len(opts): self.session.send(xmldata)
 else:
 for s in selections: self.session.send(xmldata,players[s][2])
 dlg.Destroy()
 obj = self.GetPyData(item)
 if obj.can_clone():
 parent_node = self.GetItemParent(item)
 prev_sib = self.GetPrevSibling(item)
 if not prev_sib.IsOk(): prev_sib = parent_node
-xml_dom = xml.parseXml(xml.toxml(obj))
+clone_xml = XML(tostring(obj.xml))
-xml_dom = xml_dom._get_firstChild()
+if parent_node == self.root: parent_xml = self.GetPyData(parent_node)
-parent = obj.master_dom._get_parentNode()
+else: parent_xml = self.GetPyData(parent_node).xml
-xml_dom = parent.insertBefore(xml_dom, obj.master_dom)
+for i in range(len(parent_xml)):
-self.load_xml(xml_dom, parent_node, prev_sib)
+if parent_xml[i] is obj.xml:
+parent_xml.insert(i, clone_xml)
+break
+self.load_xml(clone_xml, parent_node, prev_sib)
 @debugging
 def on_save(self, evt):
 """save node to a xml file"""
 item = self.GetSelection()
 filename = self.settings.get_setting("gametree")
 self.save_tree(filename)
 @debugging
 def save_tree(self, filename=dir_struct["user"]+'tree.xml'):
-self.master_dom.setAttribute("version",GAMETREE_VERSION)
+self.xml_root.set("version",GAMETREE_VERSION)
-self.settings.set_setting("gametree",filename)
+settings.set_setting("gametree",filename)
-file = open(filename,"w")
+ElementTree(self.xml_root).write(filename)
-file.write(xml.toxml(self.master_dom,1))
-file.close()
 @debugging
 def on_load_new_tree(self, evt):
 f = wx.FileDialog(self,"Select a file", self.last_save_dir,"","*.xml",wx.OPEN)
 if f.ShowModal() == wx.ID_OK:
 def on_del(self, evt):
 status_value = "none"
 try:
 item = self.GetSelection()
 if item:
-obj = self.GetPyData(item)
+handler = self.GetPyData(item)
-parent_obj = obj
+status_value = handler.xml.get('status')
-try:
+name = handler.xml.get('name')
-status_value = parent_obj.master_dom.getAttribute('status')
+parent_item = self.GetItemParent(item)
-name = parent_obj.master_dom.getAttribute('name')
+while parent_item.IsOk() and status_value!="useful" and status_value!="useless":
-except: status_value = "none"
-parent_obj = parent_obj.master_dom._get_parentNode()
-while status_value!="useful" and status_value!="useless":
 try:
-status_value = parent_obj.getAttribute('status')
+parent_handler = self.GetPyData(parent_item)
-name = parent_obj.getAttribute('name')
+status_value = parent_handler.get('status')
-if status_value == "useless": break
+name = parent_handler.get('name')
-elif status_value == "useful": break
+if status_value == "useless":
-except: status_value = "none"
+break
-try: parent_obj = parent_obj._get_parentNode()
+elif status_value == "useful":
-except: break
+break
+except:
+status_value = "none"
+parent_item = self.GetItemParent(parent_item)
 if status_value == "useful":
 dlg = wx.MessageDialog(self, `name` + "  And everything beneath it are considered useful.  \n\nAre you sure you want to delete this item?",'Important Item',wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
-if dlg.ShowModal() == wx.ID_YES: obj.delete()
+if dlg.ShowModal() == wx.ID_YES: handler.delete()
-else: obj.delete()
+else: handler.delete()
 except:
 if self.GetSelection() == self.GetRootItem():
 msg = wx.MessageDialog(None,"You can't delete the root item.","Delete Error",wx.OK)
 else: msg = wx.MessageDialog(None,"Unknown error deleting node.","Delete Error",wx.OK)
 msg.ShowModal()
 @debugging
 def insert_xml(self, txt):
 #Updated to allow safe merging of gametree files
 #without leaving an unusable and undeletable node.
 #                               -- Snowdog 8/03
-xml_dom = xml.parseXml(txt)
+if not txt:
-if xml_dom == None:
 wx.MessageBox("Import Failed: Invalid or missing node data")
-logger.debug("Import Failed: Invalid or missing node data")
+logger.general("Import Failed: Invalid or missing node data")
-logger.debug("Exit game_tree->insert_xml(self, txt)")
 return
-xml_temp = xml_dom._get_documentElement()
+try:
-if not xml_temp:
+new_xml = XML(txt)
+except ExpatError:
 wx.MessageBox("Error Importing Node or Tree")
-logger.debug("Error Importing Node or Tree")
+logger.general("Error Importing Node or Tree")
-logger.debug("Exit game_tree->insert_xml(self, txt)")
 return
-if xml_temp._get_tagName() == "gametree":
+if new_xml.tag == "gametree":
-children = xml_temp._get_childNodes()
+for xml_child in new_xml:
-for c in children: self.load_xml(c, self.root)
+self.load_xml(xml_child, self.root)
-logger.debug("Exit game_tree->insert_xml(self, txt)")
 return
-if not xml_dom:
+self.xml_root.append(new_xml)
-wx.MessageBox("XML Error")
+self.load_xml(new_xml,self.root,self.root)
-logger.debug("XML Error")
-logger.debug("Exit game_tree->insert_xml(self, txt)")
-return
-xml_dom = xml_dom._get_firstChild()
-child = self.master_dom._get_firstChild()
-xml_dom = self.master_dom.insertBefore(xml_dom,child)
-self.load_xml(xml_dom,self.root,self.root)
 @debugging
 def build_img_list(self):
 """make image list"""
 helper = img_helper()
 self.icons = { }
 self._imageList= wx.ImageList(16,16,False)
-man = open(dir_struct["icon"]+"icons.xml","r")
+icons_xml = parse(orpg.dirpath.dir_struct["icon"]+"icons.xml")
-xml_dom = xml.parseXml(man.read())
+for icon in icons_xml.getroot():
-man.close()
+key = icon.get("name")
-xml_dom = xml_dom._get_documentElement()
+path = orpg.dirpath.dir_struct["icon"] + icon.get("file")
-node_list = xml_dom._get_childNodes()
-for n in node_list:
-key = n.getAttribute("name")
-path = dir_struct["icon"] + n.getAttribute("file")
 img = helper.load_file(path)
 self.icons[key] = self._imageList.Add(img)
 self.SetImageList(self._imageList)
 @debugging
-def load_xml(self, xml_dom, parent_node, prev_node=None):
+def load_xml(self, xml_element, parent_node, prev_node=None):
 #add the first tree node
 i = 0
-text = xml_dom.getAttribute("name")
+name = xml_element.get("name")
-icon = xml_dom.getAttribute("icon")
+icon = xml_element.get("icon")
 if self.icons.has_key(icon): i = self.icons[icon]
-name = xml_dom._get_nodeName()
-logger.debug("Text, icon and name set\n" + text + "\n" + icon + "\n" + name)
 if prev_node:
-if prev_node == parent_node: new_tree_node = self.PrependItem(parent_node, text, i, i)
+if prev_node == parent_node: new_tree_node = self.PrependItem(parent_node, name, i, i)
-else: new_tree_node = self.InsertItem(parent_node,prev_node, text, i, i)
+else: new_tree_node = self.InsertItem(parent_node,prev_node, name, i, i)
-else: new_tree_node = self.AppendItem(parent_node, text, i, i)
+else: new_tree_node = self.AppendItem(parent_node, name, i, i)
 logger.debug("Node Added to tree")
 #create a nodehandler or continue loading xml into tree
-if name == "nodehandler":
+if xml_element.tag == "nodehandler":
-#wx.BeginBusyCursor()
-logger.debug("We have a Nodehandler")
 try:
-py_class = xml_dom.getAttribute("class")
+py_class = xml_element.get("class")
 logger.debug("nodehandler class: " + py_class)
 if not self.nodehandlers.has_key(py_class):
-raise Exception, "Unknown Nodehandler for " + py_class
+raise Exception("Unknown Nodehandler for " + py_class)
-self.nodes[self.id] = self.nodehandlers[py_class](xml_dom, new_tree_node)
+self.nodes[self.id] = self.nodehandlers[py_class](xml_element, new_tree_node)
 self.SetPyData(new_tree_node, self.nodes[self.id])
 logger.debug("Node Data set")
 bmp = self.nodes[self.id].get_scaled_bitmap(16,16)
 if bmp: self.cached_load_of_image(bmp,new_tree_node,)
 logger.debug("Node Icon loaded")
 self.id = self.id + 1
 except Exception, er:
-logger.general(traceback.format_exc())
+logger.exception(traceback.format_exc())
-		        #logger.debug("Error Info: " + xml_dom.getAttribute("class") + "\n" + str(er), True)?indent?
-self.Delete(new_tree_node)
+# was deleted -- should we delete non-nodehandler nodes then?
-parent = xml_dom._get_parentNode()
+#self.Delete(new_tree_node)
-parent.removeChild(xml_dom)
+#parent = xml_dom._get_parentNode()
+#parent.removeChild(xml_dom)
 return new_tree_node
 @debugging
 def cached_load_of_image(self, bmp_in, new_tree_node):
 image_list = self.GetImageList()
 obj = self.GetPyData(item)
 self.SelectItem(item)
 if(isinstance(obj,core.node_handler)):
 obj.on_drop(evt)
 self.drag_obj = None
+def traverse(self, root, function, data=None, recurse=True):
+child, cookie = self.GetFirstChild(root)
+while child.IsOk():
+function(child, data)
+if recurse:
+self.traverse(child, function, data)
+child, cookie = self.GetNextChild(root, cookie)
 @debugging
 def on_label_change(self, evt):
 item = evt.GetItem()
 txt = evt.GetLabel()

Mercurial > traipse_dev

comparison orpg/gametree/gametree.py @ 118:217fb049bd00 alpha