Merge branch 'develop' into feature/multi-backend
This commit is contained in:
commit
f3589d2e49
@ -18,6 +18,7 @@ class CoreProcess(BaseThread):
|
||||
super(CoreProcess, self).__init__(self.core_queue)
|
||||
self.name = 'CoreProcess'
|
||||
self.options = self.parse_options()
|
||||
self.gobject_loop = None
|
||||
self.output = None
|
||||
self.backend = None
|
||||
self.frontends = []
|
||||
|
||||
@ -4,7 +4,7 @@ import re
|
||||
from mopidy import settings
|
||||
from mopidy.utils.path import mtime as get_mtime
|
||||
from mopidy.frontends.mpd import protocol
|
||||
from mopidy.utils.path import path_to_uri, uri_to_path, split_path
|
||||
from mopidy.utils.path import uri_to_path, split_path
|
||||
|
||||
def track_to_mpd_format(track, position=None, cpid=None):
|
||||
"""
|
||||
|
||||
@ -6,8 +6,6 @@ pygst.require('0.10')
|
||||
import gst
|
||||
|
||||
import datetime
|
||||
import sys
|
||||
import threading
|
||||
|
||||
from mopidy.utils.path import path_to_uri, find_files
|
||||
from mopidy.models import Track, Artist, Album
|
||||
@ -25,7 +23,7 @@ def translator(data):
|
||||
album_kwargs['num_tracks'] = data['track-count']
|
||||
|
||||
if 'artist' in data:
|
||||
artist_kwargs['name'] =data['artist']
|
||||
artist_kwargs['name'] = data['artist']
|
||||
|
||||
if 'date' in data:
|
||||
date = data['date']
|
||||
|
||||
@ -44,6 +44,8 @@ def split_path(path):
|
||||
break
|
||||
return parts
|
||||
|
||||
# pylint: disable = W0612
|
||||
# Unused variable 'dirnames'
|
||||
def find_files(path):
|
||||
if os.path.isfile(path):
|
||||
if not isinstance(path, unicode):
|
||||
@ -56,6 +58,7 @@ def find_files(path):
|
||||
if not isinstance(filename, unicode):
|
||||
filename = filename.decode('utf-8')
|
||||
yield filename
|
||||
# pylint: enable = W0612
|
||||
|
||||
class Mtime(object):
|
||||
def __init__(self):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user