From 6953e632536a8dedb79d3979ee5f157aa79acd8e Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Sat, 11 Feb 2006 09:47:27 -0800 Subject: [PATCH] properly handle subdirs now... add support for images... lowercase the extension... [git-p4: depot-paths = "//depot/": change = 741] --- pymediaserv | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pymediaserv b/pymediaserv index 4fcbb51..86fe752 100755 --- a/pymediaserv +++ b/pymediaserv @@ -5,7 +5,7 @@ # Copyright 2005, Tim Potter # Copyright 2006 John-Mark Gurney -from DIDLLite import TextItem, AudioItem, VideoItem, Resource, StorageFolder +from DIDLLite import TextItem, AudioItem, VideoItem, ImageItem, Resource, StorageFolder import os import os.path import random @@ -93,6 +93,7 @@ def addFSPath(parent, title, dpath): fpath = os.path.join(dpath, i) try: fn, ext = os.path.splitext(i) + ext = ext.lower() if os.path.isdir(fpath): addFSPath(folder, fn, fpath) if not os.path.isfile(fpath): @@ -107,11 +108,13 @@ def addFSPath(parent, title, dpath): klass = AudioItem elif ty == 'text': klass = TextItem + elif ty == 'image': + klass = ImageItem else: raise KeyError, 'no item for mt: %s' % mt item = cds.addItem(folder, klass, fn) - cds[item].res = Resource('%smedia/%s' % (urlbase, i), 'http-get:*:%s:*' % mt) + cds[item].res = Resource('%s%s' % (urlbase, fpath), 'http-get:*:%s:*' % mt) cds[item].res.size = os.path.getsize(fpath) except KeyError: pass