From 8f758f11a98e684f2430913885a595f08b1f3b8c Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sun, 21 Nov 2021 05:35:18 +0000
Subject: [PATCH] removed unicode to use normalized_data function
---
querysubsonic.py | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/querysubsonic.py b/querysubsonic.py
old mode 100644
new mode 100755
index 5b5e0fb..0a609e1
--- a/querysubsonic.py
+++ b/querysubsonic.py
@@ -1,8 +1,8 @@
-#!/usr/bin/python
+#!/usr/local/bin/python -u
-## 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"
+# 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
@@ -15,21 +15,21 @@
salt = ""
for i in range(16):
chars.append(random.choice(ALPHABET))
- salt = ''.join(str(x) for x in chars )
+ salt = ''.join(str(x) for x in chars)
return salt
-def gentoken(passwd,salt):
+def gentoken(passwd, salt):
m = md5()
- m.update(passwd + salt)
+ m.update(passwd.encode('utf8') + salt.encode('utf-8'))
return m.hexdigest()
-def getalbumlist(user,passwd):
+def getalbumlist(user, passwd):
s = gensalt()
- t = gentoken(passwd,s)
+ 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)
+ r = requests.get('https://subsonic.darkurthe.net/audiobooks/rest/getAlbumList.view', payload)
if r.status_code == 200:
jr = r.json()
return jr
@@ -46,11 +46,11 @@
return False
-def updatelibrary(user,passwd):
+def updatelibrary(user, passwd):
s = gensalt()
- t = gentoken(passwd,s)
+ 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)
+ r = requests.get('https://subsonic.darkurthe.net/audiobooks/rest/startScan.view', payload, verify=False)
if r.status_code == 200:
return True
else:
@@ -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]
+ if out:
+ 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