1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
=== modified file 'dir2ogg'
--- dir2ogg 2007-11-25 15:28:55 +0000
+++ dir2ogg 2007-12-09 20:31:12 +0000
@@ -38,13 +38,14 @@
from optparse import OptionParser
from subprocess import Popen, call, PIPE
-__version__ = '0.11'
-__date__ = '2007-11-25'
+__version__ = '0.11.1'
+__date__ = '2007-12-10'
FILTERS = {'mp3': ('*.mp3',),
'm4a': ('*.aac', '*.m4a', '*.mp4'),
'wma': ('*.asf', '*.wma', '*.wmf'),
'flac': ('*.flac',),
+ 'wav': ('*.wav', ),
}
def mmatch(names, patterns, rbool=True):
@@ -124,7 +125,7 @@
if getattr(options, 'convert_' + ext):
options.filters += pat
# Missing decoders
- if getattr(options, 'convert_' + ext) and not getattr(options, ext + '_decoder'):
+ if ext != 'wav' and getattr(options, 'convert_' + ext) and not getattr(options, ext + '_decoder'):
fatal('%s was enabled, but no decoder has been found.' % ext)
if len(args) == 0 and not options.cdda:
@@ -290,7 +291,7 @@
self.songwav = song_root + 'wav'
self.songogg = song_root + 'ogg'
for ext, pat in FILTERS.items():
- if mmatch(self.song, pat):
+ if mmatch(self.song, pat) and ext != 'wav':
self.decoder = getattr(self.conf, ext + '_decoder')
getattr(self, 'grab_%s_tags' % ext)()
if ext == 'mp3' and self.conf.smart_mp3:
@@ -387,7 +388,7 @@
import traceback
traceback.print_exc()
return False
- else:
+ elif self.songwav != self.song or 'cd-' in self.decoder:
warn('No tags found...')
if self.conf.delete_input:
|
GitWeb
