Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28585

Modified Files:
        directory.py 
Log Message:
use new util class to write the fxd file

Index: directory.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** directory.py        1 Oct 2003 18:56:56 -0000       1.39
--- directory.py        2 Oct 2003 18:47:18 -0000       1.40
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.40  2003/10/02 18:47:18  dischi
+ # use new util class to write the fxd file
+ #
  # Revision 1.39  2003/10/01 18:56:56  dischi
  # add configure option to write a folder.fxd
***************
*** 289,318 ****
          """
          self.xml_file = os.path.join(self.dir, 'folder.fxd')
          try:
!             f = open(self.xml_file)
!             data = f.readlines()
!             f.close()
          except:
!             data = ('<?xml version="1.0" ?>\n', '<freevo>\n', '  <folder>\n',
!                     '  </folder>\n', '</freevo>\n')
!         
!         try:
!             if os.path.isfile(self.xml_file):
!                 os.unlink(self.xml_file)
!             f = codecs.open(self.xml_file , 'w', encoding='utf-8')
!         except IOError, error:
!             return 0 
  
!         for line in data:
!             if line.find('<setvar') != -1:
!                 continue
!             f.write(line)
!             if line.find('<folder') != -1:
!                 for v in self.modified_vars:
!                     for i in range(line.find('<')):
!                         f.write(' '),
!                     f.write('  <setvar name="%s" val="%s"/>\n' % \
!                             (v.lower(), getattr(self, v)))
!         f.close()
          return 1 
  
--- 292,330 ----
          """
          self.xml_file = os.path.join(self.dir, 'folder.fxd')
+ 
          try:
!             fxd = util.FXDtree(self.xml_file)
          except:
!             return 0
  
!         folder_elem = None
!         for node in fxd.tree.children:
!             if node.name == 'folder':
!                 folder_elem = node
!                 folder_elem.first_cdata = None
!                 folder_elem.following_cdata = None
!                 break
!         else:
!             folder_elem = util.XMLnode('folder')
!             fxd.add(folder_elem, pos=0)
! 
!         del_items = []
!         for child in folder_elem.children:
!             if child.name == 'setvar':
!                 del_items.append(child)
! 
!         # remove old setvar items
!         for child in del_items:
!             folder_elem.children.remove(child)
! 
!         for v in self.modified_vars:
!             n = util.XMLnode('setvar', (('name', v.lower()), ('val', getattr(self, 
v))))
!             fxd.add(n, folder_elem, 0)
! 
!         try:
!             fxd.save()
!         except IndexError:
!             return 0
!         
          return 1 
  
***************
*** 799,804 ****
              if i in self.modified_vars:
                  if i == 'FORCE_SKIN_LAYOUT':
!                     item.name += str(getattr(self, i))
!                 if getattr(self, i):
                      name += 'on'
                  else:
--- 811,816 ----
              if i in self.modified_vars:
                  if i == 'FORCE_SKIN_LAYOUT':
!                     name += str(getattr(self, i))
!                 elif getattr(self, i):
                      name += 'on'
                  else:




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to