From 9a37a2fdd9d23eff5dc253c61054285ba7451d20 Mon Sep 17 00:00:00 2001 From: zo7 Date: Thu, 29 Jun 2017 22:58:14 -0700 Subject: [PATCH 1/2] Remove FLAC bit depth in output folder name --- whatmp3.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/whatmp3.py b/whatmp3.py index 4269fd0..7ab31d3 100755 --- a/whatmp3.py +++ b/whatmp3.py @@ -330,7 +330,8 @@ def main(): for codec in codecs: outdir = os.path.basename(flacdir) - flacre = re.compile('FLAC', re.IGNORECASE) + flacre_str = '(16|24)((-| )*(bit|44|48|96)* *)*FLAC(16|24| )*((16|24)*(-| )*(bit|44|48|96)*)*' + flacre = re.compile(flacre_str, re.IGNORECASE) if flacre.search(outdir): outdir = flacre.sub(codec, outdir) else: From 7fb877eced6b394cb6b6f206c91324282dbb4be5 Mon Sep 17 00:00:00 2001 From: zo7 Date: Thu, 29 Jun 2017 23:37:35 -0700 Subject: [PATCH 2/2] Fix bug where "FLAC" alone wouldn't be replaced --- whatmp3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whatmp3.py b/whatmp3.py index 7ab31d3..056f16c 100755 --- a/whatmp3.py +++ b/whatmp3.py @@ -330,7 +330,7 @@ def main(): for codec in codecs: outdir = os.path.basename(flacdir) - flacre_str = '(16|24)((-| )*(bit|44|48|96)* *)*FLAC(16|24| )*((16|24)*(-| )*(bit|44|48|96)*)*' + flacre_str = '((16|24)+(-| )*(bit|44|48|96)* *)*FLAC( *(16|24)+(-| )*(bit|44|48|96)*)*' flacre = re.compile(flacre_str, re.IGNORECASE) if flacre.search(outdir): outdir = flacre.sub(codec, outdir)