Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-23 07:44:38 +01:00
Code Issues Projects Releases Wiki Activity

Made formatting strings compatible with python 2.6

Browse source 
Also fixed styling according to pep8
This commit is contained in:
Wessie 2013-06-07 15:58:36 +02:00
parent 884c596f46
commit 0009c51577
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
beetsplug/beatport.py
View file

@ -68,7 +68,7 @@ class BeatportSearch(object):
release_type = None
def __unicode__(self):
return u"<BeatportSearch for {} \"{}\" with {} results>".format(
return u"<BeatportSearch for {0} \"{1}\" with {2} results>".format(
self.release_type, self.query, len(self.results))
def __init__(self, query, release_type='release', details=True):
@ -76,7 +76,7 @@ class BeatportSearch(object):
self.query = query
self.release_type = release_type
response = BeatportAPI.get('catalog/3/search', query=query,
facets=['fieldType:{}'
facets=['fieldType:{0}'
.format(release_type)],
perPage=5)
for item in response:
@ -97,8 +97,10 @@ class BeatportRelease(BeatportObject):
artist_str = ", ".join(x[1] for x in self.artists)
else:
artist_str = "Various Artists"
return u"<BeatportRelease: {} - {} ({})>".format(artist_str, self.name,
self.catalog_number)
return u"<BeatportRelease: {0} - {1} ({2})>".format(
artist_str, self.name,
self.catalog_number
)
def __init__(self, data):
BeatportObject.__init__(self, data)
@ -109,7 +111,7 @@ class BeatportRelease(BeatportObject):
if 'category' in data:
self.category = data['category']
if 'slug' in data:
self.url = "http://beatport.com/release/{}/{}".format(
self.url = "http://beatport.com/release/{0}/{1}".format(
data['slug'], data['id'])
@classmethod
@ -129,8 +131,8 @@ class BeatportTrack(BeatportObject):
def __unicode__(self):
artist_str = ", ".join(x[1] for x in self.artists)
return u"<BeatportTrack: {} - {} ({})>".format(artist_str, self.name,
self.mix_name)
return u"<BeatportTrack: {0} - {1} ({2})>".format(
artist_str, self.name, self.mix_name)
def __init__(self, data):
BeatportObject.__init__(self, data)
@ -141,7 +143,7 @@ class BeatportTrack(BeatportObject):
if 'length' in data:
self.length = timedelta(milliseconds=data['lengthMs'])
if 'slug' in data:
self.url = "http://beatport.com/track/{}/{}".format(
self.url = "http://beatport.com/track/{0}/{1}".format(
data['slug'], data['id'])
@classmethod
@ -202,7 +204,7 @@ class BeatportPlugin(BeetsPlugin):
or None if the release is not found.
"""
log.debug('Searching Beatport for release %s' % str(release_id))
match = re.search(r'(^|beatport\.com/release/.+/)(\d+)$', release_id)
match = re.search(r'(^|beatport\.com/release/.+/)(\d+)$', release_id)
if not match:
return None
release = BeatportRelease.from_id(match.group(2))
@ -214,7 +216,7 @@ class BeatportPlugin(BeetsPlugin):
or None if the track is not found.
"""
log.debug('Searching Beatport for track %s' % str(track_id))
match = re.search(r'(^|beatport\.com/track/.+/)(\d+)$', track_id)
match = re.search(r'(^|beatport\.com/track/.+/)(\d+)$', track_id)
if not match:
return None
bp_track = BeatportTrack.from_id(match.group(2))
@ -261,7 +263,7 @@ class BeatportPlugin(BeetsPlugin):
"""
title = track.name
if track.mix_name != u"Original Mix":
title += u" ({})".format(track.mix_name)
title += u" ({0})".format(track.mix_name)
artist, artist_id = self._get_artist(track.artists)
length = track.length.total_seconds()