Merge 1357425 into d4c8cef

fuocore/local/models.py

@@ -0,0 +1,65 @@
+import logging
+
+from fuocore.models import (
+    BaseModel,
+    SongModel,
+    AlbumModel,
+    ArtistModel,
+    SearchModel,
+)
+
+from .provider import provider
+
+logger = logging.getLogger(__name__)
+
+
+class LBaseModel(BaseModel):
+    _detail_fields = ()
+
+    class Meta:
+        allow_get = True
+        provider = provider
+
+    def __getattribute__(self, name):
+        cls = type(self)
+        value = object.__getattribute__(self, name)
+        if name in cls._detail_fields and value is None:
+            logger.debug('Field %s value is None, get model detail first.' % name)
+            obj = cls.get(self.identifier)
+            for field in cls._detail_fields:
+                setattr(self, field, getattr(obj, field))
+            value = object.__getattribute__(self, name)
+        elif name in cls._detail_fields and not value:
+            logger.warning('Field %s value is not None, but is %s' % (name, value))
+        return value
+
+
+class LSongModel(SongModel, LBaseModel):
+
+    @classmethod
+    def get(cls, identifier):
+        return cls.meta.provider.library._songs.get(identifier)
+
+    @classmethod
+    def list(cls, identifier_list):
+        return map(cls.meta.provider.library._songs.get, identifier_list)
+
+
+class LAlbumModel(AlbumModel, LBaseModel):
+    _detail_fields = ('songs',)
+
+    @classmethod
+    def get(cls, identifier):
+        return cls.meta.provider.library._albums.get(identifier)
+
+
+class LArtistModel(ArtistModel, LBaseModel):
+    _detail_fields = ('songs',)
+
+    @classmethod
+    def get(cls, identifier):
+        return cls.meta.provider.library._artists.get(identifier)
+
+
+class LSearchModel(SearchModel, LBaseModel):
+    pass

fuocore/local/provider.py

@@ -1,23 +1,27 @@
 # -*- coding: utf-8 -*-
 
+"""
+TODO: 这个模块中目前逻辑非常多，包括音乐目录扫描、音乐库的构建等小部分，
+这些小部分理论都可以从中拆除。
+"""
+
 import logging
+import pickle
 import os
 
 from fuzzywuzzy import process
 from marshmallow.exceptions import ValidationError
 from mutagen import MutagenError
 from mutagen.mp3 import EasyMP3
+from mutagen.easymp4 import EasyMP4
 
 from fuocore.provider import AbstractProvider
 from fuocore.utils import log_exectime
 
-from fuocore.models import (
-    BaseModel, SearchModel, SongModel, AlbumModel, ArtistModel,
-)
-
 
 logger = logging.getLogger(__name__)
 MUSIC_LIBRARY_PATH = os.path.expanduser('~') + '/Music'
+CACHE_DIR = os.path.expanduser('~') + '/.FeelUOwn/data'
 
 
 def scan_directory(directory, exts=None, depth=2):
