Author: dmeyer
Date: Thu Sep 13 13:48:08 2007
New Revision: 9876
Log:
fix sort-by-date
Modified:
trunk/ui/src/audio/audioitem.py
trunk/ui/src/directory.py
trunk/ui/src/menu/item.py
trunk/ui/src/menu/mediaitem.py
Modified: trunk/ui/src/audio/audioitem.py
==============================================================================
--- trunk/ui/src/audio/audioitem.py (original)
+++ trunk/ui/src/audio/audioitem.py Thu Sep 13 13:48:08 2007
@@ -70,7 +70,7 @@
track = int(self.info.get('trackno'))
except (ValueError, KeyError, TypeError):
track = 0
- return u'%20d %s' % (track, self.name)
+ return u'%20d %s' % (track, self.name.lower())
return MediaItem.sort(self, mode)
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Thu Sep 13 13:48:08 2007
@@ -400,7 +400,7 @@
#
def _sortfunc(m):
- return lambda l, o: cmp(l.sort(m).lower(), o.sort(m).lower())
+ return lambda l, o: cmp(l.sort(m), o.sort(m))
sorttype = self['config:sort']
Modified: trunk/ui/src/menu/item.py
==============================================================================
--- trunk/ui/src/menu/item.py (original)
+++ trunk/ui/src/menu/item.py Thu Sep 13 13:48:08 2007
@@ -99,15 +99,15 @@
Returns the string how to sort this item
"""
if mode == 'name':
- return self.name
+ return self.name.lower()
if mode == 'smart':
name = self.name
if name.lower().startswith('the '):
- return name[4:]
+ return name[4:].lower()
if name.lower().startswith('a '):
- return name[2:]
- return name
- print 'oops', mode, self
+ return name[2:].lower()
+ return name.lower()
+ log.error('unsupport sort mode %s', mode)
return ''
Modified: trunk/ui/src/menu/mediaitem.py
==============================================================================
--- trunk/ui/src/menu/mediaitem.py (original)
+++ trunk/ui/src/menu/mediaitem.py Thu Sep 13 13:48:08 2007
@@ -183,13 +183,20 @@
Returns the string how to sort this item
"""
if mode == 'date':
- if self.filename:
- return u'%s%s' % (os.stat(self.filename).st_ctime, self.name)
- return u'0%s' % self.name
+ date = self.info.get('date')
+ if date:
+ print 1, date
+ return date
+ date = self.info.get('mtime')
+ if date:
+ print 2, date
+ return date
+ print 3, date
+ return 0
if mode == 'filename':
if self.filename:
- return unicode(self.filename, errors = 'replace')
- return self.name
+ return unicode(self.filename, errors = 'replace').lower()
+ return self.name.lower()
return Item.sort(self, mode)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
