Mirrors/udemy-downloader
1
0
Fork 0
mirror of https://cdm-project.com/Download-Tools/udemy-downloader.git synced 2025-05-25 14:22:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

update: more verbosity

Browse Source 
+ Added more verbose logging during decryption and merging
+ Added error checking for decryption and merging
This commit is contained in:
Puyodead1 2021-12-28 10:42:41 -05:00
parent 72a354ed69
commit 4bdbf68f58
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main.py
View File

@ -1054,23 +1054,22 @@ def mux_process(video_title, video_filepath, audio_filepath, output_path):
else: else:
command = "nice -n 7 ffmpeg -y -i \"{}\" -i \"{}\" -acodec copy -vcodec copy -fflags +bitexact -map_metadata -1 -metadata title=\"{}\" \"{}\"".format( command = "nice -n 7 ffmpeg -y -i \"{}\" -i \"{}\" -acodec copy -vcodec copy -fflags +bitexact -map_metadata -1 -metadata title=\"{}\" \"{}\"".format(
video_filepath, audio_filepath, video_title, output_path) video_filepath, audio_filepath, video_title, output_path)
os.system(command) return os.system(command)
def decrypt(kid, in_filepath, out_filepath): def decrypt(kid, in_filepath, out_filepath):
""" """
@author Jayapraveen @author Jayapraveen
""" """
logger.info("> Decrypting, this might take a minute...")
try: try:
key = keys[kid.lower()] key = keys[kid.lower()]
if (os.name == "nt"): if (os.name == "nt"):
os.system(f"mp4decrypt --key 1:%s \"%s\" \"%s\"" % ret_code = os.system(f"mp4decrypt --key 1:%s \"%s\" \"%s\"" %
(key, in_filepath, out_filepath)) (key, in_filepath, out_filepath))
else: else:
os.system(f"nice -n 7 mp4decrypt --key 1:%s \"%s\" \"%s\"" % ret_code = os.system(f"nice -n 7 mp4decrypt --key 1:%s \"%s\" \"%s\"" %
(key, in_filepath, out_filepath)) (key, in_filepath, out_filepath))
logger.info("> Decryption complete") return ret_code
except KeyError: except KeyError:
raise KeyError("Key not found") raise KeyError("Key not found")
@ -1118,10 +1117,28 @@ def handle_segments(url, format_id, video_title,
return return
try: try:
decrypt(video_kid, video_filepath_enc, video_filepath_dec) logger.info("> Decrypting video, this might take a minute...")
ret_code = decrypt(video_kid, video_filepath_enc, video_filepath_dec)
if ret_code != 0:
logger.error(
"> Return code from the decrypter was non-0 (error), skipping!")
return
logger.info("> Decryption complete")
logger.info("> Decrypting audio, this might take a minute...")
decrypt(audio_kid, audio_filepath_enc, audio_filepath_dec) decrypt(audio_kid, audio_filepath_enc, audio_filepath_dec)
if ret_code != 0:
logger.error(
"> Return code from the decrypter was non-0 (error), skipping!")
return
logger.info("> Decryption complete")
logger.info("> Merging video and audio, this might take a minute...")
mux_process(video_title, video_filepath_dec, audio_filepath_dec, mux_process(video_title, video_filepath_dec, audio_filepath_dec,
output_path) output_path)
if ret_code != 0:
logger.error(
"> Return code from ffmpeg was non-0 (error), skipping!")
return
logger.info("> Merging complete, removing temporary files...")
os.remove(video_filepath_enc) os.remove(video_filepath_enc)
os.remove(audio_filepath_enc) os.remove(audio_filepath_enc)
os.remove(video_filepath_dec) os.remove(video_filepath_dec)