From 18a2540c59604f6d076ebe73c40d71895423ceec Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Thu, 19 Oct 2017 04:00:01 +0000
Subject: [PATCH] Added everything together
---
.gitignore | 1
getaaxkey | 1
aaxConvert.py | 114 +++++++++++++++++++++++++++++---------------------------
3 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9616a17..da7ea1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
+*.aax
# C extensions
*.so
diff --git a/aaxConvert.py b/aaxConvert.py
index 8918a79..68df040 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -5,49 +5,49 @@
import subprocess
import shlex
import json
-
-# 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")
-parser.add_argument("filename", help="Filename to convert, or directory to look in")
-
-args = parser.parse_args()
+import getaaxkey.getaaxkey
act_byte = ""
metadata = ""
-mode = ""
+mode = "chapter"
stats = ""
+path = ""
+args = ""
-if args.dpath:
- path = args.dpath
-else:
- path = os.getcwd()
+# arguments
+# activation_key, file name, codec(default to mp3)
+def processargs():
+ parser = argparse.ArgumentParser()
+ 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")
-if args.code:
- act_byte = args.code
-elif os.path.isfile('./.authcode'):
- act_byte = open('./.authcode').readline()
+ args = parser.parse_args()
-if act_byte == "":
- print "Please provide an activation code from audible. Either at the command line or the .authcode file"
+ act_byte = ""
+ metadata = ""
+ mode = ""
+ stats = ""
-if args.single:
- mode = 'single'
-else:
- mode = 'chapter'
+ if args.dpath:
+ path = args.dpath
+ else:
+ path = os.getcwd()
-if args.verbose:
- stats = "-stats"
-else:
- stats = "-nostats"
+ 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
@@ -132,27 +132,31 @@
process = subprocess.call(shlex.split(command))
return
-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
+
+if __name__ == "__main__":
+ processargs()
+ for rfile in glob.glob(args.filename):
+ if rfile.find("aax") != -1 and os.path.isfile(rfile):
+ act_byte = getaaxkey(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
diff --git a/getaaxkey b/getaaxkey
new file mode 160000
index 0000000..cf1182c
--- /dev/null
+++ b/getaaxkey
@@ -0,0 +1 @@
+Subproject commit cf1182c801ed18e90347c5419dc87afade60fa08
--
Gitblit v1.10.0