From 51d7f1f442565b00acf916bab28979ec0b565907 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sun, 18 Apr 2021 16:20:24 +0000
Subject: [PATCH] Added error handling in the getcorrectkey
---
aaxConvert.py | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 4ec859e..a348117 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -146,17 +146,11 @@
#request the key for the checksum
hex = filechecksum(aaxfile)
payload = hex
- recovery = 3
- while recovery != 0:
- r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', payload, verify=False, timeout=None)
- if r.status_code == 200:
- key = r.text
- recovery = 0
- return key
- else:
- print('Checkkey function is down please wait')
- recovery = recovery - 1
- sleep(15)
+ try:
+ r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', payload, verify=False, timeout=None)
+ return r.text
+ except requests.exceptions.HTTPError as err:
+ raise error
for rfile in glob.glob(args.filename):
if rfile.find("aax") != -1 and os.path.isfile(rfile):
@@ -167,24 +161,27 @@
artist = getmetadatatags('artist')
title = getmetadatatags('title')
act_byte = getcorrectkey(rfile)
- ddir = "%s/%s/%s" % (path, artist, title)
- single_file_path = "/processing/%s.mp3" % (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)
+ 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)
+ 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)
else:
print('We have that book already')
-
+
\ No newline at end of file
--
Gitblit v1.10.0