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 | 154 +++++++++++++++++++++++++++++++--------------------
1 files changed, 93 insertions(+), 61 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 8918a79..d6045f0 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -1,15 +1,20 @@
-#!/usr/bin/python
+#!/usr/bin/env -S python -u
import argparse
import os
import glob
import subprocess
import shlex
import json
+import requests
+import unicodedata
+from querysubsonic import findalbumbyname
+from time import sleep
+
# arguments
# activation_key, file name, codec(default to mp3)
+
parser = argparse.ArgumentParser()
-parser.add_argument("--code", help="Activation Code from audible to decrypt files")
parser.add_argument("-s","--single", help="Use this option to create a single file. This is false by default", action="store_true")
parser.add_argument("-d","--dpath", help="Use this to set the destination path. Otherwise I will use the current directory")
parser.add_argument("-v", "--verbose", help="Send output to stdout", action="store_true")
@@ -27,14 +32,6 @@
else:
path = os.getcwd()
-if args.code:
- act_byte = args.code
-elif os.path.isfile('./.authcode'):
- act_byte = open('./.authcode').readline()
-
-if act_byte == "":
- print "Please provide an activation code from audible. Either at the command line or the .authcode file"
-
if args.single:
mode = 'single'
else:
@@ -47,112 +44,147 @@
def getmetadata(aaxfile):
- ret = subprocess.check_output(["ffprobe", "-v", "quiet", "-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.decode()
def getmetadatatags(key):
- # get specific data
+# get specific data
tag = metadata['format']['tags'][key]
return tag
def reencode(aaxfile, outpath):
- # decrypt and reencode to mp3
+# decrypt and reencode to mp3
command = ("ffmpeg -loglevel error {} -activation_bytes {} -i {} -vn -codec:a libmp3lame -ab {}k -map_metadata -1 "
"-metadata \"title={}\" -metadata 'artist={}' -metadata 'album_artist={}' -metadata \"album={}\" -metadata 'date={}' "
"-metadata track=1/1 -metadata 'genre={}' -metadata 'copyright={}' \"{}\" " ).format(stats, act_byte,aaxfile,getmetabitrate(),
getmetadatatags('title'), getmetadatatags('artist'),
getmetadatatags('album_artist'), getmetadatatags('album'),
getmetadatatags('date'), getmetadatatags('genre'),
- getmetadatatags('copyright'),outpath)
+ 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()
+ print(command)
+ 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
def getchaptercount():
- # Get the number of chapters
+# Get the number of chapters
ccount = metadata['chapters']
return len(ccount)
def getchaptermetadata(cid, key):
- # get the Chapter metadata
+# get the Chapter metadata
for i in metadata['chapters']:
if i['id'] == cid:
return i[key]
def movetochapters(path, outpath, chapter, title, start,end):
- # Creating individual chapters
+# 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()
+ print(command)
+ 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
def getcoverart(path,outpath):
- # Pull the coverart from the file
+# Pull the coverart from the file
command = "ffmpeg -loglevel error -activation_bytes {} -i \"{}\" -an -codec:v copy \"{}/cover.jpg\"".format(act_byte,
path, outpath)
if args.verbose:
- print command
- process = subprocess.call(shlex.split(command))
+ print(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.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):
metadata = getmetadata(rfile)
album = getmetadatatags('album')
- artist = getmetadatatags('artist')
- title = getmetadatatags('title')
- ddir = "%s/%s/%s" % (path, artist, title)
- single_file_path = "%s/%s.mp3" % (ddir, 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)
\ No newline at end of file
+ #See if we got it already
+ if (findalbumbyname(album) == False):
+ artist = getmetadatatags('artist')
+ title = getmetadatatags('title')
+ 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