Merge pull request #2429 from karpinski/importer-move

Adding a 'move' option to the importer's CLI.

beets/ui/commands.py

@@ -941,6 +941,10 @@ import_cmd.parser.add_option(
     u'-C', u'--nocopy', action='store_false', dest='copy',
     help=u"don't copy tracks (opposite of -c)"
 )
+import_cmd.parser.add_option(
+    u'-m', u'--move', action='store_true', dest='move',
+    help=u"move tracks into the library (overrides -c)"
+)
 import_cmd.parser.add_option(
     u'-w', u'--write', action='store_true', default=None,
     help=u"write new metadata to files' tags (default)"

docs/changelog.rst

@@ -22,6 +22,9 @@ New features:
   value.  The argument can be any two characters that represent the left and
   right brackets. It defaults to `[]` and can also be blank to turn off
   bracketing. :bug:`2397` :bug:`2399`
+* Added a ``--move`` or ``-m`` option to the importer so that the files can be
+  moved to the library instead of being copied or added "in place".
+  :bug:`2252` :bug:`2429` 
 
 Fixes:
 

docs/guides/tagger.rst

@@ -95,6 +95,9 @@ command-line options you should know:
 * ``beet import -C``: don't copy imported files to your music directory; leave
   them where they are
 
+* ``beet import -m``: move imported files to your music directory (overrides
+  the ``-c`` option)
+
 * ``beet import -l LOGFILE``: write a message to ``LOGFILE`` every time you skip
   an album or choose to take its tags "as-is" (see below) or the album is
   skipped as a duplicate; this lets you come back later and reexamine albums

docs/reference/cli.rst

@@ -72,7 +72,8 @@ box. To extract `rar` files, install the `rarfile`_ package and the
 Optional command flags:
 
 * By default, the command copies files your the library directory and
-  updates the ID3 tags on your music. If you'd like to leave your music
+  updates the ID3 tags on your music. In order to move the files, instead of 
+  copying, use the ``-m`` (move) option. If you'd like to leave your music
   files untouched, try the ``-C`` (don't copy) and ``-W`` (don't write tags)
   options. You can also disable this behavior by default in the
   configuration file (below).