zhaarey/AppleMusicDecrypt
1
0
Fork 0
mirror of https://github.com/zhaarey/AppleMusicDecrypt.git synced 2025-10-23 15:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add lock for rip_song to prevent OOM

Browse Source
This commit is contained in:
WorldObservationLog
2024-05-09 14:11:02 +08:00
parent ddb72ca8d8
commit 075bc789bd
1 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rip.py
View File

@@ -16,10 +16,13 @@ from src.types import GlobalAuthParams, Codec
from src.url import Song, Album, URLType, Artist, Playlist from src.url import Song, Album, URLType, Artist, Playlist
from src.utils import check_song_exists, if_raw_atmos, playlist_write_song_index, get_codec_from_codec_id from src.utils import check_song_exists, if_raw_atmos, playlist_write_song_index, get_codec_from_codec_id
task_lock = asyncio.Semaphore(16)
@logger.catch @logger.catch
async def rip_song(song: Song, auth_params: GlobalAuthParams, codec: str, config: Config, device: Device, async def rip_song(song: Song, auth_params: GlobalAuthParams, codec: str, config: Config, device: Device,
force_save: bool = False, specified_m3u8: str = "", playlist: PlaylistInfo = None): force_save: bool = False, specified_m3u8: str = "", playlist: PlaylistInfo = None):
async with task_lock:
logger.debug(f"Task of song id {song.id} was created") logger.debug(f"Task of song id {song.id} was created")
token = auth_params.anonymousAccessToken token = auth_params.anonymousAccessToken
song_data = await get_song_info(song.id, token, song.storefront, config.region.language) song_data = await get_song_info(song.id, token, song.storefront, config.region.language)
@@ -45,10 +48,13 @@ async def rip_song(song: Song, auth_params: GlobalAuthParams, codec: str, config
return return
if specified_m3u8: if specified_m3u8:
song_uri, keys, codec_id = await extract_media(specified_m3u8, codec, song_metadata, song_uri, keys, codec_id = await extract_media(specified_m3u8, codec, song_metadata,
config.download.codecPriority, config.download.codecAlternative) config.download.codecPriority,
config.download.codecAlternative)
else: else:
song_uri, keys, codec_id = await extract_media(song_data.attributes.extendedAssetUrls.enhancedHls, codec, song_metadata, song_uri, keys, codec_id = await extract_media(song_data.attributes.extendedAssetUrls.enhancedHls, codec,
config.download.codecPriority, config.download.codecAlternative) song_metadata,
config.download.codecPriority,
config.download.codecAlternative)
logger.info(f"Downloading song: {song_metadata.artist} - {song_metadata.title}") logger.info(f"Downloading song: {song_metadata.artist} - {song_metadata.title}")
codec = get_codec_from_codec_id(codec_id) codec = get_codec_from_codec_id(codec_id)
raw_song = await download_song(song_uri) raw_song = await download_song(song_uri)