fix: many bugs about atmos

src/mp4.py

@@ -16,7 +16,8 @@ from src.api import download_m3u8
 from src.exceptions import CodecNotFoundException
 from src.metadata import SongMetadata
 from src.types import *
-from src.utils import find_best_codec, get_codec_from_codec_id, get_suffix, convent_mac_timestamp_to_datetime
+from src.utils import find_best_codec, get_codec_from_codec_id, get_suffix, convent_mac_timestamp_to_datetime, \
+    if_raw_atmos
 
 
 def if_shell():
@@ -32,9 +33,9 @@ async def get_available_codecs(m3u8_url: str) -> Tuple[list[str], list[str]]:
     codecs = [get_codec_from_codec_id(codec_id) for codec_id in codec_ids]
     return codecs, codec_ids
 
-
 async def extract_media(m3u8_url: str, codec: str, song_metadata: SongMetadata,
-                        codec_priority: list[str], alternative_codec: bool = False, alacMax: Optional[int] = None, atmosMax: Optional[int] = None) -> Tuple[str, list[str], str, Optional[int], Optional[int]]:
+                        codec_priority: list[str], alternative_codec: bool = False, alacMax: Optional[int] = None,
+                        atmosMax: Optional[int] = None) -> Tuple[str, list[str], str, Optional[int], Optional[int]]:
     parsed_m3u8 = m3u8.loads(await download_m3u8(m3u8_url), uri=m3u8_url)
     specifyPlaylist = find_best_codec(parsed_m3u8, codec, alacMax, atmosMax)
     if not specifyPlaylist and alternative_codec:
@@ -187,6 +188,7 @@ async def encapsulate(song_info: SongInfo, decrypted_media: bytes, atmos_convent
                 f.write(str(nhml_xml))
             subprocess.run(f"gpac -i {nhml_name.absolute()} nhmlr -o {song_name.absolute()}",
                            stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, shell=if_shell())
+    if not if_raw_atmos(song_info.codec, atmos_convent):
         subprocess.run(f'mp4box -brand "M4A " -ab "M4A " -ab "mp42" {song_name.absolute()}',
                        stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, shell=if_shell())
     with open(song_name.absolute(), "rb") as f:

src/rip.py

@@ -103,12 +103,13 @@ async def rip_song(song: Song, auth_params: GlobalAuthParams, codec: str, config
             decrypted_song = await decrypt(song_info, keys, song_data, device)
         song = await encapsulate(song_info, decrypted_song, config.download.atmosConventToM4a)
         if not if_raw_atmos(codec, config.download.atmosConventToM4a):
-            metadata_song = await write_metadata(song, song_metadata, config.metadata.embedMetadata,
+            song = await write_metadata(song, song_metadata, config.metadata.embedMetadata,
                                         config.download.coverFormat, song_info.params)
-            song = await fix_encapsulate(metadata_song)
+            if codec != Codec.EC3 or codec != Codec.EC3:
+                song = await fix_encapsulate(song)
             if codec == Codec.AAC or codec == Codec.AAC_DOWNMIX or codec == Codec.AAC_BINAURAL:
                 song = await fix_esds_box(song_info.raw, song)
-        filename = await save(song, codec.upper(), song_metadata, config.download, playlist)
+        filename = await save(song, codec, song_metadata, config.download, playlist)
         logger.info(f"Song {song_metadata.artist} - {song_metadata.title} saved!")
         if config.download.afterDownloaded:
             command = config.download.afterDownloaded.format(filename=filename)

src/save.py

@@ -8,7 +8,7 @@ from src.utils import ttml_convent_to_lrc, get_song_name_and_dir_path, get_suffi
 
 
 async def save(song: bytes, codec: str, metadata: SongMetadata, config: Download, playlist: PlaylistInfo = None):
-    song_name, dir_path = get_song_name_and_dir_path(codec, config, metadata, playlist)
+    song_name, dir_path = get_song_name_and_dir_path(codec.upper(), config, metadata, playlist)
     if not dir_path.exists() or not dir_path.is_dir():
         os.makedirs(dir_path.absolute())
     song_path = dir_path / Path(song_name + get_suffix(codec, config.atmosConventToM4a))

src/utils.py

@@ -142,16 +142,16 @@ def get_song_id_from_m3u8(m3u8_url: str) -> str:
     return regex.search(r"_A(\d*)_", parsed_m3u8.playlists[0].uri)[1]
 
 
-def if_raw_atmos(codec: str, save_raw_atmos: bool):
+def if_raw_atmos(codec: str, convent_atmos: bool):
-    if (codec == Codec.EC3 or codec == Codec.AC3) and save_raw_atmos:
+    if (codec == Codec.EC3 or codec == Codec.AC3) and not convent_atmos:
         return True
     return False
 
 
-def get_suffix(codec: str, save_raw_atmos: bool):
+def get_suffix(codec: str, convent_atmos: bool):
-    if not save_raw_atmos and codec == Codec.EC3:
+    if not convent_atmos and codec == Codec.EC3:
         return ".ec3"
-    elif not save_raw_atmos and codec == Codec.AC3:
+    elif not convent_atmos and codec == Codec.AC3:
         return ".ac3"
     else:
         return ".m4a"