Navigation

Changeset 315

Timestamp:

06/17/06 21:14:10 (3 years ago)

Author:

nicfit

Message:

Use album cover from file if one odes not exist in same dir (closes #65)

Files:

r304	r315
18	18	# $Id$
19	19	################################################################################
20		import ~~gtk, gtk.glad~~e
21		import ~~os, gobject~~
	20	import os, tempfile
	21	import gobject, gtk, gtk.glade
22	22
23	23	import mesk
…	…
85	85
86	86	def _on_audio_source_changed(self, ctrl, old, new):
	87	# FIXME: There is no need to do this if the file is in the same dir
	88	# or the album name has not changed.
	89
	90	# Search for a cover in the same directory as the source
87	91	dir = os.path.dirname(new[1].uri.path)
88	92	for fn in self.COVER_NAMES:
…	…
92	96	self._set_cover(cover_file)
93	97	return
	98
	99	# See if the tag has an image
	100	src = new[1]
	101	img = new[1].get_cover_image()
	102	if img:
	103	mimetype, data = img
	104	# XXX: gdk_pixbuf_new_from_data scares me, but it would be better
	105	# than this tmp file solution
	106	ext = '.%s' % mimetype.split("/")[1]
	107	file_d, filename = tempfile.mkstemp(ext)
	108	os.write(file_d, data)
	109	os.close(file_d)
	110	self._set_cover(filename)
	111	os.remove(filename)
	112	return
94	113
95	114	self._set_cover(self.DEFAULT_COVER)

r313	r315
19	19	################################################################################
20	20	import gst, eyeD3
	21	from eyeD3.frames import ImageFrame
21	22
22	23	gst.element_factory_make("mad")
…	…
39	40	raise UnsupportedScheme('\'%s\' URI scheme is not supported' % \
40	41	uri.scheme)
	42
	43	def get_native_tag(self):
	44	'''Returns the eyeD3.Tag for this source, or None'''
	45	if self.uri.scheme != 'file':
	46	return None
	47
	48	try:
	49	tag = eyeD3.Tag()
	50	if tag.link(self.uri.path):
	51	return tag
	52	except TagException, ex:
	53	return None
	54
	55	def get_cover_image(self):
	56	# Images are loaded lazily
	57	if self.meta_data.has_images:
	58	tag = self.get_native_tag()
	59	if tag:
	60	imgs = tag.getImages()
	61	# Search for acceptable covers
	62	for img in tag.getImages():
	63	# TODO: back cover support
	64	for type in [ImageFrame.FRONT_COVER, ImageFrame.OTHER]:
	65	if img.pictureType == type:
	66	return (img.mimeType, img.imageData)
	67	return None
	68
41	69
42	70	from eyeD3 import TagException, InvalidAudioFormatException
…	…
66	94	self.year = tag.getYear()
67	95	(self.track_num, self.track_total) = tag.getTrackNum()
	96	self.has_images = len(tag.getImages()) > 0
68	97	self.frozen = True
69	98	factory = Mp3AudioSource

r314	r315
28	28
29	29	from source import AudioSource, AudioMetaData
	30	from ogg.vorbis import VorbisFile, VorbisError
30	31	class OggAudioSource(AudioSource):
31	32	def __init__(self, uri):
…	…
40	41	uri.scheme)
41	42
42		from ogg.vorbis import VorbisFile, VorbisError
	43	def get_native_tag(self):
	44	'''Returns the VorbisComment object, if any'''
	45	if self.uri.scheme != 'file':
	46	return None
	47	try:
	48	tag = VorbisFile(self.uri.path)
	49	if tag.comment():
	50	return tag.comment()
	51	except VorbisError, ex:
	52	return None
	53
43	54	class OggMetaData(AudioMetaData):
44	55	def __init__(self, uri = None):

r313	r315
35	35	year = None
36	36	track_num = track_total = None
	37
	38	# Use to freeze the state from being updated
37	39	frozen = False
	40	# True when the meta data includes images.
	41	has_images = False
38	42
39		def __init__(self): pass
	43	def __init__(self):
	44	pass
40	45
41	46	class AudioSource:
…	…
46	51	self.uri = uri
47	52	self.meta_data = AudioMetaData()
	53
	54	def get_native_tag(self):
	55	return None
	56
	57	def get_cover_image(self):
	58	'''Return None, or a 2-tuple of the form (mimetype, imgdata)'''
	59	return None