Refactor file globbing

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "discogs-tag"
-version = "0.3.0"
+version = "0.3.1"
 description = "A rudimentary audio tagger based on Discogs metadata."
 authors = ["infojunkie <[email protected]>"]
 readme = "README.md"

src/discogs_tag/cli.py

@@ -22,6 +22,8 @@
   'albumartist'
 ]
 
+AUDIO_EXTENSIONS = ['flac', 'mp3']
+
 def tag(
   release,
   dir='./',
@@ -36,10 +38,7 @@ def tag(
   })
   with urllib.request.urlopen(request) as response:
     data = json.load(response)
-    files = sorted(
-      glob.glob(os.path.join(glob.escape(dir), '**', '*.flac'), recursive=True) +
-      glob.glob(os.path.join(glob.escape(dir), '**', '*.mp3'), recursive=True)
-    )
+    files = get_files(dir)
     apply_metadata(data, files, options)
 
 def copy(
@@ -51,18 +50,14 @@ def copy(
 ):
   """Copy the audio tags from source to destination folders."""
   options = parse_options(locals())
-  src_files = sorted(
-    glob.glob(os.path.join(glob.escape(src), '**', '*.flac'), recursive=True) +
-    glob.glob(os.path.join(glob.escape(src), '**', '*.mp3'), recursive=True)
-  )
+  src_files = get_files(src)
+  pprint(src_files)
+  return
   if not src_files:
     raise Exception(f'No source files found at {src}. Aborting.')
 
-  dst_files = sorted(
-    glob.glob(os.path.join(glob.escape(dir), '**', '*.flac'), recursive=True) +
-    glob.glob(os.path.join(glob.escape(dir), '**', '*.mp3'), recursive=True)
-  )
   data = read_metadata(src_files, options)
+  dst_files = get_files(dir)
   if options['dry']:
     pprint(data)
   else:
@@ -137,6 +132,11 @@ def reduce_track(tracks, track):
   if not options['dry']:
     print(f'Processed {len(files)} audio files.')
 
+def get_files(dir):
+  return sorted(reduce(lambda xs, ys: xs + ys, [
+    glob.glob(os.path.join(glob.escape(dir), '**', f"*.{ext}"), recursive=True) for ext in AUDIO_EXTENSIONS
+  ]))
+
 def parse_options(options):
   for skip in SKIP_KEYS:
     options['skip_' + skip] = False

tests/test_discogs_tag.py

@@ -1,7 +1,18 @@
-from discogs_tag.cli import merge_metadata, apply_metadata, parse_options
+from discogs_tag.cli import merge_metadata, apply_metadata, parse_options, get_files
 import pytest
 import json
 
+def test_get_files():
+  files = get_files('tests/glob')
+  assert files == [
+    'tests/glob/01.mp3',
+    'tests/glob/02.flac',
+    'tests/glob/04.flac',
+    'tests/glob/05.mp3',
+    'tests/glob/sub1/01.flac',
+    'tests/glob/sub2/01.mp3'
+  ]
+
 def test_merge_metadata():
   audio = {}
   merge_metadata({