@@ -45,7 +49,10 @@ def create_song(fpath):
     model.
     """
     try:
-        metadata = EasyMP3(fpath)
+        if fpath.endswith('mp3') or fpath.endswith('ogg') or fpath.endswith('wma'):
+            metadata = EasyMP3(fpath)
+        elif fpath.endswith('m4a'):
+            metadata = EasyMP4(fpath)
     except MutagenError as e:
         logger.error('Mutagen parse metadata failed, ignore.')
         logger.debug(str(e))
@@ -67,32 +74,56 @@ def create_song(fpath):
     return song
 
 
-@log_exectime
-def scan(paths, depth=2):
-    """scan media files in all paths
-    """
-    song_exts = ['mp3', 'ogg', 'wma']
-    exts = song_exts
-    depth = depth if depth <= 3 else 3
-    media_files = []
-    for directory in paths:
-        logger.debug('正在扫描目录(%s)...', directory)
-        media_files.extend(scan_directory(directory, exts, depth))
-    songs = []
-    for fpath in media_files:
-        song = create_song(fpath)
-        if song is not None:
-            songs.append(song)
-        else:
-            logger.warning('%s can not be recognized', fpath)
-    logger.debug('扫描到 %d 首歌曲', len(songs))
-    return songs
-
-
 class Scanner:
     def __init__(self, paths=None, depth=2):
-        self.__songs = []
+        self._songs = []
+
+        #: music resource paths to be scanned, list
+        self.depth = depth
+        self.paths = paths or [MUSIC_LIBRARY_PATH]
 
+    @property
+    def songs(self):
+        return self._songs
+
+    @log_exectime
+    def run(self):
+        """scan media files in all paths
+        """
+        song_exts = ['mp3', 'ogg', 'wma', 'm4a']
+        exts = song_exts
+        depth = self.depth if self.depth <= 3 else 3
+        media_files = []
+        for directory in self.paths:
+            logger.debug('正在扫描目录(%s)...', directory)
+            media_files.extend(scan_directory(directory, exts, depth))
+
+        # db_name = CACHE_DIR + '/local_song_info.db'
+        # try:
+        #     with open(db_name, 'rb') as file_object:
+        #         historty_media_files, songs = pickle.load(file_object)
+        #         if (set(historty_media_files) == set(media_files)):
+        #             self._songs = songs
+        #             return
+        # except Exception as e:
+        #     logger.warning(str(e))
+
+        self._songs = []
+        for fpath in media_files:
+            song = create_song(fpath)
+            if song is not None:
+                self._songs.append(song)
+            else:
+                logger.warning('%s can not be recognized', fpath)
+        logger.debug('扫描到 %d 首歌曲', len(self._songs))
+
+        # with open(db_name, 'wb') as file_object:
+        #     if media_files:
+        #         pickle.dump((media_files, self._songs), file_object)
+
+
+class DataBase:
+    def __init__(self):
         #: identifier song map: {id: song, ...}
         self._songs = dict()
 
@@ -102,10 +133,6 @@ def __init__(self, paths=None, depth=2):
         #: identifier artist map: {id: artist, ...}
         self._artists = dict()
 
-        #: music resource paths to be scanned, list
-        self.depth = depth
-        self.paths = paths or [MUSIC_LIBRARY_PATH]
-
     @property
     def songs(self):
         return self._songs.values()
@@ -118,49 +145,78 @@ def albums(self):
     def artists(self):
         return self._artists.values()
 
-    def run(self):
-        self.__songs = scan(self.paths, self.depth)
-        self.setup_library()
-
-    def setup_library(self):
+    def run(self, songs):
         self._songs.clear()
         self._albums.clear()
         self._artists.clear()
 
-        for song in self.__songs:
+        self.setup_library(songs)
+        self.analyze_library()
+
+    def setup_library(self, scanner_songs):
+        for song in scanner_songs:
             if song.identifier in self._songs:
                 continue
             self._songs[song.identifier] = song
+
             if song.album is not None:
                 album = song.album
                 if album.identifier not in self._albums:
-                    self._albums[album.identifier] = album
-                album.songs.append(song)
+                    album_data = {'identifier': album.identifier,
+                                  'name': album.name,
+                                  'songs': []}
+                    if album.artists:
+                        album_data['artists'] = [{'identifier': album.artists[0].identifier,
+                                                  'name': album.artists[0].name}]
+                    self._albums[album.identifier], _ = LocalAlbumSchema(strict=True).load(album_data)
+                self._albums[album.identifier].songs.append(song)
+
             if song.artists is not None:
                 for artist in song.artists:
-                    artist.songs.append(song)
                     if artist.identifier not in self._artists:
-                        self._artists[artist.identifier] = artist
-                    if song.album is not None:
-                        artist.albums.append(song.album)
-                        song.album.artists.append(artist)
+                        artist_data = {'identifier': artist.identifier,
+                                       'name': artist.name,
+                                       'songs': [],
+                                       'albums': []}
+                        self._artists[artist.identifier], _ = LocalArtistSchema(strict=True).load(artist_data)
+                    self._artists[artist.identifier].songs.append(song)
+
+    def analyze_library(self):
+        for album in self._albums.values():
+            if album.artists:
+                album_artist = album.artists[0]
+                if album_artist.identifier not in self._artists:
+                    album_artist_data = {'identifier': album_artist.identifier,
+                                         'name': album_artist.name,
+                                         'songs': [],
+                                         'albums': []}
+                    self._artists[album_artist.identifier], _ = LocalArtistSchema(strict=True).load(album_artist_data)
+                self._artists[album_artist.identifier].albums.append(album)
+        for artist in self._artists.values():
+            # if artist.albums:
+            #     artist.albums.sort(key=lambda x: (x.songs[0].date is None, x.songs[0].date), reverse=True)
+            if artist.songs:
+                artist.songs.sort(key=lambda x: x.title)
 
 
 class LocalProvider(AbstractProvider):
 
     def __init__(self):
         super().__init__()
 
+        self.library = DataBase()
         self._songs = []
         self._albums = []
         self._artists = []
 
-    def scan(self, paths=None, depth=2):
+    def scan(self, paths=None, depth=3):
         scanner = Scanner(paths or [], depth=depth)
         scanner.run()
-        self._songs = list(scanner.songs)
-        self._albums = list(scanner.albums)
-        self._artists = list(scanner.artists)
+
+        self.library.run(scanner.songs)
+        self._songs = list(self.library.songs)
+        self._albums = list(self.library.albums)
+        self._artists = list(self.library.artists)
 
     @property
     def identifier(self):
@@ -179,7 +235,7 @@ def artists(self):
         return self._artists
 
     @property
-    def album(self):
+    def albums(self):
         return self._albums
 
     @log_exectime
@@ -201,36 +257,7 @@ def search(self, keyword, **kwargs):
 
 provider = LocalProvider()
 
-
-class LBaseModel(BaseModel):
-    class Meta:
-        provider = provider
-
-
-class LSongModel(SongModel, LBaseModel):
-    @classmethod
-    def get(cls, identifier):
-        return cls.meta.provider.songs.get(identifier)
-
-    @classmethod
-    def list(cls, identifier_list):
-        return map(cls.meta.provider.songs.get, identifier_list)
-
-
-class LAlbumModel(AlbumModel, LBaseModel):
-    @classmethod
-    def get(cls, identifier):
-        return cls.meta.provider.albums.get(identifier)
-
-
-class LArtistModel(ArtistModel, LBaseModel):
-    @classmethod
-    def get(cls, identifier):
-        return cls.meta.provider.artists.get(identifier)
-
-
-class LSearchModel(SearchModel, LBaseModel):
-    pass
-
-
-from fuocore.local.schemas import EasyMP3MetadataSongSchema
+from .schemas import LocalAlbumSchema
+from .schemas import LocalArtistSchema
+from .schemas import EasyMP3MetadataSongSchema
+from .models import LSearchModel