Fix #1023: Remove support for local album images from coverartarchive.org
This commit is contained in:
parent
733732405f
commit
9150c34053
@ -141,7 +141,6 @@ class ScanCommand(commands.Command):
|
||||
mtime = file_mtimes.get(os.path.join(media_dir, relpath))
|
||||
track = utils.convert_tags_to_track(tags).copy(
|
||||
uri=uri, length=duration, last_modified=mtime)
|
||||
track = translator.add_musicbrainz_coverart_to_track(track)
|
||||
if library.add_supports_tags_and_duration:
|
||||
library.add(track, tags=tags, duration=duration)
|
||||
else:
|
||||
|
||||
@ -13,19 +13,10 @@ from mopidy.utils.path import path_to_uri, uri_to_path
|
||||
|
||||
|
||||
M3U_EXTINF_RE = re.compile(r'#EXTINF:(-1|\d+),(.*)')
|
||||
COVERART_BASE = 'http://coverartarchive.org/release/%s/front'
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def add_musicbrainz_coverart_to_track(track):
|
||||
if track.album and track.album.musicbrainz_id:
|
||||
images = [COVERART_BASE % track.album.musicbrainz_id]
|
||||
album = track.album.copy(images=images)
|
||||
track = track.copy(album=album)
|
||||
return track
|
||||
|
||||
|
||||
def local_track_uri_to_file_uri(uri, media_dir):
|
||||
return path_to_uri(local_track_uri_to_path(uri, media_dir))
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ import tempfile
|
||||
import unittest
|
||||
|
||||
from mopidy.local import translator
|
||||
from mopidy.models import Album, Track
|
||||
from mopidy.models import Track
|
||||
from mopidy.utils import path
|
||||
|
||||
from tests import path_to_data_dir
|
||||
@ -118,16 +118,3 @@ class M3UToUriTest(unittest.TestCase):
|
||||
|
||||
class URItoM3UTest(unittest.TestCase):
|
||||
pass
|
||||
|
||||
|
||||
class AddMusicbrainzCoverartTest(unittest.TestCase):
|
||||
def test_add_cover_for_album(self):
|
||||
album = Album(musicbrainz_id='someid')
|
||||
track = Track(album=album)
|
||||
|
||||
expected = album.copy(
|
||||
images=['http://coverartarchive.org/release/someid/front'])
|
||||
|
||||
self.assertEqual(
|
||||
track.copy(album=expected),
|
||||
translator.add_musicbrainz_coverart_to_track(track))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user