From 56d54cdf2e20d2f5aac882c874fae6a1aa959cae Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Mon, 19 Apr 2021 00:06:12 +0000
Subject: [PATCH] wtf syntax error.
---
aaxConvert.py | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index a348117..66a215a 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -44,20 +44,24 @@
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
-
def getmetadatatags(key):
# get specific data
tag = metadata['format']['tags'][key]
@@ -104,7 +108,7 @@
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)
@@ -133,39 +137,38 @@
process = subprocess.call(shlex.split(command))
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 = str(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):
+def getcorrectkey():
#request the key for the checksum
- hex = filechecksum(aaxfile)
- payload = hex
try:
- r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', payload, verify=False, timeout=None)
+ r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', metadata['checksum'], verify=False, timeout=None)
return r.text
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):
metadata = getmetadata(rfile)
- album = getmetadatatags('album')
+ album = getmetadatatags(album)
#See if we got it already
if (findalbumbyname(album) == False):
artist = getmetadatatags('artist')
title = getmetadatatags('title')
- act_byte = getcorrectkey(rfile)
+ act_byte = getcorrectkey()
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