secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Black to cleanup whitespace

Browse Source
This commit is contained in:
James Barnsley
2021-10-25 20:58:32 +13:00
parent 23f0bffe7d
commit 953cee49ca
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mopidy_iris/core.py
View File

@ -1157,9 +1157,10 @@ class IrisCore(pykka.ThreadingActor):
# Uses snapcast server and stream details as defined in configuration # Uses snapcast server and stream details as defined in configuration
## ##
async def update_snapcast_meta(self, *args, **kwargs): async def update_snapcast_meta(self, *args, **kwargs):
callback = kwargs.get("callback", False)
track = self.core.playback.get_current_track().get() track = self.core.playback.get_current_track().get()
meta = {} meta = {}
if track: if track:
# Convert the Track to JSON, but to make it a response-ready JSON we need to load it. # Convert the Track to JSON, but to make it a response-ready JSON we need to load it.
# Required because ModelJSONEncoder produces single-quote JSON, and we need standard # Required because ModelJSONEncoder produces single-quote JSON, and we need standard
@ -1168,10 +1169,7 @@ class IrisCore(pykka.ThreadingActor):
images = self.core.library.get_images([track["uri"]]).get() images = self.core.library.get_images([track["uri"]]).get()
if images: if images:
meta["images"] = json.loads( meta["images"] = json.loads(
json.dumps( json.dumps(images[track["uri"]], cls=ModelJSONEncoder)
images[track["uri"]],
cls=ModelJSONEncoder
)
) )
meta["name"] = track["name"] meta["name"] = track["name"]
meta["uri"] = track["uri"] meta["uri"] = track["uri"]
@ -1191,8 +1189,8 @@ class IrisCore(pykka.ThreadingActor):
"method": "Stream.SetMeta", "method": "Stream.SetMeta",
"params": { "params": {
"id": self.config["iris"]["snapcast_stream"], "id": self.config["iris"]["snapcast_stream"],
"meta": meta "meta": meta,
} },
} }
try: try:
@ -1202,10 +1200,20 @@ class IrisCore(pykka.ThreadingActor):
) )
except (urllib.error.HTTPError, urllib.error.URLError) as e: except (urllib.error.HTTPError, urllib.error.URLError) as e:
error = json.loads(e.read()) error = json.loads(e.read())
logger.error('Could not update Snapcast meta', error) logger.error("Could not update Snapcast meta", error)
response = {
"message": "Could not update Snapcast meta",
error: error,
}
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
pass # Non-blocking error; TODO more elegantly catch exception without killing Mopidy response = {"message": "Could not update Snapcast meta"}
pass # Non-blocking error
if callback:
callback(response)
else:
return response
## ##
# Simple test method to debug access to system tasks # Simple test method to debug access to system tasks