From 3e8fc348e56a144cf68d0080bd1e5354a05fc8fe Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@ercot.com>
Date: Mon, 23 Oct 2017 19:49:44 +0000
Subject: [PATCH] Ready for primetime
---
aaxConvert.py | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 8918a79..3206fdb 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -5,11 +5,12 @@
import subprocess
import shlex
import json
+from getaaxkey.getaaxkey import getcorrectkey
# 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 +28,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,7 +40,7 @@
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
@@ -132,8 +125,10 @@
process = subprocess.call(shlex.split(command))
return
+
for rfile in glob.glob(args.filename):
if rfile.find("aax") != -1 and os.path.isfile(rfile):
+ act_byte = getcorrectkey(rfile)
metadata = getmetadata(rfile)
album = getmetadatatags('album')
artist = getmetadatatags('artist')
--
Gitblit v1.10.0