From 53411db5dc2cff2131b906074a068e7c9e7f62ea Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sat, 01 May 2021 03:51:36 +0000
Subject: [PATCH] Fixed syntax problem with the convert
---
aaxConvert.py | 132 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 64 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index acccb82..d6045f0 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env -S python -u
import argparse
import os
import glob
@@ -44,19 +44,23 @@
def getmetadata(aaxfile):
- ret = subprocess.check_output(["ffprobe", "-v", "info", "-hide_banner", "-show_format", "-show_chapters", "-print_format", "json", os.path.abspath(aaxfile)])
- mdata = json.loads(ret)
+# 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
@@ -75,17 +79,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
@@ -104,23 +108,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
@@ -130,31 +134,26 @@
path, outpath)
if args.verbose:
print(command)
- process = subprocess.call(shlex.split(command))
+ process = process = subprocess.run(command, shell=True)
return
-def filechecksum(aaxfile):
- 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.strip('\n')
- return hashsum
+# 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(aaxfile):
- hex = filechecksum(aaxfile)
- payload = hex
- recovery = 3
- while recovery != 0:
- r = requests.post('http://x86-docker01:8080/function/getaaxkey', payload, verify=False, timeout=None)
- if r.status_code == 200:
- key = r.text
- recovery = 0
- return key
- else:
- print('Checkkey function is down please wait')
- recovery = recovery - 1
- sleep(5)
+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.strip()
+ except requests.exceptions.HTTPError as err:
+ raise error
+ return None
for rfile in glob.glob(args.filename):
if rfile.find("aax") != -1 and os.path.isfile(rfile):
@@ -164,23 +163,28 @@
if (findalbumbyname(album) == False):
artist = getmetadatatags('artist')
title = getmetadatatags('title')
- act_byte = getcorrectkey(rfile)
- ddir = "%s/%s/%s" % (path, artist, title)
- single_file_path = "/processing/%s.mp3" % (title)
- if not os.path.exists(ddir):
- os.makedirs(ddir)
- print(ddir)
- reencode(rfile, single_file_path)
- if mode == 'chapter':
- chapter = 0
- numchapters = getchaptercount()
- while (numchapters > 0 ):
- cstart = getchaptermetadata(chapter, 'start_time')
- cend = getchaptermetadata(chapter, 'end_time')
- chapter += 1
- numchapters -= 1
- schap = str(chapter).zfill(2)
- movetochapters(single_file_path, ddir, schap, title, cstart,cend)
- os.remove(single_file_path)
- getcoverart(rfile, ddir)
+ act_byte = getcorrectkey()
+ if act_byte == None:
+ sys.exit("Can't continue with this file {rfile}")
+ else:
+ 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)
+ reencode(rfile, single_file_path)
+ if mode == 'chapter':
+ chapter = 0
+ numchapters = getchaptercount()
+ while (numchapters > 0 ):
+ cstart = getchaptermetadata(chapter, 'start_time')
+ cend = getchaptermetadata(chapter, 'end_time')
+ chapter += 1
+ numchapters -= 1
+ schap = str(chapter).zfill(2)
+ movetochapters(single_file_path, ddir, schap, title, cstart,cend)
+ os.remove(single_file_path)
+ getcoverart(rfile, ddir)
+ else:
+ print('We have that book already')
\ No newline at end of file
--
Gitblit v1.10.0