From 6ac0bf525108e3cc4d4f33d12c77d0dda24f7996 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Tue, 13 Apr 2021 21:41:48 +0000
Subject: [PATCH] Updated for python 3
---
aaxConvert.py | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 9afe859..5cfca06 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -6,7 +6,7 @@
import shlex
import json
from getaaxkey.getaaxkey import getcorrectkey
-import querysubsonic
+from querysubsonic import findalbumbyname
# arguments
# activation_key, file name, codec(default to mp3)
@@ -67,14 +67,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 +102,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,7 +122,7 @@
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
@@ -132,18 +132,19 @@
metadata = getmetadata(rfile)
album = getmetadatatags('album')
#See if we got it already
- if findalbumbyname(album):
- return 0
- else:
+ if (findalbumbyname(album) == False):
artist = getmetadatatags('artist')
title = getmetadatatags('title')
act_byte = getcorrectkey(rfile)
+ if act_byte == 1:
+ print("The checkkey function is unavaliable")
+
ddir = "%s/%s/%s" % (path, artist, title)
single_file_path = "%s/%s.mp3" % (ddir, title)
if not os.path.exists(ddir):
os.makedirs(ddir)
- print ddir
- reencode(rfile, single_file_path)
+ print(ddir)
+ reencode(rfile, single_file_path)``
if mode == 'chapter':
chapter = 0
numchapters = getchaptercount()
--
Gitblit v1.10.0