From 8e94cf3cb2ecb14e843f41bafd3f2411f599da39 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Thu, 15 Apr 2021 15:35:00 +0000
Subject: [PATCH] Merged dockerRun back to master
---
/dev/null | 0
querysubsonic.py | 3 -
aaxConvert.py | 88 ++++++++++++++++++++++++++++---------------
3 files changed, 58 insertions(+), 33 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 297e12a..280a5cb 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -1,12 +1,15 @@
-#!/usr/bin/python
+#!/usr/bin/env python
import argparse
import os
import glob
import subprocess
import shlex
import json
-from getaaxkey.getaaxkey import getcorrectkey
+import requests
+import unicodedata
from querysubsonic import findalbumbyname
+from time import sleep
+
# arguments
# activation_key, file name, codec(default to mp3)
@@ -50,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)
@@ -83,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,
@@ -118,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:
@@ -126,6 +133,28 @@
process = subprocess.call(shlex.split(command))
return
+def filechecksum(aaxfile):
+ ret = subprocess.Popen(["ffprobe", "-v", "info", "-hide_banner", os.path.abspath(aaxfile)], stderr=subprocess.PIPE)
+ grep = subprocess.Popen(["grep", "checksum"], stdin=ret.stderr, stdout=subprocess.PIPE)
+ awk = subprocess.Popen(["awk", " { print $8 } "], stdin=grep.stdout, stdout=subprocess.PIPE)
+ hashsum,out = awk.communicate()
+ hashsum = hashsum.strip('\n')
+ return hashsum
+
+def getcorrectkey(aaxfile):
+ 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(5)
for rfile in glob.glob(args.filename):
if rfile.find("aax") != -1 and os.path.isfile(rfile):
@@ -136,25 +165,22 @@
artist = getmetadatatags('artist')
title = getmetadatatags('title')
act_byte = getcorrectkey(rfile)
- if act_byte == 1:
- print("The checkkey function is unavaliable")
- else :
- 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')
+ 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)
+
diff --git a/getaaxkey/__init__.py b/getaaxkey/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/getaaxkey/__init__.py
+++ /dev/null
diff --git "a/getaaxkey/audible_byte\0434-4_0_10000x789935_0.rtc" "b/getaaxkey/audible_byte\0434-4_0_10000x789935_0.rtc"
deleted file mode 100644
index 6359b7a..0000000
--- "a/getaaxkey/audible_byte\0434-4_0_10000x789935_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_1_10000x791425_0.rtc" "b/getaaxkey/audible_byte\0434-4_1_10000x791425_0.rtc"
deleted file mode 100644
index 57aa2b1..0000000
--- "a/getaaxkey/audible_byte\0434-4_1_10000x791425_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_2_10000x790991_0.rtc" "b/getaaxkey/audible_byte\0434-4_2_10000x790991_0.rtc"
deleted file mode 100644
index 0ab3c43..0000000
--- "a/getaaxkey/audible_byte\0434-4_2_10000x790991_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_3_10000x792120_0.rtc" "b/getaaxkey/audible_byte\0434-4_3_10000x792120_0.rtc"
deleted file mode 100644
index 8e0438c..0000000
--- "a/getaaxkey/audible_byte\0434-4_3_10000x792120_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_4_10000x790743_0.rtc" "b/getaaxkey/audible_byte\0434-4_4_10000x790743_0.rtc"
deleted file mode 100644
index 1e169c3..0000000
--- "a/getaaxkey/audible_byte\0434-4_4_10000x790743_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_5_10000x790568_0.rtc" "b/getaaxkey/audible_byte\0434-4_5_10000x790568_0.rtc"
deleted file mode 100644
index 77c2a19..0000000
--- "a/getaaxkey/audible_byte\0434-4_5_10000x790568_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_6_10000x791458_0.rtc" "b/getaaxkey/audible_byte\0434-4_6_10000x791458_0.rtc"
deleted file mode 100644
index 4f7b21c..0000000
--- "a/getaaxkey/audible_byte\0434-4_6_10000x791458_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_7_10000x791707_0.rtc" "b/getaaxkey/audible_byte\0434-4_7_10000x791707_0.rtc"
deleted file mode 100644
index f4b7b06..0000000
--- "a/getaaxkey/audible_byte\0434-4_7_10000x791707_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_8_10000x790202_0.rtc" "b/getaaxkey/audible_byte\0434-4_8_10000x790202_0.rtc"
deleted file mode 100644
index e279ee0..0000000
--- "a/getaaxkey/audible_byte\0434-4_8_10000x790202_0.rtc"
+++ /dev/null
Binary files differ
diff --git "a/getaaxkey/audible_byte\0434-4_9_10000x791022_0.rtc" "b/getaaxkey/audible_byte\0434-4_9_10000x791022_0.rtc"
deleted file mode 100644
index 18e558f..0000000
--- "a/getaaxkey/audible_byte\0434-4_9_10000x791022_0.rtc"
+++ /dev/null
Binary files differ
diff --git a/getaaxkey/getaaxkey.py b/getaaxkey/getaaxkey.py
deleted file mode 100644
index 503ff75..0000000
--- a/getaaxkey/getaaxkey.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-
-import os
-import subprocess
-import requests
-
-def filechecksum(aaxfile):
- ret = subprocess.Popen(["ffprobe", "-v", "info", "-hide_banner", os.path.abspath(aaxfile)], stderr=subprocess.PIPE)
- grep = subprocess.Popen(["grep", "checksum"], stdin=ret.stderr, stdout=subprocess.PIPE)
- awk = subprocess.Popen(["awk", " { print $8 } "], stdin=grep.stdout, stdout=subprocess.PIPE)
- hashsum,out = awk.communicate()
- hashsum = hashsum.strip('\n')
- return hashsum
-
-
-def writeauthcode(hashsum):
- try:
- file = open(".authcode", "a")
- file.write(hashsum + os.linesep)
- except (IOError, OSError) as e:
- print("Can't write to .authcode")
- return 1
- finally:
- file.close()
- return 0
-
-
-def readauthcode():
- try:
- if not os.path.isfile(".authcode"):
- open (".authcode", "w").close()
- with open(".authcode") as f:
- hashes = f.read().split()
- except (IOError, OSError) as e:
- print("Can't read in .authcode")
- return 1
- finally:
- f.close()
- return hashes
-
-
-def newauthcode(checksum):
- r = requests.post("http://prod-faas-gw.darkurthe.net:8080/function/checkkey", checksum )
- if r.status_code == 200:
- response = str(r.text)
- return response.strip()
- else:
- return 1
-
-def checkagainstexisting(abytes,aaxfile):
- ret = subprocess.Popen(["ffprobe", "-activation_bytes", abytes, "-hide_banner", os.path.abspath(aaxfile)], stderr=subprocess.PIPE)
- grep = subprocess.Popen(["grep", "mismatch", "-c"], stdin=ret.stderr, stdout=subprocess.PIPE)
- works,out = grep.communicate()
- return works.strip('\n')
-
-
-def getcorrectkey(aaxfile):
- authcodes = readauthcode()
- abyte = ''
- for x in authcodes:
- if checkagainstexisting(x, aaxfile) == '0':
- abyte = x
- return abyte
- if abyte == '':
- csum = filechecksum(aaxfile)
- abyte = newauthcode(csum)
- writeauthcode(abyte)
- return abyte
-
-
-if __name__ == "__main__":
- import sys
- if len(sys.argv) >= 2:
- args = sys.argv[1]
- else:
- print("I need an file name to lookup")
- sys.exit(1)
- checksum = filechecksum(args)
- out = newauthcode(checksum.strip())
- if out is not None:
- print(sys.argv[1], "Auth code is:", out)
- else:
- print(sys.argv[1], "no Authcode found")
diff --git a/getaaxkey/rcrack b/getaaxkey/rcrack
deleted file mode 100755
index fc94d4c..0000000
--- a/getaaxkey/rcrack
+++ /dev/null
Binary files differ
diff --git a/querysubsonic.py b/querysubsonic.py
index 0d9dda0..6cf631b 100755
--- a/querysubsonic.py
+++ b/querysubsonic.py
@@ -8,7 +8,6 @@
import random
import requests
-
def gensalt():
ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
chars = []
@@ -50,7 +49,7 @@
s = gensalt()
t = gentoken(passwd,s)
payload = {'u': user, 't': t, 's': s, 'c': 'audible', 'v': '1.15.0'}
- r = requests.get('https://subsonic.darkurthe.net/audiobooks/rest/audiobooks/rest/startScan.view', payload)
+ r = requests.get('https://subsonic.darkurthe.net/audiobooks/rest/startScan.view', payload, verify=False)
if r.status_code == 200:
return True
else:
--
Gitblit v1.10.0