Firehawk52-backup/AppleMusicDecrypt
28
0
Fork 0
mirror of https://github.com/WorldObservationLog/AppleMusicDecrypt.git synced 2026-01-15 14:22:54 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add task count

Browse Source
This commit is contained in:
世界观察日志
2025-06-25 11:50:36 +08:00
parent e0900c0251
commit c5142124da
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd.py
View File

@@ -14,7 +14,7 @@ from src.logger import GlobalLogger
from src.measurer import SpeedMeasurer
from src.rip import on_decrypt_success, on_decrypt_failed, rip_song, rip_album, rip_artist, rip_playlist
from src.url import AppleMusicURL, URLType
from src.utils import check_dep, run_sync, safely_create_task
from src.utils import check_dep, run_sync, safely_create_task, get_tasks_num
class InteractiveShell:
@@ -83,7 +83,7 @@ class InteractiveShell:
return
def bottom_toolbar(self):
return f"Download Speed: {it(SpeedMeasurer).download_speed()}, Decrypt Speed: {it(SpeedMeasurer).decrypt_speed()}"
return f"Download Speed: {it(SpeedMeasurer).download_speed()}, Decrypt Speed: {it(SpeedMeasurer).decrypt_speed()}, Tasks: {get_tasks_num()}"
async def handle_command(self):
session = PromptSession("> ", bottom_toolbar=self.bottom_toolbar, refresh_interval=1)

38
src/rip.py
View File

@@ -1,6 +1,5 @@
import asyncio
import subprocess
from asyncio import AbstractEventLoop
from typing import Dict
from creart import it
@@ -27,6 +26,7 @@ from src.utils import get_codec_from_codec_id, check_song_existence, check_song_
adam_id_task_mapping: Dict[str, Task] = {}
task_lock = asyncio.Semaphore(it(Config).download.maxRunningTasks)
async def task_done(task: Task, status: Status):
task_lock.release()
task.update_status(status)
@@ -169,10 +169,9 @@ async def rip_album(url: Album, codec: str, flags: Flags = Flags(), parent_done:
done_handler = ParentDoneHandler(len(album_info.data[0].relationships.tracks.data), on_children_done)
async with asyncio.TaskGroup() as tg:
for track in album_info.data[0].relationships.tracks.data:
song = Song(id=track.id, storefront=url.storefront, url="", type=URLType.Song)
tg.create_task(rip_song(song, codec, flags, done_handler))
for track in album_info.data[0].relationships.tracks.data:
song = Song(id=track.id, storefront=url.storefront, url="", type=URLType.Song)
safely_create_task(rip_song(song, codec, flags, done_handler))
async def rip_artist(url: Album, codec: str, flags: Flags = Flags()):
@@ -185,17 +184,16 @@ async def rip_artist(url: Album, codec: str, flags: Flags = Flags()):
async def on_children_done():
logger.done()
async with asyncio.TaskGroup() as tg:
if flags.include_participate_in_works:
songs = await it(WebAPI).get_songs_from_artist(url.id, url.storefront, it(Config).region.language)
done_handler = ParentDoneHandler(len(songs), on_children_done)
for song_url in songs:
tg.create_task(rip_song(Song.parse_url(song_url), codec, flags, done_handler))
else:
albums = await it(WebAPI).get_albums_from_artist(url.id, url.storefront, it(Config).region.language)
done_handler = ParentDoneHandler(len(albums), on_children_done)
for album_url in albums:
tg.create_task(rip_album(Album.parse_url(album_url), codec, flags, done_handler))
if flags.include_participate_in_works:
songs = await it(WebAPI).get_songs_from_artist(url.id, url.storefront, it(Config).region.language)
done_handler = ParentDoneHandler(len(songs), on_children_done)
for song_url in songs:
safely_create_task(rip_song(Song.parse_url(song_url), codec, flags, done_handler))
else:
albums = await it(WebAPI).get_albums_from_artist(url.id, url.storefront, it(Config).region.language)
done_handler = ParentDoneHandler(len(albums), on_children_done)
for album_url in albums:
safely_create_task(rip_album(Album.parse_url(album_url), codec, flags, done_handler))
async def rip_playlist(url: Playlist, codec: str, flags: Flags = Flags()):
@@ -211,8 +209,6 @@ async def rip_playlist(url: Playlist, codec: str, flags: Flags = Flags()):
done_handler = ParentDoneHandler(len(playlist_info.data[0].relationships.tracks.data), on_children_done)
async with asyncio.TaskGroup() as tg:
for track in playlist_info.data[0].relationships.tracks.data:
song = Song(id=track.id, storefront=url.storefront, url="", type=URLType.Song)
tg.create_task(
rip_song(song, codec, flags, done_handler, playlist=playlist_info))
for track in playlist_info.data[0].relationships.tracks.data:
song = Song(id=track.id, storefront=url.storefront, url="", type=URLType.Song)
safely_create_task(rip_song(song, codec, flags, done_handler, playlist=playlist_info))

4
src/utils.py
View File

@@ -273,3 +273,7 @@ def count_total_track_and_disc(tracks: Tracks):
if track_count.get(track.attributes.discNumber, 0) < track.attributes.trackNumber:
track_count[track.attributes.discNumber] = track.attributes.trackNumber
return disc_count, track_count
def get_tasks_num():
return len(background_tasks)