From 58f00cd88a428558cab3220e97d017c800aefd72 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Mon, 05 Mar 2018 15:25:29 +0000
Subject: [PATCH] removed old file
---
aaxConvert.py | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 8918a79..ae9567d 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -5,11 +5,14 @@
import subprocess
import shlex
import json
+import requests
+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. 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 +30,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 +42,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
@@ -73,14 +68,14 @@
getmetadatatags('date'), getmetadatatags('genre'),
getmetadatatags('copyright'),outpath)
if args.verbose:
- print command
+ 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(output.strip())
rc = process.poll()
return rc
else:
@@ -108,14 +103,14 @@
start, end,
chapter, outfile)
if args.verbose:
- print command
+ 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(output.strip())
rc = process.poll()
return rc
else:
@@ -128,31 +123,53 @@
command = "ffmpeg -loglevel error -activation_bytes {} -i \"{}\" -an -codec:v copy \"{}/cover.jpg\"".format(act_byte,
path, outpath)
if args.verbose:
- print command
+ print(command)
process = subprocess.call(shlex.split(command))
return
+def filechecksum(aaxfile):
+ 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.strip('\n')
+ return hashsum
+
+def getcorrectkey(aaxfile):
+ hex = filechecksum(aaxfile)
+ payload = hex
+ r = requests.post('http://x86-docker01:8080/function/checkkey', payload, verify=False)
+ if r.status_code == 200:
+ key = r.text
+ else:
+ print('Checkkey function is down please wait')
+ return key
+
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(rfile)
+ 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
--
Gitblit v1.10.0