From d9e91bbd9fab818dbd681431f807ca58755f7814 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sat, 16 May 2020 05:21:35 +0000
Subject: [PATCH] Updated the url for the checkkey faas
---
aaxConvert.py | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 3206fdb..696b25a 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -6,6 +6,7 @@
import shlex
import json
from getaaxkey.getaaxkey import getcorrectkey
+from querysubsonic import findalbumbyname
# arguments
# activation_key, file name, codec(default to mp3)
@@ -66,7 +67,7 @@
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()
@@ -128,26 +129,32 @@
for rfile in glob.glob(args.filename):
if rfile.find("aax") != -1 and os.path.isfile(rfile):
- act_byte = getcorrectkey(rfile)
metadata = getmetadata(rfile)
album = getmetadatatags('album')
- artist = getmetadatatags('artist')
- title = getmetadatatags('title')
- 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)
- if mode == 'chapter':
- chapter = 0
- numchapters = getchaptercount()
- while (numchapters > 0 ):
- cstart = getchaptermetadata(chapter, 'start_time')
- cend = getchaptermetadata(chapter, 'end_time')
- chapter += 1
- numchapters -= 1
- schap = str(chapter).zfill(2)
- movetochapters(single_file_path, ddir, schap, title, cstart,cend)
- os.remove(single_file_path)
- getcoverart(rfile, ddir)
\ No newline at end of file
+ #See if we got it already
+ 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)``
+ if mode == 'chapter':
+ chapter = 0
+ numchapters = getchaptercount()
+ while (numchapters > 0 ):
+ cstart = getchaptermetadata(chapter, 'start_time')
+ cend = getchaptermetadata(chapter, 'end_time')
+ chapter += 1
+ numchapters -= 1
+ schap = str(chapter).zfill(2)
+ movetochapters(single_file_path, ddir, schap, title, cstart,cend)
+ os.remove(single_file_path)
+ getcoverart(rfile, ddir)
+ updatelibrary('testuser','testpass')
\ No newline at end of file
--
Gitblit v1.10.0