Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-07 16:34:45 +01:00
Code Issues Projects Releases Wiki Activity

correctly handle directories passed to import

Browse source 
When autotagging, die with an error if given a non-directory. When not
autotagging, just import the single file.
This commit is contained in:
Adrian Sampson 2010-07-04 00:04:28 -07:00
parent 4dcbb38d78
commit e50a26e8a4
2 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -13,7 +13,8 @@
* Fix UnicodeEncodeError on terminals that don't (or don't claim to)
support UTF-8.
* Importing without autotagging ("beet import -A") is now faster and
doesn't print out a bunch of whitespace.
doesn't print out a bunch of whitespace. It also lets you specify
single files on the command line (rather than just directories).
* The importer now logs an error instead of crashing when it attempts
to read a corrupt file.

54
beets/ui.py
View file

@ -335,7 +335,14 @@ def import_files(lib, paths, copy=True, write=True, autot=True, logpath=None):
else:
logfile = None
if autot:
if autot:
# Make sure we have only directories.
for path in paths:
if not os.path.isdir(path):
#fixme should show command usage
_print('not a directory: ' + path)
return
# Crawl albums and tag them.
first = True
for path in paths:
@ -349,25 +356,36 @@ def import_files(lib, paths, copy=True, write=True, autot=True, logpath=None):
# Write the database after each album.
lib.save()
else:
# No autotagging. Find all files in the paths.
# No autotagging. Just walk the paths.
for path in paths:
for root, dirs, files in autotag._sorted_walk(path):
for filename in files:
filepath = os.path.join(root, filename)
try:
item = library.Item.from_path(filepath)
except FileTypeError:
continue
except UnreadableFileError:
log.warn('unreadable file: ' + filepath)
continue
# Add the item to the library, copying if requested.
if copy:
item.move(lib, True)
# Don't write tags because nothing changed.
lib.add(item)
if os.path.isdir(path):
# Find all files in the directory.
filepaths = []
for root, dirs, files in autotag._sorted_walk(path):
for filename in files:
filepaths.append(os.path.join(root, filename))
else:
# Just add the file.
filepaths = [path]
# Add all the files.
for filepath in filepaths:
try:
item = library.Item.from_path(filepath)
except FileTypeError:
continue
except UnreadableFileError:
log.warn('unreadable file: ' + filepath)
continue
# Add the item to the library, copying if requested.
if copy:
item.move(lib, True)
# Don't write tags because nothing changed.
lib.add(item)
# Save when completely finished.
lib.save()