More changes for python3 and updates to pubprocess

Chris Pomeroy

2021-04-19 5305fde0f45e4920ac3870a8936a929e995dcb29

 aaxConvert.py

@@ -44,19 +44,23 @@


def getmetadata(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)
# Returns the metadata from an aax file
    ret = subprocess.run(["ffprobe", "-v", "info", "-hide_banner", "-show_format", "-show_chapters", "-print_format", "json", os.path.abspath(aaxfile)], capture_output=True)
    mdata = json.loads(ret.stdout)
    aret = ret.stderr.decode().split('\n')[0]
    mdata["checksum"] = aret.split()[-1]
    return mdata


def getmetabitrate():
#Return the bitrate of the media
    bit_rate = metadata['format']['bit_rate']
    return bit_rate[:2]

def getmetacopyright():
# Return normalized copyright data
    copyright = unicodedata.normalize('NFKD', metadata['format']['tags']['copyright']).encode('ascii','ignore')
    return copyright

    return copyright.decode()

def getmetadatatags(key):
# get specific data
@@ -75,17 +79,17 @@
                                                                                           getmetacopyright(),outpath)
    if args.verbose:
        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())
        process = subprocess.run(command, shell=True, capture_output=True)
        # while True:
        #     output = process.stdout.readline()
        #     if output == '' and process.poll() is not None:
        #         break
        #     if output:
        #         print(output.strip())
        rc = process.poll()
        return rc
    else:
        process = subprocess.call(shlex.split(command))
        process = subprocess.run(command, shell=True)
    return 


@@ -104,23 +108,23 @@
def movetochapters(path, outpath, chapter, title, start,end):
# Creating individual chapters

    outfile = "{}/Ch - {} {}.mp3".format(outpath, chapter, title)
    outfile = "{}/Ch-{}_{}.mp3".format(outpath, chapter, title.replace(' ', '_'))
    command = "ffmpeg -loglevel error {} -i \"{}\" -ss {} -to {} -codec:a copy -metadata 'track={}' \"{}\"".format(stats, path,
                                                                                                               start, end,
                                                                                                               chapter, outfile)
    if args.verbose:
        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())
        process = subprocess.run(command, shell=True, capture_output=True)
        # while True:
        #     output = process.stdout.readline()
        #     if output == '' and process.poll() is not None:
        #         break
        #     if output:
        #         print(output.strip())
        rc = process.poll()
        return rc
    else:
        process = subprocess.call(shlex.split(command))
        process = subprocess.run(command, shell=True)
    return


@@ -130,27 +134,26 @@
                                                                                                               path, outpath)
    if args.verbose:
        print(command)
    process = subprocess.call(shlex.split(command))
    process = process = subprocess.run(command, shell=True)
    return

def filechecksum(aaxfile):
#The the hex checksum from the file
    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 = str(hashsum).strip('\n')
    return hashsum
# def filechecksum(aaxfile):
# #The the hex checksum from the file
#     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.decode().strip('\n')
#     return hashsum

def getcorrectkey(aaxfile):
def getcorrectkey():
#request the key for the checksum
    hex = filechecksum(aaxfile)
    payload = hex
    try:
        r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', payload, verify=False, timeout=None)
        r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', metadata['checksum'], verify=False, timeout=None)
        return r.text
    except requests.exceptions.HTTPError as err:
        raise error
        return None

for rfile in glob.glob(args.filename):
    if rfile.find("aax") != -1 and os.path.isfile(rfile):
@@ -160,12 +163,12 @@
        if (findalbumbyname(album) == False):
            artist = getmetadatatags('artist')
            title = getmetadatatags('title')
            act_byte = getcorrectkey(rfile)
            act_byte = getcorrectkey()
            if act_byte == None:
                sys.exit("Can't continue with this file {rfile}")
            else:
                ddir = "%s/%s/%s" % (path, artist, title)
                single_file_path = "/processing/%s.mp3" % (title)
                ddir = "%s/%s/%s" % (path, artist.replace(' ', '_'), title.replace(' ', '_'))
                single_file_path = "/processing/%s.mp3" % (title.replace(' ','_'))
                if not os.path.exists(ddir):
                    os.makedirs(ddir)
                print(ddir)