Updated to python 3

Chris Pomeroy

2018-03-05 783191e036ccceca78b8e41ad27e7cd349f7958c

Updated to python 3

 aaxConvert.py

@@ -5,9 +5,10 @@
import subprocess
import shlex
import json
from getaaxkey.getaaxkey import getcorrectkey
import requests
from querysubsonic import findalbumbyname


# arguments
# activation_key, file name, codec(default to mp3)

@@ -67,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:
@@ -102,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:
@@ -122,10 +123,27 @@
    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):
@@ -140,7 +158,7 @@
            single_file_path = "%s/%s.mp3" % (ddir, title)
            if not os.path.exists(ddir):
                os.makedirs(ddir)
            print ddir
            print(ddir)
            reencode(rfile, single_file_path)
            if mode == 'chapter':
                chapter = 0
@@ -154,4 +172,4 @@
                    movetochapters(single_file_path, ddir, schap, title, cstart,cend)
                os.remove(single_file_path)
            getcoverart(rfile, ddir)
            updatelibrary('testuser','testpass')
            

 querysubsonic.py

@@ -62,10 +62,10 @@
    if len(sys.argv) >= 2:
        args = sys.argv[1]
    else:
        print "I need an album name to lookup"
        print("I need an album name to lookup")
        sys.exit(1)
    out = findalbumbyname(str(sys.argv[1]))
    if out == True:
        print "Found: ",sys.argv[1]
        print("Found: ",sys.argv[1])
    else:
        print sys.argv[1], "not found on subsonic server"
        print(sys.argv[1], "not found on subsonic server")