diff --git a/server/app/api/folder.py b/server/app/api/folder.py index 6d1e99d..1cbb057 100644 --- a/server/app/api/folder.py +++ b/server/app/api/folder.py @@ -1,8 +1,6 @@ """ Contains all the folder routes. """ -from app import api -from app import helpers from app import settings from app.lib.folderslib import getFnF from flask import Blueprint diff --git a/server/app/lib/albumslib.py b/server/app/lib/albumslib.py index 6e19652..efb3944 100644 --- a/server/app/lib/albumslib.py +++ b/server/app/lib/albumslib.py @@ -143,6 +143,7 @@ def create_album(track: models.Track) -> dict: "title": track.album, "artist": track.albumartist, "hash": track.albumhash, + "copyright": track.copyright, } album["date"] = track.date diff --git a/server/app/models.py b/server/app/models.py index 432306b..07d1f07 100644 --- a/server/app/models.py +++ b/server/app/models.py @@ -3,6 +3,7 @@ Contains all the models for objects generation and typing. """ from dataclasses import dataclass from dataclasses import field +from operator import itemgetter from typing import List from app import helpers @@ -30,21 +31,37 @@ class Track: date: str image: str uniq_hash: str + copyright: str def __init__(self, tags): + ( + self.title, + self.album, + self.albumartist, + self.genre, + self.albumhash, + self.date, + self.folder, + self.filepath, + self.copyright, + ) = itemgetter( + "title", + "album", + "albumartist", + "genre", + "albumhash", + "date", + "folder", + "filepath", + "copyright", + )( + tags + ) self.trackid = tags["_id"]["$oid"] - self.title = tags["title"] self.artists = tags["artists"].split(", ") - self.albumartist = tags["albumartist"] - self.album = tags["album"] - self.folder = tags["folder"] - self.filepath = tags["filepath"] - self.genre = tags["genre"] self.bitrate = int(tags["bitrate"]) self.length = int(tags["length"]) self.discnumber = int(tags["discnumber"]) - self.albumhash = tags["albumhash"] - self.date = tags["date"] self.image = tags["albumhash"] + ".webp" self.tracknumber = int(tags["tracknumber"]) @@ -85,17 +102,21 @@ class Album: image: str count: int = 0 duration: int = 0 + copyright: str = field(default="") is_soundtrack: bool = False is_compilation: bool = False is_single: bool = False colors: List[str] = field(default_factory=list) def __init__(self, tags): - self.title = tags["title"] - self.artist = tags["artist"] - self.date = tags["date"] - self.image = tags["image"] - self.hash = tags["hash"] + ( + self.title, + self.artist, + self.date, + self.image, + self.hash, + self.copyright, + ) = itemgetter("title", "artist", "date", "image", "hash", "copyright")(tags) try: self.colors = tags["colors"] diff --git a/src/components/FolderView/SongList.vue b/src/components/FolderView/SongList.vue index 383d13c..29dc07e 100644 --- a/src/components/FolderView/SongList.vue +++ b/src/components/FolderView/SongList.vue @@ -22,6 +22,9 @@