Merge with bugfix-0.5
/mp3togo/conf.py
blob:f930d0c035d4b6d3388a385accb232f311a8fa3a -> blob:a9172f2a1028c58af20458eef79f9c84471be2bd
--- mp3togo/conf.py
+++ mp3togo/conf.py
@@ -107,7 +107,7 @@ class Options(options.Options):
'''The encoder to use to create the output files. Options are wav, lame or oggenc.'''),
('encopts', 'E', 'encoder-options', '', None,
'''Compression options for the encoder.'''),
- ('compfactor', 'z', 'compression-factor', 16.0, None,
+ ('compfactor', 'z', 'compression-factor', 18.0, None,
'''If you change the lame options, you must change this factor to match the compression rate of the new options. This is used to estimate completed file size.'''),
('makecache', '', 'make-cache', '', self._absfile, '''Make an output file cache at the given path.'''),
('cachesize', '', '', 0L, None, ''),
@@ -207,6 +207,8 @@ Description:
def _units(self, name, value):
#Calculate raw bytes and set [max|temp|cache]size
try:
+ if value[-1] in ('b', 'B'):
+ value = value[:-1]
if value[-1] in ('m', 'M'):
max = long(value[:-1]) * 1048576L
elif value[-1] in ('g', 'G'):