maryjane/gpodder
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Wiki Activity

Patch from Nick (nikosapi) to support eyeD3 cover art extraction

Browse source 
git-svn-id: svn://svn.berlios.de/gpodder/trunk@449 b0d088ad-0a06-0410-aad2-9ed5178a7e87
This commit is contained in:
Thomas Perl 2007-11-04 23:20:53 +00:00
parent 9343da2eb0
commit 10e12718d6
3 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Mon, 05 Nov 2007 00:17:12 +0100 <thp@perli.net>
Patch from Nick (nikosapi) to support eyeD3 cover art extraction
* src/gpodder/libipodsync.py: Apply modified version of a patch from
Nick (nikosapi.org) to utilize eyeD3 for cover art extraction in iPod
sync code; remove dependency on PyID3
* README: PyID3 is not a dependency anymore, as we can now use eyeD3
for the same purpose (cover art extraction)
Sat, 03 Nov 2007 14:14:09 +0100 <thp@perli.net>
Fix format_filesize() function to be standards-conformant (unit prefixes)

1
README
View file

@ -40,7 +40,6 @@
- python-pymad (preferred; MAD MP3 decoder Python bindings)
- python-eyed3 (alternative to pymad; eyeD3 Python bindings)
* python-gpod (libgpod's Python bindings)
* python-id3 (OPTIONAL; if you want ID3v2 cover art extraction)
* mplayer (OPTIONAL; if you want video podcast length detection)
Additional dependencies for "Update tags after download":

54
src/gpodder/libipodsync.py
View file

@ -54,24 +54,15 @@ try:
except:
log( '(ipodsync) Could not find pymad.')
# are we going to use eyeD3 for cover art extraction?
get_coverart = False
try:
import eyeD3
log( '(ipodsync) Found eyeD3')
get_coverart = True
log( '(ipodsync) Found eyeD3, will try to extract cover art from mp3 metadata')
except:
log( '(ipodsync) Coulld not find eyeD3.')
# are we going to use python-id3 for cover art extraction?
use_pyid3 = False
try:
# try to load PyID3
import id3
use_pyid3 = True
log('(ipodsync) Found PyID3, will try to extract cover art from mp3 metadata')
except:
log('(ipodsync) PyID3 not found - falling back to channel cover for iPod cover art')
log( '(ipodsync) Could not find eyeD3 - falling back to channel cover for iPod cover art')
import os
import os.path
@ -345,23 +336,25 @@ class gPodder_iPodSync( gPodderSyncMethod):
return True
return False
def set_cover_art(self, track, local_filename):
def set_cover_art( self, track, local_filename):
if not ipod_supported():
return False
if use_pyid3:
try:
cover_filename = local_filename + '.cover.jpg'
id3v2_tags = id3.ID3v2( local_filename )
for frame in id3v2_tags.frames:
if frame.id == 'APIC':
cover_file = file(cover_filename, 'w')
cover_file.write(frame.image)
cover_file.close()
if os.path.isfile( cover_filename):
if get_coverart:
tag = eyeD3.Tag()
if tag.link( local_filename):
if 'APIC' in tag.frames and len( tag.frames['APIC']) > 0:
# Try to guess the file extension (default to jpg)
extension = 'jpg'
if tag.frames['APIC'][0].mimeType == 'image/png':
extension = 'png'
cover_filename = '%s.cover.%s' ( local_filename, extension )
cover_file = open( cover_filename, 'w')
cover_file.write( tag.frames['APIC'][0].imageData)
cover_file.close()
gpod.itdb_track_set_thumbnails( track, cover_filename)
return True
except:
log( '(ipodsync) Error reading ID3v2 information for %s' % ( local_filename, ))
else:
log( '(ipodsync) Error reading cover art for %s' % ( local_filename, ))
# If we haven't yet found cover art, fall back to channel cover
return self.set_channel_art( track, local_filename)
@ -466,7 +459,10 @@ class gPodder_iPodSync( gPodderSyncMethod):
playlist = self.get_playlist_for_channel( channel)
gpod.itdb_playlist_add_track( playlist, track, -1)
self.set_cover_art( track, local_filename)
try:
self.set_cover_art( track, local_filename)
except:
log( 'Error setting cover art for "%s".', episode.title, sender = self)
# dirty hack to get video working, seems to work
for ext in video_extensions: