Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-05 15:03:21 +01:00
Code Issues Projects Releases Wiki Activity

Marginally more readable bytes/memoryview switch

Browse source
This commit is contained in:
Adrian Sampson 2016-06-30 14:48:07 -07:00
parent a6830ae7d1
commit 61805b9994
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
beets/library.py
View file

@ -35,8 +35,14 @@ from beets import dbcore
from beets.dbcore import types
import beets
if not six.PY2:
buffer = memoryview # sqlite won't accept memoryview in python 2
# To use the SQLite "blob" type, it doesn't suffice to provide a byte
# string; SQLite treats that as encoded text. Wrapping it in a `buffer` or a
# `memoryview`, depending on the Python version, tells it that we
# actually mean non-text data.
if six.PY2:
BLOB_TYPE = buffer
else:
BLOB_TYPE = memoryview
log = logging.getLogger('beets')
@ -103,16 +109,16 @@ class PathQuery(dbcore.FieldQuery):
def col_clause(self):
if self.case_sensitive:
file_blob = buffer(self.file_path)
dir_blob = buffer(self.dir_path)
file_blob = BLOB_TYPE(self.file_path)
dir_blob = BLOB_TYPE(self.dir_path)
return '({0} = ?) || (substr({0}, 1, ?) = ?)'.format(self.field), \
(file_blob, len(dir_blob), dir_blob)
escape = lambda m: self.escape_char + m.group(0)
dir_pattern = self.escape_re.sub(escape, self.dir_path)
dir_blob = buffer(dir_pattern + b'%')
dir_blob = BLOB_TYPE(dir_pattern + b'%')
file_pattern = self.escape_re.sub(escape, self.file_path)
file_blob = buffer(file_pattern)
file_blob = BLOB_TYPE(file_pattern)
return '({0} LIKE ? ESCAPE ?) || ({0} LIKE ? ESCAPE ?)'.format(
self.field), (file_blob, self.escape_char, dir_blob,
self.escape_char)
@ -160,9 +166,8 @@ class PathType(types.Type):
# Paths stored internally as encoded bytes.
return bytestring_path(value)
elif isinstance(value, buffer):
# SQLite must store bytestings as buffers/memoryview
# to avoid decoding. We unwrap buffers to bytes.
elif isinstance(value, BLOB_TYPE):
# We unwrap buffers to bytes.
return bytes(value)
else:
@ -173,7 +178,7 @@ class PathType(types.Type):
def to_sql(self, value):
if isinstance(value, bytes):
value = buffer(value)
value = BLOB_TYPE(value)
return value
@ -526,7 +531,7 @@ class Item(LibModel):
if key == 'path':
if isinstance(value, six.text_type):
value = bytestring_path(value)
elif isinstance(value, buffer):
elif isinstance(value, BLOB_TYPE):
value = bytes(value)
if key in MediaFile.fields():