andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mopidy/file/library.py

Browse Source 
Improve sort efficiency with tkem's suggestion in PR 1595.

Remove
import operator
because operator.attrgetter() not used now.

mopidy/file/ext.conf
Remove errant new line character introduced in
commit 0e1e703cbe.

Signed-off-by: Caysho <caysho@internode.on.net>
This commit is contained in:
Caysho 2017-02-03 18:58:08 +08:00
parent 0e1e703cbe
commit 3f77f03057
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mopidy/file/ext.conf
View File

@ -9,4 +9,3 @@ excluded_file_extensions =
.jpeg .jpeg
follow_symlinks = false follow_symlinks = false
metadata_timeout = 1000 metadata_timeout = 1000

11
mopidy/file/library.py
View File

@ -1,7 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import logging import logging
import operator
import os import os
import sys import sys
import urllib2 import urllib2
@ -82,13 +81,9 @@ class FileLibraryProvider(backend.LibraryProvider):
elif os.path.isfile(child_path): elif os.path.isfile(child_path):
result.append(models.Ref.track(name=name, uri=uri)) result.append(models.Ref.track(name=name, uri=uri))
sort_funcs = [operator.attrgetter('name'), def order(item):
lambda item: 0 if item.type == models.Ref.DIRECTORY return (item.type != models.Ref.DIRECTORY, item.name)
else 1] result.sort(key=order)
logger.debug('sort_funcs %s', sort_funcs)
for key_func in sort_funcs:
result.sort(key=key_func)
return result return result