Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-20 15:43:58 +01:00
Code Issues Projects Releases Wiki Activity
6951 commits 43 branches 64 tags 67 MiB
Commit graph

6951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adrian Sampson
a6098928f5 Merge branch 'master' of github.com:sampsyo/beets 2016-06-29 10:33:00 -07:00
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
wordofglass
e2c6547635 fetchart: Clarify the deprecation of remote_priority in docs and 
warning, closes #2092
 2016-06-29 19:18:06 +02:00
Adrian Sampson
4ae7448c25 Simplify print_ changes (#2094) 2016-06-29 10:12:38 -07:00
Adrian Sampson
dc0fff0ca0 Merge pull request #2094 from jrobeson/ui-print_-args-must-be-unicode 
make sure ui.print_() only accepts unicode strings
 2016-06-29 10:08:26 -07:00
wordofglass
ebf44fd6cd Workaround for a race condition on queue invalidation, Issue #2078 2016-06-29 18:22:44 +02:00
Johnny Robeson
6b3cc6ff37 adapt print_() callers to send unicode strings 2016-06-29 03:17:02 -04:00
Johnny Robeson
2f1cd59e1b make sure ui.print_() only accepts unicode strings 2016-06-29 03:16:42 -04:00
Adrian Sampson
10a47e98d0 Merge branch 'master' of github.com:beetbox/beets 2016-06-28 20:41:14 -07:00
Adrian Sampson
aea692a112 Fix applying track index in per_disc_numbering 
Fixes #2085. This is the second half, which deals with actually applying the
track number. The previous condition didn't acknowledge that `Item` coerced
`None` to 0 to enforce its field types.
 2016-06-28 20:38:41 -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
bdbed1f6d9 only decode input_ results on python 2 2016-06-28 23:33:39 -04:00
Johnny Robeson
159e24a14b only decode decarg results on python 2 2016-06-28 23:32:46 -04:00
Johnny Robeson
5d4e3396d2 wrap a path in displayable_path in commands 2016-06-28 23:28:58 -04:00
Adrian Sampson
44e0e44108 Enforce type of ID3 desc fields 2016-06-28 20:22:58 -07:00
Adrian Sampson
0da1ba9299 Enforce string types for mutagen.Image 2016-06-28 20:19:20 -07:00
Adrian Sampson
4955933670 Update Mutagen dependency (#2088) 
This lets us remove a few more workarounds that Mutagen itself has addressed
already.
 2016-06-28 10:58:08 -07:00
Adrian Sampson
192dd321f1 permissions: Add debug logging 2016-06-28 10:53:23 -07:00
Adrian Sampson
890b9e81e3 Fix #2089: correct permissions configuration 
This reverts the change in 44380db6e8, where we
lost the ability to "reinterpret" decimals in the YAML configuration file as
octal permissions values.
 2016-06-28 10:51:13 -07:00
Adrian Sampson
84bfbe95b9 permissions: More helpful logging (#2089) 2016-06-28 10:39:35 -07:00
Adrian Sampson
b099503a6c permissions: Use correct path conversions 
It looks like the original author mistook `bytestring_path` for `syspath`.
 2016-06-28 10:31:57 -07:00
Adrian Sampson
e33c19a3e9 permissions: Use proper logging (#2089) 
Refactored so we can use the proper logging infrastructure instead of `print`.
 2016-06-28 10:29:26 -07:00
Adrian Sampson
3a700eb2a4 Merge pull request #2088 from lazka/mutagen-cleanup 
Mutagen cleanup
 2016-06-28 10:17:16 -07:00
Adrian Sampson
7827d86917 Note about six in changelog 2016-06-28 10:12:18 -07:00
Adrian Sampson
e39b6bd3fe Fix in-package version number (fix #2086) 2016-06-28 10:10:03 -07:00
Christoph Reiter
629241efd3 mediafile: Cleanup mutagen error handling 
Instead of the individial mutagen format exceptions use the
mutagen.MutagenError exception introduced in 1.25.

Since 1.33 mutagen will only raise MutagenError for load/save/delete
and no longer raise IOError. Translate both errors to UnreadableFileError
to support older and newer mutagen versions. Unify error handling
in __init__(), save() and delete().

Since it's no longer possible to get an IOError from MediaFile, adjust
all callers and tests accordingly.

This was tested with mutagen 1.27 and current mutagen master.
 2016-06-28 16:43:34 +02:00
Christoph Reiter
45404bce85 mediafile: Add note about MPEGInfo.channels being available in newer mutagen versions 2016-06-28 16:43:34 +02:00
Christoph Reiter
9f16cfd078 mediafile: Remove alac detection workaround 
No longer needed since we depend on mutagen 1.27
 2016-06-28 16:43:34 +02:00
Christoph Reiter
3984febf6c mediafile: Add note to ASF.delete that it's fixed in newer mutagen 2016-06-28 16:43:34 +02:00
Adrian Sampson
2515f98dfc Merge pull request #2087 from lazka/fix-setup-py-test 
tests: Fix setup.py test
 2016-06-27 23:04:20 -07:00
Christoph Reiter
06072c5d7d tests: Fix setup.py test 
test_hidden was missing suite() which made testall.suite() fail
 2016-06-27 10:23:34 +02:00
Johnny Robeson
74aeb0edbc call is_alive() instead of isAlive() in pipeline 2016-06-26 21:47:49 -04:00
Johnny Robeson
33faa48516 fallthrough to shlex.split on py3 in shlex_split 2016-06-26 16:56:43 -04:00
Johnny Robeson
890102e114 explicitly cast g1, g2, and peak to int in _sc_encode 
They seem to have been implicitly forced to int via `%X` format,
but with python 3.5 we must make it explicit.
 2016-06-26 16:40:09 -04:00
Adrian Sampson
77a869d290 Merge pull request #2050 from maxammann/master 
Add 'expand' flag to the web plugin
 2016-06-26 11:21:34 -07:00
Max Ammann
cfd70c2685 Added changelog for beetbox/beets#2050 2016-06-26 20:01:48 +02:00
Max Ammann
5e8ac9e4a5 Expose the relative path to the library instead of omitting the 'path' variable 2016-06-26 19:53:57 +02:00
Max Ammann
2ae26548fc Modified and simplified is_expand(...) method 2016-06-26 19:53:57 +02:00
Max Ammann
619344c813 Added documentation for the expand parameter 2016-06-26 19:53:57 +02:00
Max Ammann
041adf47ac Fixed lines which are mor than 79 characters 2016-06-26 19:53:57 +02:00
Max Ammann
4be45eacc6 Added documentation for the new 'expand' flag 2016-06-26 19:53:57 +02:00
Max Ammann
5831b99b9f Adding 'expand' flag for json requests 
This allows you to query the individual items of an album
 2016-06-26 19:53:57 +02:00
Johnny Robeson
ce88a78de7 add a __bytes__ method to LibModel 
this allows `test_album_and_item_format` in test_library to pass in py3
 2016-06-26 04:06:29 -04:00
Adrian Sampson
a8b039da78 Remove a spurious six use 
I'm not sure what that `encode` was doing anyway.
 2016-06-25 19:24:59 -07:00
Adrian Sampson
5efd5b21c5 Use new as_str method 
Instead of `get(six.text_type)`, which was a surprisingly large portion of our
uses of six.
 2016-06-25 19:16:14 -07:00
Adrian Sampson
fa7b9999e7 Add as_str shortcut to Confuse 2016-06-25 19:06:01 -07:00
Adrian Sampson
c8816df9fd Walk back small change to Confit path types 2016-06-25 18:54:21 -07:00
Adrian Sampson
f63513c0e0 Simpler string type handling 2016-06-25 18:49:17 -07:00
Adrian Sampson
c9aeac8cca Sync up Confit/Confuse with external repo 2016-06-25 18:46:46 -07:00
Adrian Sampson
de62a59d35 Remove an unnecessary six.range use 
Ordinary `range` works fine here.
 2016-06-25 18:39:29 -07:00