From 5305fde0f45e4920ac3870a8936a929e995dcb29 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Mon, 19 Apr 2021 04:08:11 +0000
Subject: [PATCH] More changes for python3 and updates to pubprocess
---
aaxConvert.py | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 66a215a..21164ca 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -60,7 +60,7 @@
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
@@ -79,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
@@ -114,17 +114,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,7 +134,7 @@
path, outpath)
if args.verbose:
print(command)
- process = subprocess.call(shlex.split(command))
+ process = process = subprocess.run(command, shell=True)
return
# def filechecksum(aaxfile):
@@ -158,7 +158,7 @@
for rfile in glob.glob(args.filename):
if rfile.find("aax") != -1 and os.path.isfile(rfile):
metadata = getmetadata(rfile)
- album = getmetadatatags(album)
+ album = getmetadatatags('album')
#See if we got it already
if (findalbumbyname(album) == False):
artist = getmetadatatags('artist')
--
Gitblit v1.10.0