Author: dmeyer
Date: Sun Mar 18 19:08:42 2007
New Revision: 9354

Added:
   trunk/core/src/fxdparser.py
      - copied, changed from r9352, /trunk/core/src/fxdparser2.py
Removed:
   trunk/core/src/fxdparser2.py
Modified:
   trunk/tvserver/src/recording.py
   trunk/tvserver/src/server.py
   trunk/ui/src/fxditem.py

Log:
move fxdparser2 to fxdparser

Copied: trunk/core/src/fxdparser.py (from r9352, /trunk/core/src/fxdparser2.py)
==============================================================================
--- /trunk/core/src/fxdparser2.py       (original)
+++ trunk/core/src/fxdparser.py Sun Mar 18 19:08:42 2007
@@ -1,3 +1,34 @@
+# -*- coding: iso-8859-1 -*-
+# -----------------------------------------------------------------------------
+# fxdparser.py - Freevo FXD parser
+# -----------------------------------------------------------------------------
+# $Id: fxdparser.py 8911 2007-01-02 15:28:32Z dmeyer $
+#
+# -----------------------------------------------------------------------------
+# Freevo - A Home Theater PC framework
+# Copyright (C) 2007 Dirk Meyer, et al.
+#
+# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
+# Maintainer:    Dirk Meyer <[EMAIL PROTECTED]>
+#
+# Please see the file AUTHORS for a complete list of authors.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# -----------------------------------------------------------------------------
+
 # python imports
 import os
 import codecs

Modified: trunk/tvserver/src/recording.py
==============================================================================
--- trunk/tvserver/src/recording.py     (original)
+++ trunk/tvserver/src/recording.py     Sun Mar 18 19:08:42 2007
@@ -43,7 +43,7 @@
 from kaa.strutils import unicode_to_str, str_to_unicode
 
 # freevo imports
-import freevo.fxdparser2
+import freevo.fxdparser
 
 # record imports
 from config import config
@@ -273,7 +273,7 @@
             return
 
         # create root node
-        fxd = freevo.fxdparser2.Document()
+        fxd = freevo.fxdparser.Document()
 
         # create <movie> with title
         title = self.name

Modified: trunk/tvserver/src/server.py
==============================================================================
--- trunk/tvserver/src/server.py        (original)
+++ trunk/tvserver/src/server.py        Sun Mar 18 19:08:42 2007
@@ -43,7 +43,7 @@
 
 # freevo imports
 import freevo.ipc
-import freevo.fxdparser2
+import freevo.fxdparser
 
 # record imports
 from config import config
@@ -255,7 +255,7 @@
             return
 
         try:
-            fxd = freevo.fxdparser2.Document(self.fxdfile)
+            fxd = freevo.fxdparser.Document(self.fxdfile)
         except Exception, e:
             log.exception('recordserver.load: %s corrupt:' % self.fxdfile)
             sys.exit(1)
@@ -293,7 +293,7 @@
         save the fxd file
         """
         log.info('save fxd file')
-        fxd = freevo.fxdparser2.Document()
+        fxd = freevo.fxdparser.Document()
         for r in self.recordings:
             r.toxml(fxd)
         for f in self.favorites:

Modified: trunk/ui/src/fxditem.py
==============================================================================
--- trunk/ui/src/fxditem.py     (original)
+++ trunk/ui/src/fxditem.py     Sun Mar 18 19:08:42 2007
@@ -39,7 +39,7 @@
 from kaa.strutils import unicode_to_str
 
 # freevo core imports
-import freevo.fxdparser2
+import freevo.fxdparser
 
 # freevo imports
 import plugin
@@ -101,7 +101,7 @@
         items = []
         for fxd_file in fxd_files:
             try:
-                doc = freevo.fxdparser2.Document(fxd_file.filename)
+                doc = freevo.fxdparser.Document(fxd_file.filename)
                 items.extend(self._parse(doc, parent, listing, type))
             except:
                 log.exception("fxd file %s corrupt" % fxd_file.filename)

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to