From a166d53bd31a4dd562a4387f9224bf9125a7dd25 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Thu, 07 Oct 2021 02:28:48 +0000
Subject: [PATCH] Corrected the error variable to err
---
aaxConvert.py | 66 ++++++++++++++------------------
1 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index bed8f47..e5504d9 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python -u
+#!/usr/bin/env -S python -u
import argparse
import os
import glob
@@ -44,26 +44,27 @@
def getmetadata(aaxfile):
+# Returns the metadata from an aax file
ret = subprocess.run(["ffprobe", "-v", "info", "-hide_banner", "-show_format", "-show_chapters", "-print_format", "json", os.path.abspath(aaxfile)], capture_output=True)
mdata = json.loads(ret.stdout)
aret = ret.stderr.decode().split('\n')[0]
mdata["checksum"] = aret.split()[-1]
return mdata
-
def getmetabitrate():
+#Return the bitrate of the media
bit_rate = metadata['format']['bit_rate']
return bit_rate[:2]
def getmetacopyright():
+# Return normalized copyright data
copyright = unicodedata.normalize('NFKD', metadata['format']['tags']['copyright']).encode('ascii','ignore')
- return copyright
-
+ return copyright.decode()
def getmetadatatags(key):
# get specific data
tag = metadata['format']['tags'][key]
- return tag
+ return " ".join(tag.split())
def reencode(aaxfile, outpath):
@@ -77,17 +78,17 @@
getmetacopyright(),outpath)
if args.verbose:
print(command)
- process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
- while True:
- output = process.stdout.readline()
- if output == '' and process.poll() is not None:
- break
- if output:
- print(output.strip())
- rc = process.poll()
+ process = subprocess.run(command, shell=True, capture_output=True)
+ # while True:
+ # output = process.stdout.readline()
+ # if output == '' and process.poll() is not None:
+ # break
+ # if output:
+ # print(output.strip())
+ rc = process.stdout
return rc
else:
- process = subprocess.call(shlex.split(command))
+ process = subprocess.run(command, shell=True)
return
@@ -106,23 +107,23 @@
def movetochapters(path, outpath, chapter, title, start,end):
# Creating individual chapters
- outfile = "{}/Ch - {} {}.mp3".format(outpath, chapter, title)
+ outfile = "{}/Ch-{}_{}.mp3".format(outpath, chapter, title.replace(' ', '_'))
command = "ffmpeg -loglevel error {} -i \"{}\" -ss {} -to {} -codec:a copy -metadata 'track={}' \"{}\"".format(stats, path,
start, end,
chapter, outfile)
if args.verbose:
print(command)
- process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
- while True:
- output = process.stdout.readline()
- if output == '' and process.poll() is not None:
- break
- if output:
- print(output.strip())
+ process = subprocess.run(command, shell=True, capture_output=True)
+ # while True:
+ # output = process.stdout.readline()
+ # if output == '' and process.poll() is not None:
+ # break
+ # if output:
+ # print(output.strip())
rc = process.poll()
return rc
else:
- process = subprocess.call(shlex.split(command))
+ process = subprocess.run(command, shell=True)
return
@@ -132,25 +133,16 @@
path, outpath)
if args.verbose:
print(command)
- process = subprocess.call(shlex.split(command))
+ process = process = subprocess.run(command, shell=True)
return
-# def filechecksum(aaxfile):
-# #The the hex checksum from the file
-# ret = subprocess.Popen(["ffprobe", "-v", "info", "-hide_banner", os.path.abspath(aaxfile)], stderr=subprocess.PIPE)
-# grep = subprocess.Popen(["grep", "checksum"], stdin=ret.stderr, stdout=subprocess.PIPE)
-# awk = subprocess.Popen(["awk", " { print $8 } "], stdin=grep.stdout, stdout=subprocess.PIPE)
-# hashsum,out = awk.communicate()
-# hashsum = hashsum.decode().strip('\n')
-# return hashsum
-
def getcorrectkey():
#request the key for the checksum
try:
r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', metadata['checksum'], verify=False, timeout=None)
- return r.text
+ return r.text.strip()
except requests.exceptions.HTTPError as err:
- raise error
+ raise err
return None
for rfile in glob.glob(args.filename):
@@ -165,8 +157,8 @@
if act_byte == None:
sys.exit("Can't continue with this file {rfile}")
else:
- ddir = "%s/%s/%s" % (path, artist, title)
- single_file_path = "/processing/%s.mp3" % (title)
+ ddir = "%s/%s/%s" % (path, artist.replace(' ', '_'), title.replace(' ', '_'))
+ single_file_path = "/processing/%s.mp3" % (title.replace(' ','_'))
if not os.path.exists(ddir):
os.makedirs(ddir)
print(ddir)
--
Gitblit v1.10.0