Author: dmeyer
Date: Sun Apr 15 08:07:27 2007
New Revision: 9446
Modified:
trunk/ui/src/directory.py
trunk/ui/src/plugins/shoppingcart.py
trunk/ui/src/video/interface.py
trunk/ui/src/video/plugins/mover.py
Log:
Remove member variable dir from DirItem, the same value
is also in filename by default.
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Sun Apr 15 08:07:27 2007
@@ -160,10 +160,6 @@
self.files.read_only = True
self.files.append(directory)
- # FIXME: remove this
- self.dir = directory.filename
- self.url = directory.filename
-
if name:
self.name = str_to_unicode(name)
@@ -205,7 +201,7 @@
num_items = None
if not num_items:
- log.info('create metainfo for %s', self.dir)
+ log.info('create metainfo for %s', self.filename)
listing =
kaa.beacon.query(parent=self.info).get(filter='extmap')
num_items = [ self.info.get('mtime'), 0 ]
for p in MediaPlugin.plugins(display_type):
@@ -225,7 +221,7 @@
return num_items[2]
if key in ( 'freespace', 'totalspace' ):
- space = eval(key)(self.dir) / 1000000
+ space = eval(key)(self.filename) / 1000000
if space > 1000:
space='%s,%s' % (space / 1000, space % 1000)
return space
@@ -357,7 +353,7 @@
play directory
"""
# FIXME: add password checking here
- if not os.path.exists(self.dir):
+ if not os.path.exists(self.filename):
MessageWindow(_('Directory does not exist')).show()
return
display_type = self.display_type
@@ -395,7 +391,7 @@
if hasattr(self.item_menu, 'skin_force_text_view'):
del self.item_menu.skin_force_text_view
- elif not os.path.exists(self.dir):
+ elif not os.path.exists(self.filename):
# FIXME: better handling!!!!!
MessageWindow(_('Directory does not exist')).show()
return
Modified: trunk/ui/src/plugins/shoppingcart.py
==============================================================================
--- trunk/ui/src/plugins/shoppingcart.py (original)
+++ trunk/ui/src/plugins/shoppingcart.py Sun Apr 15 08:07:27 2007
@@ -65,7 +65,7 @@
Move/Copy items to the given directory.
"""
kaa.notifier.Thread(self.__move_or_copy_thread, self.cart, operation,
- item.dir).start()
+ item.filename).start()
self.cart = []
item.get_menustack().delete_submenu()
Modified: trunk/ui/src/video/interface.py
==============================================================================
--- trunk/ui/src/video/interface.py (original)
+++ trunk/ui/src/video/interface.py Sun Apr 15 08:07:27 2007
@@ -95,8 +95,8 @@
"""
set informations for a diritem based on the content, etc.
"""
- if database.tv_shows.has_key(os.path.basename(diritem.dir).lower()):
- tvinfo = database.tv_shows[os.path.basename(diritem.dir).lower()]
+ if
database.tv_shows.has_key(os.path.basename(diritem.filename).lower()):
+ tvinfo =
database.tv_shows[os.path.basename(diritem.filename).lower()]
diritem.info.set_variables(tvinfo[1])
if not diritem.image:
diritem.image = tvinfo[0]
Modified: trunk/ui/src/video/plugins/mover.py
==============================================================================
--- trunk/ui/src/video/plugins/mover.py (original)
+++ trunk/ui/src/video/plugins/mover.py Sun Apr 15 08:07:27 2007
@@ -106,10 +106,10 @@
# don't bother moving to current-dir
return []
- cp = os.path.commonprefix((item.parent.dir, self.from_dir))
+ cp = os.path.commonprefix((item.parent.filename, self.from_dir))
if (self.recursive and cp == self.from_dir) \
- or ( item.parent.dir == self.from_dir) \
- or ( item.parent.dir == self.from_dir + '/'):
+ or ( item.parent.filename == self.from_dir) \
+ or ( item.parent.filename == self.from_dir + '/'):
# Create Action
name = _('Move to [%s]') % os.path.basename(self.to_dir)
return [ Action(name, self.move_item) ]
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
