From 1ec662eab5b6e00640de1ddd82ae0138f7e2029e Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Mon, 19 Apr 2021 01:32:58 +0000
Subject: [PATCH] Changed the return of the copyright metadata
---
aaxConvert.py | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index bed8f47..8109422 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -44,6 +44,7 @@
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]
@@ -52,13 +53,14 @@
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
@@ -106,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)
@@ -156,7 +158,7 @@
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')
@@ -165,8 +167,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