Author: duncan
Date: Sat Feb 9 11:07:24 2008
New Revision: 10351
Log:
[ 1889068 ] cdbackup oggenc problems
Patch from George Kibardin applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/audio/plugins/cdbackup.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/audio/plugins/cdbackup.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Sat Feb 9 11:07:24 2008
@@ -20,6 +20,7 @@
* Updated tv guide with scheduled to record and favorite icons (F#1886621)
* Updated tv program to stop reporting that a program is over (F#1886568)
* Updated xml tv epg to allow a timezone to be specified (F#1889376)
+ * Fixed cdbackup plug-in to allow empty parameters (B#1889068)
* Fixed the main program to cause a crash when local_conf.py is invalid
(B#1886624)
* Fixed web servers encoding interface (B#1885914)
Modified: branches/rel-1-7/freevo/src/audio/plugins/cdbackup.py
==============================================================================
--- branches/rel-1-7/freevo/src/audio/plugins/cdbackup.py (original)
+++ branches/rel-1-7/freevo/src/audio/plugins/cdbackup.py Sat Feb 9
11:07:24 2008
@@ -415,8 +415,7 @@
# Build the cdparanoia command to be run
cdparanoia_command = str('%s %s %s' % (config.CDPAR_CMD,
config.CD_RIP_CDPAR_OPTS, \
- str(i+1))).split(' ')+\
- [ wav_file ]
+ str(i+1))).split(' ')+[ wav_file ]
_debug_('cdparanoia: %s' % cdparanoia_command)
@@ -435,8 +434,8 @@
# Build the lame command to be run if mp3 format is selected
if string.upper(rip_format) == 'MP3':
output = '%s%s.mp3' % (pathname, path_tail)
- cmd = str('%s %s' % (config.LAME_CMD, config.CD_RIP_LAME_OPTS))
- cmd = cmd.split(' ') + \
+ cmdstr = str('%s %s' % (config.LAME_CMD,
config.CD_RIP_LAME_OPTS))
+ cmd = filter(len, cmdstr.split(' ')) + \
[ '--ignore-tag-errors', '--tt', song_names[i], '--ta',
artist,
'--tl', album, '--tn', '%(track)s,%(tracks)s' %
user_rip_path_prefs,
'--tg', genre, '--id3v2-only', wav_file, output ]
@@ -447,8 +446,8 @@
# Build the oggenc command to be run if ogg format is selected
elif string.upper(rip_format) == 'OGG':
output = '%s%s.ogg' % (pathname, path_tail)
- cmd = str('%s %s' % (config.OGGENC_CMD,
config.CD_RIP_OGG_OPTS))
- cmd = cmd.split(' ') + \
+ cmdstr = str('%s %s' % (config.OGGENC_CMD,
config.CD_RIP_OGG_OPTS))
+ cmd = filter(len, cmdstr.split(' ')) + \
[ '-a', artist, '-G', genre, '-N', track, '-t',
song_names[i],
'-l', album, wav_file, '-o', output ]
@@ -459,8 +458,8 @@
# Build the flacenc command
elif string.upper(rip_format) == 'FLAC':
output = '%s%s.flac' % (pathname, path_tail)
- cmd = '%s %s' % ( config.FLAC_CMD, config.CD_RIP_FLAC_OPTS )
- cmd = cmd.split(' ') + [ wav_file, '-o', output ]
+ cmdstr = '%s %s' % ( config.FLAC_CMD, config.CD_RIP_FLAC_OPTS )
+ cmd = filter(len, cmdstr.split(' ')) + [ wav_file, '-o',
output ]
metaflac_command = \
'metaflac --set-tag=ARTIST="%s" --set-tag=ALBUM="%s" '\
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sat Feb 9 11:07:24 2008
@@ -23,6 +23,7 @@
* Updated tv guide with scheduled to record and favorite icons (F#1886621)
* Updated tv program to stop reporting that a program is over (F#1886568)
* Updated xml tv epg to allow a timezone to be specified (F#1889376)
+ * Fixed cdbackup plug-in to allow empty parameters (B#1889068)
* Fixed the main program to cause a crash when local_conf.py is invalid
(B#1886624)
* Fixed web servers encoding interface (B#1885914)
Modified: branches/rel-1/freevo/src/audio/plugins/cdbackup.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/cdbackup.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/cdbackup.py Sat Feb 9 11:07:24 2008
@@ -415,8 +415,7 @@
# Build the cdparanoia command to be run
cdparanoia_command = str('%s %s %s' % (config.CDPAR_CMD,
config.CD_RIP_CDPAR_OPTS, \
- str(i+1))).split(' ')+\
- [ wav_file ]
+ str(i+1))).split(' ')+[ wav_file ]
_debug_('cdparanoia: %s' % cdparanoia_command)
@@ -435,8 +434,8 @@
# Build the lame command to be run if mp3 format is selected
if string.upper(rip_format) == 'MP3':
output = '%s%s.mp3' % (pathname, path_tail)
- cmd = str('%s %s' % (config.LAME_CMD, config.CD_RIP_LAME_OPTS))
- cmd = cmd.split(' ') + \
+ cmdstr = str('%s %s' % (config.LAME_CMD,
config.CD_RIP_LAME_OPTS))
+ cmd = filter(len, cmdstr.split(' ')) + \
[ '--ignore-tag-errors', '--tt', song_names[i], '--ta',
artist,
'--tl', album, '--tn', '%(track)s,%(tracks)s' %
user_rip_path_prefs,
'--tg', genre, '--id3v2-only', wav_file, output ]
@@ -447,8 +446,8 @@
# Build the oggenc command to be run if ogg format is selected
elif string.upper(rip_format) == 'OGG':
output = '%s%s.ogg' % (pathname, path_tail)
- cmd = str('%s %s' % (config.OGGENC_CMD,
config.CD_RIP_OGG_OPTS))
- cmd = cmd.split(' ') + \
+ cmdstr = str('%s %s' % (config.OGGENC_CMD,
config.CD_RIP_OGG_OPTS))
+ cmd = filter(len, cmdstr.split(' ')) + \
[ '-a', artist, '-G', genre, '-N', track, '-t',
song_names[i],
'-l', album, wav_file, '-o', output ]
@@ -459,8 +458,8 @@
# Build the flacenc command
elif string.upper(rip_format) == 'FLAC':
output = '%s%s.flac' % (pathname, path_tail)
- cmd = '%s %s' % ( config.FLAC_CMD, config.CD_RIP_FLAC_OPTS )
- cmd = cmd.split(' ') + [ wav_file, '-o', output ]
+ cmdstr = '%s %s' % ( config.FLAC_CMD, config.CD_RIP_FLAC_OPTS )
+ cmd = filter(len, cmdstr.split(' ')) + [ wav_file, '-o',
output ]
metaflac_command = \
'metaflac --set-tag=ARTIST="%s" --set-tag=ALBUM="%s" '\
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
