From 5acaaa07e269ea0d2c2b53f12a9dc9329e4088c2 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Mon, 09 Aug 2021 21:56:42 +0000
Subject: [PATCH] Fixing the double space in tags and removing commented section
---
aaxConvert.py | 52 +++++++++++++++++++++-------------------------------
1 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index fef6057..c5e4d74 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python -u
+#!/usr/bin/env -S python -u
import argparse
import os
import glob
@@ -51,7 +51,6 @@
mdata["checksum"] = aret.split()[-1]
return mdata
-
def getmetabitrate():
#Return the bitrate of the media
bit_rate = metadata['format']['bit_rate']
@@ -65,7 +64,7 @@
def getmetadatatags(key):
# get specific data
tag = metadata['format']['tags'][key]
- return tag
+ return " ".join(tag.split())
def reencode(aaxfile, outpath):
@@ -79,17 +78,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())
- rc = process.poll()
+ 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.stdout
return rc
else:
- process = subprocess.call(shlex.split(command))
+ process = subprocess.run(command, shell=True)
return
@@ -114,17 +113,17 @@
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
@@ -134,23 +133,14 @@
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 = hashsum.decode().strip('\n')
-# return hashsum
-
def getcorrectkey():
#request the key for the checksum
try:
r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', metadata['checksum'], verify=False, timeout=None)
- return r.text
+ return r.text.strip()
except requests.exceptions.HTTPError as err:
raise error
return None
--
Gitblit v1.10.0