Browse Source

make work w/ the new infastructure..

[git-p4: depot-paths = "//depot/": change = 1368]
main
John-Mark Gurney 15 years ago
parent
commit
4c6bbad68b
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      pyvr.py

+ 5
- 5
pyvr.py View File

@@ -6,7 +6,7 @@ __version__ = '$Change: 1109 $'
# $Id: //depot/python/pymeds/main/shoutcast.py#13 $

from DIDLLite import Container, Item, VideoItem, Resource
from FSStorage import registerklassfun
from FSStorage import registerklassfun, FSObject

import os.path
import time
@@ -154,11 +154,11 @@ class PYVRShows(Container):

self.lastmodified = self.pyvr.lastmodified

class PYVR(Container):
class PYVR(FSObject, Container):
def __init__(self, *args, **kwargs):
self.url = kwargs['url']
del kwargs['url']
self.url = kwargs.pop('url')

FSObject.__init__(self, kwargs.pop('path'))
Container.__init__(self, *args, **kwargs)

#self.pend = None
@@ -244,7 +244,7 @@ class PYVR(Container):
def detectpyvrfile(path, fobj):
bn = os.path.basename(path)
if bn == 'PYVR':
return PYVR, { 'url': fobj.readline().strip() }
return PYVR, { 'url': fobj.readline().strip(), 'path': path }
return None, None

registerklassfun(detectpyvrfile)

Loading…
Cancel
Save