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
---
/dev/null | 71 -----------------------------------
querysubsonic.py | 6 +-
aaxConvert.py | 10 ++--
3 files changed, 8 insertions(+), 79 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 696b25a..5cfca06 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -74,7 +74,7 @@
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
@@ -143,7 +143,7 @@
single_file_path = "%s/%s.mp3" % (ddir, title)
if not os.path.exists(ddir):
os.makedirs(ddir)
- print ddir
+ print(ddir)
reencode(rfile, single_file_path)``
if mode == 'chapter':
chapter = 0
diff --git a/querysubsonic b/querysubsonic
deleted file mode 100644
index 5b5e0fb..0000000
--- a/querysubsonic
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/python
-
-## Eaxmple url
-## https://subsonic.darkurthe.net/audiobooks/rest/getMusicFolders.view?u=testuser&t=0733b8e9889d7a9986d82764cee9db1c&s=O5kgRb6X5jFFbPSW&v=1.15.0&c=myapp&f=json
-## https://subsonic.darkurthe.net/audiobooks/rest/search3.view?u=testuser&t=0733b8e9889d7a9986d82764cee9db1c&s=O5kgRb6X5jFFbPSW&c=myapp&f=json&v=1.15.0&query=album="Gypsy Morph"
-
-from hashlib import md5
-import random
-import requests
-
-
-def gensalt():
- ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
- chars = []
- salt = ""
- for i in range(16):
- chars.append(random.choice(ALPHABET))
- salt = ''.join(str(x) for x in chars )
- return salt
-
-
-def gentoken(passwd,salt):
- m = md5()
- m.update(passwd + salt)
- return m.hexdigest()
-
-
-def getalbumlist(user,passwd):
- s = gensalt()
- t = gentoken(passwd,s)
- payload = {'u': user, 't': t, 's': s, 'c': 'audible', 'v': '1.15.0', 'f': 'json', 'type': 'alphabeticalByName', 'size': '500'}
- r = requests.get('http://zombietc01.darkurthe.net:8080/audiobooks/rest/getAlbumList.view', payload, verify=False)
- if r.status_code == 200:
- jr = r.json()
- return jr
-
-
-def findalbumbyname(album):
- album = album.strip()
- alj = getalbumlist('testuser', 'testpass')
- for item in alj["subsonic-response"]["albumList"]["album"]:
- sablum = str(item['album'])
- sablum = sablum.strip()
- if sablum.lower() == album.lower():
- return True
- return False
-
-
-def updatelibrary(user,passwd):
- s = gensalt()
- t = gentoken(passwd,s)
- payload = {'u': user, 't': t, 's': s, 'c': 'audible', 'v': '1.15.0'}
- r = requests.get('http://zombietc01.darkurthe.net:8080/audiobooks/rest/startScan.view', payload, verify=False)
- if r.status_code == 200:
- return True
- else:
- return False
-
-
-if __name__ == "__main__":
- import sys
- if len(sys.argv) >= 2:
- args = sys.argv[1]
- else:
- print "I need an album name to lookup"
- sys.exit(1)
- out = findalbumbyname(str(sys.argv[1]))
- if out == True:
- print "Found: ",sys.argv[1]
- else:
- print sys.argv[1], "not found on subsonic server"
diff --git a/querysubsonic.py b/querysubsonic.py
index 5b5e0fb..a3db939 100644
--- a/querysubsonic.py
+++ b/querysubsonic.py
@@ -62,10 +62,10 @@
if len(sys.argv) >= 2:
args = sys.argv[1]
else:
- print "I need an album name to lookup"
+ print("I need an album name to lookup")
sys.exit(1)
out = findalbumbyname(str(sys.argv[1]))
if out == True:
- print "Found: ",sys.argv[1]
+ print("Found: ",sys.argv[1])
else:
- print sys.argv[1], "not found on subsonic server"
+ print(sys.argv[1], "not found on subsonic server")
--
Gitblit v1.10.0