Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-15 21:14:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1451 from duailibe/path-sort

Browse source 
Fix sort by path when case insenstive (fix #1451)
This commit is contained in:
Lucas Duailibe 2015-05-07 23:47:06 -03:00
commit f497bf849b
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
beets/dbcore/query.py
View file

@ -756,8 +756,11 @@ class FixedFieldSort(FieldSort):
"""
def order_clause(self):
order = "ASC" if self.ascending else "DESC"
collate = 'COLLATE NOCASE' if self.case_insensitive else ''
return "{0} {1} {2}".format(self.field, collate, order)
if self.case_insensitive:
field = 'LOWER({})'.format(self.field)
else:
field = self.field
return "{0} {1}".format(field, order)
class SlowFieldSort(FieldSort):

1
docs/changelog.rst
View file

@ -12,6 +12,7 @@ Fixes:
:doc:`/plugins/embedart`, :doc:`/plugins/fetchart`,
and :doc:`/plugins/thumbnails`). :bug:`1448`
* :doc:`/plugins/permissions`: Fix an error with non-ASCII paths. :bug:`1449`
* Fix sorting by paths when case-insensitive. :bug:`1451`
1.3.13 (April 24, 2015)

13
test/test_sort.py
View file

@ -66,6 +66,7 @@ class DummyDataTestCase(_common.TestCase):
items[0].flex2 = "Flex2-A"
items[0].album_id = albums[0].id
items[0].artist_sort = None
items[0].path = "/path0.mp3"
items[1].title = 'Baz qux'
items[1].artist = 'Two'
items[1].album = 'Baz'
@ -75,6 +76,7 @@ class DummyDataTestCase(_common.TestCase):
items[1].flex2 = "Flex2-A"
items[1].album_id = albums[0].id
items[1].artist_sort = None
items[1].path = "/patH1.mp3"
items[2].title = 'Beets 4 eva'
items[2].artist = 'Three'
items[2].album = 'Foo'
@ -84,6 +86,7 @@ class DummyDataTestCase(_common.TestCase):
items[2].flex2 = "Flex1-B"
items[2].album_id = albums[1].id
items[2].artist_sort = None
items[2].path = "/paTH2.mp3"
items[3].title = 'Beets 4 eva'
items[3].artist = 'Three'
items[3].album = 'Foo2'
@ -93,6 +96,7 @@ class DummyDataTestCase(_common.TestCase):
items[3].flex2 = "Flex1-C"
items[3].album_id = albums[2].id
items[3].artist_sort = None
items[3].path = "/PATH3.mp3"
for item in items:
self.lib.add(item)
@ -141,6 +145,15 @@ class SortFixedFieldTest(DummyDataTestCase):
for r1, r2 in zip(results, results2):
self.assertEqual(r1.id, r2.id)
def test_sort_path_field(self):
q = ''
sort = dbcore.query.FixedFieldSort('path', True)
results = self.lib.items(q, sort)
self.assertEqual(results[0]['path'], '/path0.mp3')
self.assertEqual(results[1]['path'], '/patH1.mp3')
self.assertEqual(results[2]['path'], '/paTH2.mp3')
self.assertEqual(results[3]['path'], '/PATH3.mp3')
class SortFlexFieldTest(DummyDataTestCase):
def test_sort_asc(self):