github/supysonic
1
0
Fork 0
mirror of https://github.com/spl0k/supysonic.git synced 2024-09-19 19:01:03 +00:00
Code Issues Releases Wiki Activity

Whether or not a track has embeded art is tracked just like any other metadata, to reduce disk r/w and mem usage and a lot of other things.

Browse Source 
WARNING: This needs migrations before being merged to master
This commit is contained in:
Taizo Simpson 2018-10-10 12:58:47 -04:00
parent 74fba8840e
commit 2c4ec6c0e8
No known key found for this signature in database
GPG Key ID: D197B1197B2D4D68
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
supysonic/db.py
View File

@ -105,7 +105,7 @@ class Folder(PathMixin, db.Entity):
info['coverArt'] = str(self.id)
else:
for track in self.tracks:
if track.extract_cover_art():
if track.has_art:
info['coverArt'] = str(track.id)
break
@ -216,6 +216,7 @@ class Track(PathMixin, db.Entity):
year = Optional(int)
genre = Optional(str, nullable = True)
duration = Required(int)
has_art = Required(bool, default=False)
album = Required(Album, column = 'album_id')
artist = Required(Artist, column = 'artist_id')
@ -266,7 +267,7 @@ class Track(PathMixin, db.Entity):
info['year'] = self.year
if self.genre:
info['genre'] = self.genre
if self.extract_cover_art():
if self.has_art:
info['coverArt'] = str(self.id)
elif self.folder.cover_art:
info['coverArt'] = str(self.folder.id)
@ -304,8 +305,11 @@ class Track(PathMixin, db.Entity):
return (self.album.artist.name + self.album.name + ("%02i" % self.disc) + ("%02i" % self.number) + self.title).lower()
def extract_cover_art(self):
if os.path.exists(self.path):
metadata = mutagen.File(self.path)
return Track._extract_cover_art(self.path)
def _extract_cover_art(path):
if os.path.exists(path):
metadata = mutagen.File(path)
data = None
if metadata:
if isinstance(metadata.tags, mutagen.id3.ID3Tags) and len(metadata.tags.getall('APIC')) > 0:

1
supysonic/scanner.py
View File

@ -140,6 +140,7 @@ class Scanner:
trdict['year'] = self.__try_read_tag(tag, 'date', None, lambda x: int(x[0].split('-')[0]))
trdict['genre'] = self.__try_read_tag(tag, 'genre')
trdict['duration'] = int(tag.info.length)
trdict['has_art'] = bool(Track._extract_cover_art(path))
trdict['bitrate'] = (tag.info.bitrate if hasattr(tag.info, 'bitrate') else int(os.path.getsize(path) * 8 / tag.info.length)) // 1000
trdict['content_type'] = mimetypes.guess_type(path, False)[0] or 'application/octet-stream'

1
supysonic/schema/mysql.sql
View File

@ -29,6 +29,7 @@ CREATE TABLE IF NOT EXISTS track (
year INTEGER,
genre VARCHAR(256),
duration INTEGER NOT NULL,
has_art BOOLEAN NOT NULL,
album_id BINARY(16) NOT NULL REFERENCES album,
artist_id BINARY(16) NOT NULL REFERENCES artist,
bitrate INTEGER NOT NULL,

1
supysonic/schema/postgres.sql
View File

@ -29,6 +29,7 @@ CREATE TABLE IF NOT EXISTS track (
year INTEGER,
genre VARCHAR(256),
duration INTEGER NOT NULL,
has_art BOOLEAN NOT NULL,
album_id UUID NOT NULL REFERENCES album,
artist_id UUID NOT NULL REFERENCES artist,
bitrate INTEGER NOT NULL,

1
supysonic/schema/sqlite.sql
View File

@ -31,6 +31,7 @@ CREATE TABLE IF NOT EXISTS track (
year INTEGER,
genre VARCHAR(256),
duration INTEGER NOT NULL,
has_art BOOLEAN NOT NULL,
album_id CHAR(36) NOT NULL REFERENCES album,
artist_id CHAR(36) NOT NULL REFERENCES artist,
bitrate INTEGER NOT NULL,

2
tests/base/test_db.py
View File

@ -71,6 +71,7 @@ class DbTestCase(unittest.TestCase):
disc = 1,
number = 1,
duration = 3,
has_art = True,
bitrate = 320,
path = 'tests/assets/formats/silence.ogg',
content_type = 'audio/ogg',
@ -106,6 +107,7 @@ class DbTestCase(unittest.TestCase):
disc = 1,
number = 1,
duration = 5,
has_art = True,
bitrate = 96,
path = 'tests/assets/formats/silence.flac',
content_type = 'audio/flac',