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

fix: try to fix shell execute problem

Browse Source
This commit is contained in:
WorldObservationLog
2024-05-28 23:45:05 +08:00
parent 186f8e5e35
commit e40f8fec5e
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mp4.py
View File

@@ -194,15 +194,10 @@ async def write_metadata(song: bytes, metadata: SongMetadata, embed_metadata: li
time = datetime.strptime(metadata.created, "%Y-%m-%d").strftime("%d/%m/%Y") time = datetime.strptime(metadata.created, "%Y-%m-%d").strftime("%d/%m/%Y")
else: else:
time = "" time = ""
if if_shell(): subprocess.run(["mp4box", "-time", time, "-mtime", time, "-name", f"1={metadata.title}", "-itags",
subprocess.run( ":".join(["tool=", f"cover={absolute_cover_path}",
f"mp4box -time {time} -mtime {time} -name 1={metadata.title} -itags tool=:cover={absolute_cover_path}:{metadata.to_itags_params(embed_metadata)} {song_name.absolute()}", metadata.to_itags_params(embed_metadata)]),
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, shell=if_shell()) song_name.absolute()], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
else:
subprocess.run(["mp4box", "-time", time, "-mtime", time, "-name", f"1={metadata.title}", "-itags",
":".join(["tool=", f"cover={absolute_cover_path}",
metadata.to_itags_params(embed_metadata)]),
song_name.absolute()], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, shell=if_shell())
with open(song_name.absolute(), "rb") as f: with open(song_name.absolute(), "rb") as f:
embed_song = f.read() embed_song = f.read()
tmp_dir.cleanup() tmp_dir.cleanup()
@@ -219,8 +214,9 @@ async def fix_encapsulate(song: bytes) -> bytes:
new_song_name = Path(tmp_dir.name) / Path(f"{name}_fixed.m4a") new_song_name = Path(tmp_dir.name) / Path(f"{name}_fixed.m4a")
with open(song_name.absolute(), "wb") as f: with open(song_name.absolute(), "wb") as f:
f.write(song) f.write(song)
subprocess.run(f"ffmpeg -y -i {song_name.absolute()} -fflags +bitexact -c:a copy -c:v copy {new_song_name.absolute()}", subprocess.run(
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, shell=if_shell()) f"ffmpeg -y -i {song_name.absolute()} -fflags +bitexact -c:a copy -c:v copy {new_song_name.absolute()}",
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, shell=if_shell())
with open(new_song_name.absolute(), "rb") as f: with open(new_song_name.absolute(), "rb") as f:
encapsulated_song = f.read() encapsulated_song = f.read()
tmp_dir.cleanup() tmp_dir.cleanup()