Update of /cvsroot/freevo/freevo/src/image
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv835
Modified Files:
__init__.py interface.py
Added Files:
fxdhandler.py
Log Message:
move the fxdhandler into an extra file
Index: interface.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/image/interface.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** interface.py 13 Sep 2004 18:00:50 -0000 1.5
--- interface.py 13 Sep 2004 19:32:46 -0000 1.6
***************
*** 14,21 ****
# -----------------------------------------------------------------------
# $Log$
# Revision 1.5 2004/09/13 18:00:50 dischi
# last cleanups for the image module in Freevo
! #
! #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 14,23 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2004/09/13 19:32:46 dischi
+ # move the fxdhandler into an extra file
+ #
# Revision 1.5 2004/09/13 18:00:50 dischi
# last cleanups for the image module in Freevo
!
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
***************
*** 44,50 ****
__all__ = [ 'PluginInterface' ]
- # Python imports
- import os
-
# Add support for bins album files
from mmpython.image import bins
--- 46,49 ----
***************
*** 55,60 ****
import plugin
from imageitem import ImageItem
! from playlist import Playlist
class PluginInterface(plugin.MimetypePlugin):
--- 54,62 ----
import plugin
+ # ImageItem
from imageitem import ImageItem
!
! # fxdhandler for <slideshow> tags
! from fxdhandler import fxdhandler
class PluginInterface(plugin.MimetypePlugin):
***************
*** 67,72 ****
# register the callbacks
! plugin.register_callback('fxditem', ['image'], 'slideshow',
! self.fxdhandler)
# activate the mediamenu for image
--- 69,73 ----
# register the callbacks
! plugin.register_callback('fxditem', ['image'], 'slideshow', fxdhandler)
# activate the mediamenu for image
***************
*** 115,218 ****
if info.has_key('title') and info['title']:
diritem.name = info['title']
-
-
- def fxdhandler(self, fxd, node):
- """
- parse image specific stuff from fxd files
-
- <?xml version="1.0" ?>
- <freevo>
- <slideshow title="foo" random="1|0" repeat="1|0">
- <cover-img>foo.jpg</cover-img>
- <background-music random="1|0">
- <directory recursive="1|0">path</directory>
- <file>filename</file>
- </background-music>
- <files>
- <directory recursive="1|0" duration="10">path</directory>
- <file duration="0">filename</file>
- </files>
- <info>
- <description>A nice description</description>
- </info>
- </slideshow>
- </freevo>
- """
- items = []
- dirname = os.path.dirname(fxd.getattr(None, 'filename', ''))
- children = fxd.get_children(node, 'files')
- if children:
- children = children[0].children
-
- # Create a list of all images for the slideshow
- for child in children:
- try:
- citems = []
- fname = os.path.join(dirname, String(fxd.gettext(child)))
- if child.name == 'directory':
- # for directories add all files in it
- if fxd.getattr(child, 'recursive', 0):
- f = util.match_files_recursively(fname, self.suffix())
- else:
- f = util.match_files(fname, self.suffix())
- citems = self.get(None, f)
-
- elif child.name == 'file':
- # add the given filename
- citems = self.get(None, [ fname ])
-
- # set duration until the next images comes up
- duration = fxd.getattr(child, 'duration', 0)
- if duration:
- for i in citems:
- i.duration = duration
- items += citems
-
- except OSError, e:
- print 'slideshow error:'
- print e
-
- # create the playlist based on the parsed file list
- pl = Playlist('', items, fxd.getattr(None, 'parent', None),
- random=fxd.getattr(node, 'random', 0),
- repeat=fxd.getattr(node, 'repeat', 0))
- pl.autoplay = True
- pl.name = fxd.getattr(node, 'title')
- pl.image = fxd.childcontent(node, 'cover-img')
- if pl.image:
- pl.image = vfs.join(vfs.dirname(fxd.filename), pl.image)
-
-
- # background music
- children = fxd.get_children(node, 'background-music')
- if children:
- random = fxd.getattr(children[0], 'random', 0)
- children = children[0].children
-
- files = []
- suffix = []
- for p in plugin.mimetype('audio'):
- suffix += p.suffix()
-
- for child in children:
- try:
- fname = os.path.join(dirname, fxd.gettext(child))
- if child.name == 'directory':
- if fxd.getattr(child, 'recursive', 0):
- files += util.match_files_recursively(fname, suffix)
- else:
- files += util.match_files(fname, suffix)
- elif child.name == 'file':
- files.append(fname)
- except OSError, e:
- print 'playlist error:'
- print e
-
- if files:
- bg = Playlist(playlist=files, random = random,
- repeat=True, display_type='audio')
- pl.background_playlist = bg
-
- # add item to list
- fxd.parse_info(fxd.get_children(node, 'info', 1), pl)
- fxd.getattr(None, 'items', []).append(pl)
--- 116,117 ----
--- NEW FILE: fxdhandler.py ---
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
# fxdhandler - handler for <slideshow> tags in a fxd file
# -----------------------------------------------------------------------
# $Id: fxdhandler.py,v 1.1 2004/09/13 19:32:46 dischi Exp $
#
# This file contains the parser for the <slideshow> tag
#
# <?xml version="1.0" ?>
# <freevo>
# <slideshow title="foo" random="1|0" repeat="1|0">
# <cover-img>foo.jpg</cover-img>
# <background-music random="1|0">
# <directory recursive="1|0">path</directory>
# <file>filename</file>
# </background-music>
# <files>
# <directory recursive="1|0" duration="10">path</directory>
# <file duration="0">filename</file>
# </files>
# <info>
# <description>A nice description</description>
# </info>
# </slideshow>
# </freevo>
#
#
# Notes:
# Todo:
#
# -----------------------------------------------------------------------
# $Log: fxdhandler.py,v $
# Revision 1.1 2004/09/13 19:32:46 dischi
# move the fxdhandler into an extra file
#
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS 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
#
# ----------------------------------------------------------------------- */
__all__ = [ 'fxdhandler' ]
# python imports
import os
# Freevo imports
import config
import plugin
import util
from playlist import Playlist
# ImageItem
from imageitem import ImageItem
def _suffix():
"""
return the list of suffixes this class handles
"""
return config.IMAGE_SUFFIX
def _get_items(files):
"""
return a list of items based on the files
"""
items = []
for file in files:
items.append(ImageItem(file, None))
return items
def fxdhandler(fxd, node):
"""
parse image specific stuff from fxd files
"""
items = []
dirname = os.path.dirname(fxd.getattr(None, 'filename', ''))
children = fxd.get_children(node, 'files')
if children:
children = children[0].children
# Create a list of all images for the slideshow
for child in children:
try:
citems = []
fname = os.path.join(dirname, String(fxd.gettext(child)))
if child.name == 'directory':
# for directories add all files in it
if fxd.getattr(child, 'recursive', 0):
f = util.match_files_recursively(fname, _suffix())
else:
f = util.match_files(fname, _suffix())
citems = _get_items(f)
elif child.name == 'file':
# add the given filename
citems = _get_items([ fname ])
# set duration until the next images comes up
duration = fxd.getattr(child, 'duration', 0)
if duration:
for i in citems:
i.duration = duration
items += citems
except OSError, e:
print 'slideshow error:'
print e
# create the playlist based on the parsed file list
pl = Playlist('', items, fxd.getattr(None, 'parent', None),
random=fxd.getattr(node, 'random', 0),
repeat=fxd.getattr(node, 'repeat', 0))
pl.autoplay = True
pl.name = fxd.getattr(node, 'title')
pl.image = fxd.childcontent(node, 'cover-img')
if pl.image:
pl.image = vfs.join(vfs.dirname(fxd.filename), pl.image)
# background music
children = fxd.get_children(node, 'background-music')
if children:
random = fxd.getattr(children[0], 'random', 0)
children = children[0].children
files = []
suffix = []
for p in plugin.mimetype('audio'):
suffix += p.suffix()
for child in children:
try:
fname = os.path.join(dirname, fxd.gettext(child))
if child.name == 'directory':
if fxd.getattr(child, 'recursive', 0):
files += util.match_files_recursively(fname, suffix)
else:
files += util.match_files(fname, suffix)
elif child.name == 'file':
files.append(fname)
except OSError, e:
print 'playlist error:'
print e
if files:
bg = Playlist(playlist=files, random = random,
repeat=True, display_type='audio')
pl.background_playlist = bg
# add item to list
fxd.parse_info(fxd.get_children(node, 'info', 1), pl)
fxd.getattr(None, 'items', []).append(pl)
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/image/__init__.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** __init__.py 13 Sep 2004 18:00:49 -0000 1.22
--- __init__.py 13 Sep 2004 19:32:46 -0000 1.23
***************
*** 11,14 ****
--- 11,17 ----
# <slideshow> tag.
#
+ # Image plugins are also allowed to use ImageItem to create a new ImageItem
+ # and imageviewer, a function to return the viewer application
+ #
# Notes:
# Todo:
***************
*** 16,19 ****
--- 19,25 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.23 2004/09/13 19:32:46 dischi
+ # move the fxdhandler into an extra file
+ #
# Revision 1.22 2004/09/13 18:00:49 dischi
# last cleanups for the image module in Freevo
***************
*** 42,43 ****
--- 48,53 ----
from interface import *
+
+ # used by image plugins
+ from imageitem import ImageItem
+ from viewer import imageviewer
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
