From d9e91bbd9fab818dbd681431f807ca58755f7814 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sat, 16 May 2020 05:21:35 +0000
Subject: [PATCH] Updated the url for the checkkey faas
---
aaxConvert.py | 132 +++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 38 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 30a9a7b..696b25a 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -5,12 +5,14 @@
import subprocess
import shlex
import json
+from getaaxkey.getaaxkey import getcorrectkey
+from querysubsonic import findalbumbyname
# 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", action="store_true")
+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")
parser.add_argument("filename", help="Filename to convert, or directory to look in")
@@ -19,17 +21,27 @@
act_byte = ""
metadata = ""
+mode = ""
+stats = ""
+if args.dpath:
+ path = args.dpath
+else:
+ path = os.getcwd()
-def mungetrack(track):
- # Making sure the Track is correct
- c = track.strip('Chapter ')
- c = c.zfill(2)
- return c
+if args.single:
+ mode = 'single'
+else:
+ mode = 'chapter'
+
+if args.verbose:
+ stats = "-stats"
+else:
+ stats = "-nostats"
def getmetadata(aaxfile):
- ret = subprocess.check_output(["ffprobe", "-v", "quiet", "-hide_banner", "-show_format", "-show_chapters", "-print_format", "json", os.path.abspath(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)
return mdata
@@ -47,14 +59,49 @@
def reencode(aaxfile, outpath):
# decrypt and reencode to mp3
- command = ("ffmpeg -loglevel error -stats -activation_bytes {} -i {} -vn -codec:a libmp3lame -ab {}k -map_metadata -1 "
+ 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(act_byte,aaxfile,getmetabitrate(),
+ "-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)
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()
+ return rc
+ else:
+ process = subprocess.call(shlex.split(command))
+ return
+
+
+def getchaptercount():
+ # Get the number of chapters
+ ccount = metadata['chapters']
+ return len(ccount)
+
+
+def getchaptermetadata(cid, key):
+ # 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
+
+ outfile = "{}/Ch - {} {}.mp3".format(outpath, chapter, title)
+ 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:
@@ -66,39 +113,48 @@
rc = process.poll()
return rc
else:
- process = subprocess.call(shlex.split(command), stderr=subprocess.PIPE)
- return
+ process = subprocess.call(shlex.split(command))
+ return
-def chapters():
- # Creating individual chapters
+def getcoverart(path,outpath):
+ # 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))
+ return
-
-if args.dpath:
- path = args.dpath
-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"
-else:
- print act_byte
-
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)
+ #See if we got it already
+ if (findalbumbyname(album) == False):
+ artist = getmetadatatags('artist')
+ title = getmetadatatags('title')
+ act_byte = getcorrectkey(rfile)
+ if act_byte == 1:
+ print("The checkkey function is unavaliable")
+
+ 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)
+ updatelibrary('testuser','testpass')
\ No newline at end of file
--
Gitblit v1.10.0