GitHubMirror/flac2pod
1
0
Fork 0
mirror of https://github.com/rwinkhart/flac2pod.git synced 2026-09-06 09:07:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of shell=True with Popen

Browse Source
This commit is contained in:
RandyTheSilly
2024-03-24 16:41:29 -04:00
parent 7411af721d
commit 3865e91517
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/flac2pod.py
+11 -17
View File
@@ -1,11 +1,12 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from argparse import ArgumentParser from argparse import ArgumentParser
from posixpath import join
from mutagen.flac import FLAC from mutagen.flac import FLAC
from os import cpu_count, getuid, listdir, path, stat, walk from os import cpu_count, getuid, listdir, path, stat, walk
from pathlib import Path from pathlib import Path
from shutil import copy from shutil import copy
from subprocess import check_output, Popen from subprocess import check_output, DEVNULL, Popen
from sys import exit as s_exit from sys import exit as s_exit
from time import sleep from time import sleep
@@ -61,20 +62,14 @@ def scan_destination_convert():
print(f"[{_file}] Not a FLAC file, copying...") print(f"[{_file}] Not a FLAC file, copying...")
copy(f"{_file}", f"{_file.replace(path.expanduser(source), path.expanduser(destination))}") copy(f"{_file}", f"{_file.replace(path.expanduser(source), path.expanduser(destination))}")
else: else:
_file_s = _file.replace(' ', '\\ ').replace("'", "\\'").replace(')', '\\)').replace('(', '\\(') \ _file_d = _file.replace(path.expanduser(source), path.expanduser(destination))[:-5] + '.m4a'
.replace(']', '\\]').replace('[', '\\[').replace('&', '\\&').replace('`', '\\`') \
.replace('$', '\\$')
_file_d = _file.replace(path.expanduser(source), path.expanduser(destination)).replace(' ', '\\ ') \
.replace("'", "\\'").replace(')', '\\)').replace('(', '\\(').replace(']', '\\]') \
.replace('[', '\\[').replace('&', '\\&').replace('`', '\\`').replace('$', '\\$')[
:-5] + '.m4a'
_active_processes = count_user_ffmpeg_processes() _active_processes = count_user_ffmpeg_processes()
while _active_processes >= cpu_count(): while _active_processes >= cpu_count():
print(f"\nThere are already {_active_processes} processes running on your {cpu_count()} threads...\n") print(f"\nThere are already {_active_processes} processes running on your {cpu_count()} threads...\n")
sleep(1) sleep(1)
_active_processes = count_user_ffmpeg_processes() _active_processes = count_user_ffmpeg_processes()
_i += 1 _i += 1
print(f"\n{_progress}% | \u001b[38;5;0;48;5;15mConverting {_file_s} to {_file_d}...\u001b[0m\n") print(f"\n{_progress}% | \u001b[38;5;0;48;5;15mConverting {_file} to {_file_d}...\u001b[0m\n")
# get relevant ReplayGain info # get relevant ReplayGain info
_audio = FLAC(f"{_file}") _audio = FLAC(f"{_file}")
if args.albumgain: if args.albumgain:
@@ -105,25 +100,24 @@ def scan_destination_convert():
_rgpeak = None _rgpeak = None
# determine ffmpeg arguments # determine ffmpeg arguments
if args.bake and _rggain is not None: if args.bake and _rggain is not None:
_bake_args, _flac2pod_rg_tags = '-filter:a "volume=' + str(_rggain) + 'dB"', '' _bake_args, _flac2pod_rg_tags = ['-filter:a', 'volume=' + str(_rggain) + 'dB'], []
elif _rggain is not None and _rgpeak is not None: elif _rggain is not None and _rgpeak is not None:
_bake_args, _flac2pod_rg_tags = '', f"-metadata comment='FLAC2PODRG#{_rggain}#{_rgpeak}#'" _bake_args, _flac2pod_rg_tags = [], ['-metadata', f"comment=FLAC2PODRG#{_rggain}#{_rgpeak}#"]
else: else:
_bake_args, _flac2pod_rg_tags = '', '' _bake_args, _flac2pod_rg_tags = [], []
if args.preserve: if args.preserve:
_art_args = '-c:v copy -map_metadata 0:g' _art_args = ['-c:v', 'copy', '-map_metadata', '0:g']
else: else:
_art_args = '-vn' _art_args = ['-vn']
# generate the appropriate ffmpeg command # generate the appropriate ffmpeg command
_cmd = f"screen -DmS flac2pod{_i} ffmpeg -i {_file_s} {_art_args} -c:a aac -b:a 256k {_bake_args} " \ _cmd = ['ffmpeg', '-i', _file] + _art_args + ['-c:a', 'aac', '-b:a', '256k'] + _bake_args + _flac2pod_rg_tags + ['-aac_pns', '0', '-movflags', '+faststart', _file_d]
f"{_flac2pod_rg_tags} -aac_pns 0 -movflags +faststart {_file_d} </dev/null"
if _rggain is not None: if _rggain is not None:
print(f"\u001b[38;5;0;48;5;15mGain adjustment: {_rggain}dB\u001b[0m") print(f"\u001b[38;5;0;48;5;15mGain adjustment: {_rggain}dB\u001b[0m")
else: else:
print(f"\u001b[38;5;0;48;5;88mNo ReplayGain data found!\u001b[0m") print(f"\u001b[38;5;0;48;5;88mNo ReplayGain data found!\u001b[0m")
if args.stopifnogain: if args.stopifnogain:
s_exit(1) s_exit(1)
Popen(_cmd, shell=True) Popen(['screen', '-DmS', f"flac2pod{_i}"] + _cmd)
_active_processes = count_user_ffmpeg_processes() _active_processes = count_user_ffmpeg_processes()
while _active_processes != 0: while _active_processes != 0:
print('\nPlease wait for the remaining conversions to complete...\n') print('\nPlease wait for the remaining conversions to complete...\n')