From 2e7a1364fc7aa8ed01656146dc4c59e102239f07 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Thu, 15 Apr 2021 16:20:19 +0000
Subject: [PATCH] Added the -u to all the python shebangs

---
 aaxConvert.py |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/aaxConvert.py b/aaxConvert.py
index c768ef1..296e300 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/local/bin/python -u
 import argparse
 import os
 import glob
@@ -6,6 +6,7 @@
 import shlex
 import json
 import requests
+import unicodedata
 from querysubsonic import findalbumbyname
 from time import sleep
 
@@ -52,22 +53,26 @@
     bit_rate = metadata['format']['bit_rate']
     return bit_rate[:2]
 
+def getmetacopyright():
+    copyright = unicodedata.normalize('NFKD', metadata['format']['tags']['copyright']).encode('ascii','ignore')
+    return copyright
+
 
 def getmetadatatags(key):
-    # get specific data
+# get specific data
     tag = metadata['format']['tags'][key]
     return tag
 
 
 def reencode(aaxfile, outpath):
-    # decrypt and reencode to mp3
+# decrypt and reencode to mp3
     command = ("ffmpeg -loglevel error {} -activation_bytes {} -i {} -vn -codec:a libmp3lame -ab {}k -map_metadata -1 "
                "-metadata \"title={}\" -metadata 'artist={}' -metadata 'album_artist={}' -metadata \"album={}\" -metadata 'date={}' "
                "-metadata track=1/1 -metadata 'genre={}' -metadata 'copyright={}' \"{}\" " ).format(stats, act_byte,aaxfile,getmetabitrate(),
                                                                                            getmetadatatags('title'), getmetadatatags('artist'),
                                                                                            getmetadatatags('album_artist'), getmetadatatags('album'),
                                                                                            getmetadatatags('date'), getmetadatatags('genre'),
-                                                                                           getmetadatatags('copyright'),outpath)
+                                                                                           getmetacopyright(),outpath)
     if args.verbose:
         print(command)
         process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
@@ -85,19 +90,19 @@
 
 
 def getchaptercount():
-    # Get the number of chapters
+# Get the number of chapters
     ccount = metadata['chapters']
     return len(ccount)
 
 
 def getchaptermetadata(cid, key):
-    # get the Chapter metadata
+# get the Chapter metadata
     for i in metadata['chapters']:
         if i['id'] == cid:
             return i[key]
 
 def movetochapters(path, outpath, chapter, title, start,end):
-    # Creating individual chapters
+# Creating individual chapters
 
     outfile = "{}/Ch - {} {}.mp3".format(outpath, chapter, title)
     command = "ffmpeg -loglevel error {} -i \"{}\" -ss {} -to {} -codec:a copy -metadata 'track={}' \"{}\"".format(stats, path,
@@ -120,7 +125,7 @@
 
 
 def getcoverart(path,outpath):
-    # Pull the coverart from the file
+# Pull the coverart from the file
     command = "ffmpeg -loglevel error -activation_bytes {} -i \"{}\" -an -codec:v copy \"{}/cover.jpg\"".format(act_byte,
                                                                                                                path, outpath)
     if args.verbose:
@@ -141,7 +146,7 @@
     payload = hex
     recovery = 3
     while recovery != 0:
-      r = requests.post('http://x86-docker01:8080/function/checkkey', payload, verify=False, timeout=None)
+      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
@@ -178,4 +183,6 @@
                     movetochapters(single_file_path, ddir, schap, title, cstart,cend)
                 os.remove(single_file_path)
             getcoverart(rfile, ddir)
-            
\ No newline at end of file
+        else:
+            print('We have that book already')
+            

--
Gitblit v1.10.0