Commit graph

534 commits

Author SHA1 Message Date
Adrian Sampson
d5205915cc Avoid dangerous string conversions (#2094)
This rolls back the places in #2094 where `six.text_type(s)` was used where
`s` might be a bytestring. We almost never want that conversion, because it
uses the default encoding (almost always ASCII). The need for it indicates a
problem somewhere else, where bytes were produced when we were expecting
unicode strings.
2016-06-29 10:30:26 -07:00
Johnny Robeson
6b3cc6ff37 adapt print_() callers to send unicode strings 2016-06-29 03:17:02 -04:00
Adrian Sampson
10a47e98d0 Merge branch 'master' of github.com:beetbox/beets 2016-06-28 20:41:14 -07:00
Adrian Sampson
f46bfdf219 Fix index display with per_disc_numbering
If `medium_index` is missing, as it is from the Beatport source, the display
would show "None" instead of the global index (a fallback). This is half of
the problem in #2085.
2016-06-28 20:34:04 -07:00
Johnny Robeson
5d4e3396d2 wrap a path in displayable_path in commands 2016-06-28 23:28:58 -04:00
Johnny Robeson
edb1cbc5fc replace iter{items|values} with six.iter{items|values} 2016-06-24 05:53:55 -04:00
Johnny Robeson
e8afcbe7ec replace unicode with six.text_type 2016-06-24 05:53:49 -04:00
Johnny Robeson
4b2c4ced6c wrap extra_ops.keys() in a list in ui/commands 2016-06-14 01:55:47 -04:00
Jack Wilsdon
34b3cf36b7 Add --force option to beet remove 2016-06-08 19:22:24 +01:00
Adrian Sampson
1dc61491c6 Remove a bogus bash-completion path (#2038) 2016-06-08 09:36:00 -07:00
Adrian Sampson
77b0c17448 Merge pull request #2038 from bismark/patch-1
Support Homebrew's bash-completion2
2016-06-08 09:35:07 -07:00
Johnny Robeson
f7f249f6c6 wrap map() in a list() where necessary for py3
It's slightly more inefficient during the py3 transition, but
I still think it's worth minimizing the diff for.
2016-06-06 17:10:21 -04:00
Ryan Johnson
2fed1cf3f2 formatting 2016-06-06 17:11:09 +01:00
Ryan Johnson
cf397277d2 Support Homebrew's bash-completion2 2016-06-06 12:23:42 +01:00
Johnny Robeson
cd1f79340f remove explicit b' from sql query dict key names 2016-05-30 18:50:11 -04:00
Markus Unterwaditzer
f2f18d9d56 Fix variable names 2016-05-28 00:26:58 +02:00
Markus Unterwaditzer
1ae6ce04dd Run python-modernize across the codebase 2016-05-27 23:13:01 +02:00
Adrian Sampson
eac7d64545 Merge branch 'master' into no_unicode_literals 2016-02-28 15:21:43 -08:00
Adrian Sampson
e54c7eec3d Standardize __future__ imports without parentheses
Since the list is short enough now, we don't need parentheses for the line
wrap. This is a little less ugly.
2016-02-28 15:03:51 -08:00
Adrian Sampson
59e54d1792 Fix #1891: Missing syspath in beet stats -e 2016-02-22 00:02:58 -08:00
Peter Kessen
2048a4fbcb Removed unicode_literals from ui 2016-02-19 23:28:22 +01:00
Adrian Sampson
2aeed21f80 A little more documentation massaging for #1843
To make the docstirng fit in with the standard style.
2016-02-07 14:50:38 -08:00
Adrian Sampson
abc2ff066b Refine naming and docs for #1843
Most urgently, this function doesn't just work on *items*; it works on
arbitrary objects (and, in particular, albums).
2016-02-07 14:48:45 -08:00
Adrian Sampson
6e3d72afa6 Merge pull request #1846 from diego-plan9/interactiveedit
edit: allow interactive editing during the importer
2016-02-07 14:34:54 -08:00
Peter Kessen
19f2cea5bf Merge branch 'selective_modify2'
Conflicts:
	docs/changelog.rst

closes #1843
2016-02-04 17:57:35 +01:00
Peter Kessen
8412bd0f23 renamed print_modify_item to print_and_modify 2016-01-30 09:45:50 +01:00
Diego Moreda
b472e1e450 Merge branch 'master' of github.com:sampsyo/beets into interactiveedit 2016-01-29 20:20:56 +01:00
Peter Kessen
34e455b2ea changed docstring for print_modify_item 2016-01-29 16:21:39 +01:00
Adrian Sampson
7b88dc5760 Couple printer function with fields_func (#1818)
This isn't really a generic utility, since it is hard-coded to print the "key"
field of the result. So let's pair it with the place it's used.
2016-01-28 13:50:10 -08:00
Adrian Sampson
5ff14742b8 Simpler row lookup (#1818) 2016-01-28 13:48:20 -08:00
Adrian Sampson
6707eda4e4 Merge pull request #1818 from GuilhermeHideki/fields-print-flexattr
beet fields: Print flexible attributes
2016-01-28 13:46:40 -08:00
Peter Kessen
fafc73077d fixed broken tests 2016-01-28 22:26:55 +01:00
Peter Kessen
4863a945a2 introduced -t option for move command 2016-01-28 22:22:21 +01:00
Peter Kessen
2937607d52 Removed duplicate (Y/n) Question from output 2016-01-28 22:09:56 +01:00
Peter Kessen
c28eaee7d0 implemented interactive selection in modify 2016-01-28 21:50:37 +01:00
Peter Kessen
6b39751337 introduced print_modify_item as seperate function
preparation to implement interactive selection in modify command
2016-01-28 21:49:33 +01:00
Guilherme Danno
ff01015b61 Fields: Print flexible attributes 2016-01-28 17:30:36 -02:00
Diego Moreda
b7a2a42d9c Fix docs on plugin prompt choices conflict solving
* Fix docstring and `plugins.rst` regarding how the PromptChoices that
use the same short letter are handled (they are discarded instead of
raising an Exception).
2016-01-28 13:01:44 +01:00
Diego Moreda
79d84c0e4f Style and doc fixes for MB_id importer argument
* Rename the importer argument and related variables to make it more
generic, as the feature should be independent of the backend used and
not restricted to MusicBrainz.
* Update documentation and docstrings accordingly.
* Add changelog entry.
2016-01-22 16:31:00 +01:00
Diego Moreda
b526227482 Cleanup and documentation for MB_id importer arg
* Style cleanup and fixes for the "--musicbrainzid" import argument.
* Allow the input of several IDs (separated by spaces) on the "enter Id"
importer prompt.
* Add basic documentation.
2016-01-21 17:08:53 +01:00
Diego Moreda
c12e974852 Merge remote-tracking branch 'upstream/master' into mbid 2016-01-19 21:58:10 +01:00
Diego Moreda
48c92fbf5a Allow multiple MB ids to be passed to the importer
* Modify the "--musicbrainzid" argument to the importer so multiple IDs can be
specified by the user instead of a single one.
* Revise autotag.match.tag_album and autotag.match.tag_item signature to expect
a list of IDs (search_ids) instead of a single one (search_id), and add logic
for handling and returning multiple matches for those IDs.
* Update calls to those functions in other parts of the code.
2016-01-19 21:43:32 +01:00
Adrian Sampson
231981de0c Fix #1806: handle OSError in stats -e 2016-01-11 10:13:26 -08:00
Diego Moreda
1c95b7c46f Add musicbrainz id option to importer
* Add '-m', '--musicbrainzid' option to the import command, allowing the user
to specify a single MusicBrainz ID to be used for the candidate lookup instead
of trying to find suitable candidates.
* Modify lookup_candidates() of ImportTask and SingletonImportTask to use the
musicbrainz id if present.
2016-01-11 17:39:05 +01:00
Adrian Sampson
963a66a40c Refactor try_sync to also include moving
This will remove a bunch of duplication we currently have for moving files
*inside the library directory* when their metadata changes.
2016-01-08 14:56:52 -08:00
Jesse Weinstein
d4ccc10667 Fix typo: judment -> judgement 2016-01-06 01:31:01 -08:00
Adrian Sampson
f582e045e9 Add a comment for #1584 2016-01-01 13:05:07 -08:00
François-Xavier Thomas
50789e88fe Fix 1583: Move command only shows modified files 2016-01-01 17:49:53 +01:00
Jack Wilsdon
12cd5306b7 Update copyright dates to 2016 2015-12-30 15:42:06 +00:00
Diego Moreda
fc08b4665d Prompt event cleanup, conflict solving, singleton
* Simplify PromptChoice so "plugin" and "id" fields are removed, updating the
loops and the rest of the code to reflect this change.
* Solve short letter conflicts by keeping one of the choices and removing the
rest, instead of by raising an Exception.
* Misc cleanups as suggested on #1758 discussion.
2015-12-16 19:10:30 +01:00