Author: dmeyer
Date: Sat Mar 25 18:37:06 2006
New Revision: 8137
Modified:
trunk/WIP/webserver/src/listen/__init__.py
trunk/WIP/webserver/src/view/__init__.py
trunk/WIP/webserver/src/watch/__init__.py
Log:
adjust to kaa.vfs name change
Modified: trunk/WIP/webserver/src/listen/__init__.py
==============================================================================
--- trunk/WIP/webserver/src/listen/__init__.py (original)
+++ trunk/WIP/webserver/src/listen/__init__.py Sat Mar 25 18:37:06 2006
@@ -3,7 +3,7 @@
import stat
import md5
-import kaa.vfs
+import kaa.beacon
import kaa.thumb
from kaa.thumb.interface import DOT_THUMBNAIL
@@ -23,7 +23,7 @@
import view
import metadata
-kaa.vfs.connect(os.path.expanduser("~/.vfs"))
+kaa.beacon.connect(os.path.expanduser("~/.beacon"))
mbus = freevo.ipc.Instance()
@@ -80,7 +80,7 @@
"""
if isinstance(file, str):
file = unicode_to_str(unicode(file, 'utf-8'))
- item = kaa.vfs.get(self.base + '/' + file[len('/audio/'):])
+ item = kaa.beacon.get(self.base + '/' + file[len('/audio/'):])
else:
item = file
@@ -136,7 +136,7 @@
Default handler for directory browsing.
"""
dirname = self.base + '/' + '/'.join(args)
- directory = kaa.vfs.get(dirname)
+ directory = kaa.beacon.get(dirname)
listing = directory.listdir()
return dict(listing=listing,
Modified: trunk/WIP/webserver/src/view/__init__.py
==============================================================================
--- trunk/WIP/webserver/src/view/__init__.py (original)
+++ trunk/WIP/webserver/src/view/__init__.py Sat Mar 25 18:37:06 2006
@@ -3,7 +3,7 @@
import stat
import md5
-import kaa.vfs
+import kaa.beacon
import kaa.thumb
from kaa.thumb.interface import DOT_THUMBNAIL
@@ -19,7 +19,7 @@
import view
import slideshow
-kaa.vfs.connect(os.path.expanduser("~/.vfs"))
+kaa.beacon.connect(os.path.expanduser("~/.beacon"))
# root for browse
class Root:
@@ -99,7 +99,7 @@
dirname = os.path.dirname(file)
directory = '/view' + dirname[len(self.config.static['/pics']):]
name = os.path.basename(file)
- item = kaa.vfs.get(dirname)
+ item = kaa.beacon.get(dirname)
listing = [ i for i in item.listdir().result if i.getattr('type') ==
'image' ]
prev = current = next1 = next2 = None
@@ -155,7 +155,7 @@
call /view/get_metadata?file=...
returns HTML code
"""
- item = kaa.vfs.get(self.config.static['/pics'] + '/' + file)
+ item = kaa.beacon.get(self.config.static['/pics'] + '/' + file)
if (item.getattr('width') and item.getattr('height')):
string = u'%s<br />%sx%s' % \
@@ -173,7 +173,7 @@
Default handler for directory browsing.
"""
dirname = self.config.static['/pics'] + '/' + '/'.join(args)
- listing = kaa.vfs.get(dirname).listdir()
+ listing = kaa.beacon.get(dirname).listdir()
print 'listing is', listing
default_metadata = "Click once to update file info here, click again
to open. Or double click to open"
return dict(listing=listing,
Modified: trunk/WIP/webserver/src/watch/__init__.py
==============================================================================
--- trunk/WIP/webserver/src/watch/__init__.py (original)
+++ trunk/WIP/webserver/src/watch/__init__.py Sat Mar 25 18:37:06 2006
@@ -3,7 +3,7 @@
import stat
import md5
-import kaa.vfs
+import kaa.beacon
import kaa.thumb
from kaa.thumb.interface import DOT_THUMBNAIL
@@ -25,7 +25,7 @@
mbus = freevo.ipc.Instance()
-kaa.vfs.connect(os.path.expanduser("~/.vfs"))
+kaa.beacon.connect(os.path.expanduser("~/.beacon"))
# root for browse
class Root:
@@ -65,7 +65,7 @@
"""
if isinstance(file, str):
file = unicode_to_str(unicode(file, 'utf-8'))
- item = kaa.vfs.get(self.base + '/' + file[len('/video/'):])
+ item = kaa.beacon.get(self.base + '/' + file[len('/video/'):])
else:
item = file
@@ -125,7 +125,7 @@
Default handler for directory browsing.
"""
dirname = self.base + '/' + '/'.join(args)
- directory = kaa.vfs.get(dirname)
+ directory = kaa.beacon.get(dirname)
listing = directory.listdir()
return dict(listing=listing,
# Listing specific data
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
