From 0a501eda6e2cfcb78fe1a9e00eca25809aa69231 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Wed, 21 Mar 2018 05:34:03 +0000
Subject: [PATCH] Set the timeout to never
---
aaxConvert.py | 103 +++++++++++++++++++++++++++++----------------------
1 files changed, 58 insertions(+), 45 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 68df040..672553b 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -5,45 +5,40 @@
import subprocess
import shlex
import json
-import getaaxkey.getaaxkey
+import requests
+from querysubsonic import findalbumbyname
-act_byte = ""
-metadata = ""
-mode = "chapter"
-stats = ""
-path = ""
-args = ""
# 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")
- args = parser.parse_args()
+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")
- act_byte = ""
- metadata = ""
- mode = ""
- stats = ""
+args = parser.parse_args()
- if args.dpath:
- path = args.dpath
- else:
- path = os.getcwd()
+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):
@@ -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,25 +123,42 @@
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
-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')
+def getcorrectkey(aaxfile):
+ hex = filechecksum(aaxfile)
+ payload = hex
+ r = requests.post('http://x86-docker01:8080/function/checkkey', payload, verify=False, timeout=None)
+ 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')
+ #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)
+ single_file_path = "/processing/%s.mp3" % (title)
if not os.path.exists(ddir):
os.makedirs(ddir)
- print ddir
+ print(ddir)
reencode(rfile, single_file_path)
if mode == 'chapter':
chapter = 0
@@ -159,4 +171,5 @@
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
+ getcoverart(rfile, ddir)
+
\ No newline at end of file
--
Gitblit v1.10.0