gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-19 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minors corrections:

Browse Source 
Changes to accept .flac encoding
Reencode mp3 to the desired bitrate
This commit is contained in:
pabloalcantara
2011-08-17 11:28:15 -03:00
parent 6e1cb2b9fe
commit ddc015849f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
headphones/encode.py
View File

@@ -25,10 +25,11 @@ def encode(albumPath):
for r,d,f in os.walk(albumPath):
for music in f:
if any(music.endswith('.' + x) for x in ["flac", "m4a", "wav"]):
if any(music.endswith('.' + x) for x in ["mp3", "flac", "m4a", "wav"]):
musicFiles.append(os.path.join(r, music))
musicTempFiles.append(os.path.join(tempDirEncode, music))
musicTemp = os.path.join(os.path.splitext(music)[0])+'.mp3'
musicTempFiles.append(os.path.join(tempDirEncode, musicTemp))
if headphones.ENCODER=='lame':
encoder=os.path.join(headphones.ENCODERFOLDER,'lame')
else:
@@ -37,24 +38,24 @@ def encode(albumPath):
for music in musicFiles:
return_code=1
if headphones.ENCODER == 'lame':
cmd=encoder+' -h --resample ' + headphones.SAMPLINGFREQUENCY + ' -b ' + headphones.BITRATE
cmd=encoder+' -h --resample ' + str(headphones.SAMPLINGFREQUENCY) + ' -b ' + str(headphones.BITRATE)
cmd=cmd+' "'+os.path.join(music)+'"'
cmd=cmd+' "'+os.path.join(musicTempFiles[i])+'"'
return_code = call(cmd, shell=True)
if return_code==0:
os.remove(music)
os.rename(musicTempFiles[i],music)
shutil.move(musicTempFiles[i],os.path.join(albumPath))
i=i+1
else:
cmd=encoder+' -i'
cmd=cmd+' "'+os.path.join(music)+'"'
cmd=cmd+' -ac 2 -vn -ar ' + headphones.SAMPLINGFREQUENCY + ' -ab ' + headphones.BITRATE +'k'
cmd=cmd+' -ac 2 -vn -ar ' + str(headphones.SAMPLINGFREQUENCY) + ' -ab ' + str(headphones.BITRATE) +'k'
cmd=cmd+' "'+os.path.join(musicTempFiles[i])+'"'
return_code = call(cmd, shell=True)
print return_code
if return_code==0:
os.remove(music)
os.rename(musicTempFiles[i],music)
shutil.move(musicTempFiles[i],os.path.join(albumPath))
i=i+1
shutil.rmtree(tempDirEncode)

3
headphones/postprocessor.py
View File

@@ -198,11 +198,10 @@ def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list)
logger.info('Starting post-processing for: %s - %s' % (release['ArtistName'], release['AlbumTitle']))
#start enconding
if headphones.ENCODE=='1':
if headphones.ENCODE:
encode.encode(albumpath)
if headphones.EMBED_ALBUM_ART or headphones.ADD_ALBUM_ART:
album_art_path = albumart.getAlbumArt(albumid)
artwork = urllib.urlopen(album_art_path).read()