avoid duplicated initialization

feeluown · Nov 23, 2023 · f861a22 · f861a22
1 parent 5a43a24
commit f861a22
Show file tree

Hide file tree

Showing 3 changed files with 174 additions and 82 deletions.
diff --git a/fuo_ytmusic/models.py b/fuo_ytmusic/models.py
@@ -196,7 +196,7 @@ class YtmusicHistorySong(YtmusicLibrarySong):
 class YtmusicSearchAlbum(YtmusicSearchBase, YtmusicCoverMixin, YtmusicArtistsMixin):
     title: str  # 专辑名
     type: str  # 专辑类型
-    year: Union[int, str]  # 年
+    year: Optional[Union[int, str]]  # 年
     browseId: str  # 查询ID
     isExplicit: bool
 

diff --git a/fuo_ytmusic/provider.py b/fuo_ytmusic/provider.py
@@ -160,8 +160,14 @@ def song_get_media(self, song: SongModel, quality: Quality.Audio) -> Optional[Me
         format_code, bitrate, format_str = song_info.get_media(quality)
         url = self.service.stream_url(song.identifier, format_code)
         if url is not None:
+            if 'video/mp4' in format_str:
+                format_ = 'mp4'
+            elif 'audio/mp4' in format_str:
+                format_ = 'm4a'
+            else:
+                format_ = ''
             return Media(url, type_=MediaType.audio, bitrate=bitrate,
-                         format=format_str, http_proxy=self._http_proxy)
+                         format=format_, http_proxy=self._http_proxy)
         return None
 
     def song_get(self, identifier):