sarsoo/Mixonomer
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

updated variable names, added to auth process, added device_name to player

Browse Source
This commit is contained in:
aj 2019-10-01 19:20:22 +01:00
parent 0a72b4678f
commit 59d073f666
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spotify/api/player.py
View File

@ -33,12 +33,8 @@ def play(username=None):
net = database.get_authed_network(username)
player = Player(net)
device = None
if 'device_name' in request_json:
devices = net.get_available_devices()
device = next((i for i in devices if i.name == request_json['device_name']), None)
player.play(context=context, device_name=request_json.get('device_name', None))
player.play(context=context, device=device)
logger.info(f'played {uri}')
return jsonify({'message': 'played', 'status': 'success'}), 200
else:
@ -53,12 +49,8 @@ def play(username=None):
if playlist_to_play is not None:
player = Player(net)
device = None
if 'device_name' in request_json:
devices = net.get_available_devices()
device = next((i for i in devices if i.name == request_json['device_name']), None)
player.play(context=Context(playlist_to_play.uri), device_name=request_json.get('device_name', None))
player.play(context=Context(playlist_to_play.uri), device=device)
logger.info(f'played {request_json["playlist_name"]}')
return jsonify({'message': 'played', 'status': 'success'}), 200
else:
@ -74,12 +66,8 @@ def play(username=None):
net = database.get_authed_network(username)
player = Player(net)
device = None
if 'device_name' in request_json:
devices = net.get_available_devices()
device = next((i for i in devices if i.name == request_json['device_name']), None)
player.play(tracks=uris, device_name=request_json.get('device_name', None))
player.play(tracks=uris, device=device)
logger.info(f'played tracks')
return jsonify({'message': 'played', 'status': 'success'}), 200
else:

4
spotify/auth/auth.py
View File

@ -178,6 +178,8 @@ def token():
user_reference.update({
'access_token': resp['access_token'],
'refresh_token': resp['refresh_token'],
'last_refreshed': datetime.datetime.now(datetime.timezone.utc),
'token_expiry': resp['expires_in'],
'spotify_linked': True
})
@ -200,6 +202,8 @@ def deauth():
user_reference.update({
'access_token': None,
'refresh_token': None,
'last_refreshed': datetime.datetime.now(datetime.timezone.utc),
'token_expiry': None,
'spotify_linked': False
})

5
spotify/db/database.py
View File

@ -17,7 +17,8 @@ def refresh_token_database_callback(user):
user_ref = get_user_doc_ref(user.user_id)
user_ref.update({
'access_token': user.accesstoken,
'access_token': user.access_token,
'refresh_token': user.refresh_token,
'last_refreshed': user.last_refreshed,
'token_expiry': user.token_expiry
})
@ -44,7 +45,7 @@ def get_authed_network(username):
if user_dict['last_refreshed'] + timedelta(seconds=user_dict['token_expiry'] - 1) \
< datetime.now(timezone.utc):
user_obj.refresh_token()
user_obj.refresh_access_token()
user_obj.refresh_info()
return Network(user_obj)

5
spotify/db/user.py
View File

@ -1,3 +1,4 @@
from spotframework.util.console import Color
from spotframework.net.user import NetworkUser
@ -7,3 +8,7 @@ class DatabaseUser(NetworkUser):
super().__init__(client_id=client_id, client_secret=client_secret,
refresh_token=refresh_token, access_token=access_token)
self.user_id = user_id
def __repr__(self):
return Color.RED + Color.BOLD + 'DatabaseUser' + Color.END + \
f': {self.user_id}, {self.username}, {self.display_name}, {self.uri}'