github-mirrors/BeoGateway
1
0
Fork 0
mirror of https://github.com/LukeSpad/BeoGateway.git synced 2024-12-23 21:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add files via upload

Browse source
This commit is contained in:
LukeSpad 2023-11-13 19:59:51 +00:00 committed by GitHub
parent 76fd9417f0
commit 41430a76c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BeoGateway.indigoPlugin/Contents/Server Plugin/Devices.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<Devices> <Devices>
<Device type="custom" id="BOGateway"> <Device type="custom" id="BOGateway" allowUserCreation="False">
<Name>B&amp;O Gateway (MLGW, BLGW)</Name> <Name>B&amp;O Gateway (MLGW, BLGW)</Name>
<ConfigUI> <ConfigUI>
<Field type="textfield" id="address" defaultValue="1" hidden="True"> <Field type="textfield" id="address" defaultValue="1" hidden="True">
@ -60,7 +60,7 @@
</States> </States>
</Device> </Device>
<Device type="relay" id="AVrenderer"> <Device type="relay" id="AVrenderer" >
<Name>AV renderer (Beovision, Beosound)</Name> <Name>AV renderer (Beovision, Beosound)</Name>
<ConfigUI> <ConfigUI>
<Field type="textfield" id="address" defaultValue="0"> <Field type="textfield" id="address" defaultValue="0">

68
BeoGateway.indigoPlugin/Contents/Server Plugin/plugin.py
View file

@ -1,4 +1,7 @@
import indigo try:
import indigo
except ImportError:
pass
import asyncore import asyncore
import json import json
import time import time
@ -46,6 +49,7 @@ class Plugin(indigo.PluginBase):
if stateList is not None: if stateList is not None:
if dev.deviceTypeId in self.devicesTypeDict and dev.deviceTypeId == u"AVrenderer": if dev.deviceTypeId in self.devicesTypeDict and dev.deviceTypeId == u"AVrenderer":
# Add dynamic states onto stateList for devices of type AV renderer # Add dynamic states onto stateList for devices of type AV renderer
# This allows devices to have unique source lists, rather than sharing a common source list
try: try:
sources = dev.pluginProps['sources'] sources = dev.pluginProps['sources']
for source_name in sources: for source_name in sources:
@ -159,13 +163,13 @@ class Plugin(indigo.PluginBase):
# ##### Indigo UI Prefs # ##### Indigo UI Prefs
def set_login(self, ui): def set_login(self, ui):
# If LogIn data is updated in config, update the values in the plugin # If LogIn data is updated in config, update the values in the plugin
self.user = str(ui.get('userID')).encode('ascii') self.user = ui.get('userID')
self.pwd = str(ui.get('password')).encode('ascii') self.pwd = ui.get('password')
indigo.server.log("BeoGateway device login details updated!", level=logging.DEBUG) indigo.server.log("BeoGateway device login details updated!", level=logging.DEBUG)
def set_gateway(self, ui): def set_gateway(self, ui):
# If gateway network address data is updated in config, update the values in the plugin # If gateway network address data is updated in config, update the values in the plugin
self.host = str(ui.get('address')).encode('ascii') self.host = ui.get('address')
self.port = [int(ui.get('mlgw_port')), self.port = [int(ui.get('mlgw_port')),
int(ui.get('hip_port')), int(ui.get('hip_port')),
23] # Telnet port - 23 23] # Telnet port - 23
@ -421,17 +425,18 @@ class Plugin(indigo.PluginBase):
# ##### Indigo UI Device Controls # ##### Indigo UI Device Controls
def actionControlDevice(self, action, node): def actionControlDevice(self, action, node):
""" Callback Method to Control a Relay Device. """ """ Callback Method to Control a Relay Device. """
if action.deviceAction == indigo.kDeviceAction.TurnOn: if node.deviceTypeId == u"AVrenderer":
self._dev_on(node) if action.deviceAction == indigo.kDeviceAction.TurnOn:
elif action.deviceAction == indigo.kDeviceAction.TurnOff:
self._dev_off(node)
elif action.deviceAction == indigo.kDeviceAction.Toggle:
if node.states["onOffState"]:
self._dev_off(node)
else:
self._dev_on(node) self._dev_on(node)
elif action.deviceAction == indigo.kDeviceAction.RequestStatus: elif action.deviceAction == indigo.kDeviceAction.TurnOff:
self._status_request(node) self._dev_off(node)
elif action.deviceAction == indigo.kDeviceAction.Toggle:
if node.states["onOffState"]:
self._dev_off(node)
else:
self._dev_on(node)
elif action.deviceAction == indigo.kDeviceAction.RequestStatus:
self._status_request(node)
def _dev_on(self, node): def _dev_on(self, node):
indigo.server.log(node.name + " turned On") indigo.server.log(node.name + " turned On")
@ -586,7 +591,7 @@ class Plugin(indigo.PluginBase):
self._get_itunes_track_info(message) self._get_itunes_track_info(message)
# For messages of type AV RENDERER, scan keys to update device states # For messages of type AV RENDERER, scan keys to update device states
if message["Type"] == "AV RENDERER": if message["Type"] in ["AV RENDERER", "RESPONSE"]:
# Tidy up messages # Tidy up messages
self.av_sanitise(message) self.av_sanitise(message)
# Filter messages that don't constitute meaningful state updates # Filter messages that don't constitute meaningful state updates
@ -624,7 +629,7 @@ class Plugin(indigo.PluginBase):
# Report Thread Count # Report Thread Count
if self.debug: if self.debug:
thread_count = int(threading.active_count()) thread_count = int(threading.active_count())
if thread_count > 0: if thread_count > 1:
indigo.server.log("Current Thread Count = " + str(thread_count), level=logging.DEBUG) indigo.server.log("Current Thread Count = " + str(thread_count), level=logging.DEBUG)
# ######################################################################################## # ########################################################################################
@ -667,6 +672,17 @@ class Plugin(indigo.PluginBase):
except KeyError: except KeyError:
pass pass
try:
if message['State_Update']['source'] == str(self.itunes_source) and \
message['State_Update']['nowPlaying'] in [0, '0', '', 'Unknown']:
# If the source is iTunes and current track unknown then set to currently playing track
indigo.server.log('Telegram current track "unknown" - setting to iTunes currently playing',
level=logging.DEBUG)
message['State_Update']['nowPlaying'] = self.gateway.states['nowPlaying']
except KeyError:
pass
try: # Catch GOTO_SOURCE commands and set the goto_flag try: # Catch GOTO_SOURCE commands and set the goto_flag
if message['payload_type'] == 'GOTO_SOURCE': if message['payload_type'] == 'GOTO_SOURCE':
self.goto_flag = datetime.now() self.goto_flag = datetime.now()
@ -681,7 +697,7 @@ class Plugin(indigo.PluginBase):
# If device is changing source the state changes as follows [Old Source -> Standby -> New Source]. # If device is changing source the state changes as follows [Old Source -> Standby -> New Source].
# If the standby condition is processed, the New Source state will be filtered by the condition below # If the standby condition is processed, the New Source state will be filtered by the condition below
# #
# 2. Play states that received <1.5 seconds after standby state set: # 2. Play states that received <2 seconds after standby state set:
# Some messages come in on the ML and HIP protocols relating to previous state etc. # Some messages come in on the ML and HIP protocols relating to previous state etc.
# These can be ignored to avoid false states for the indigo devices # These can be ignored to avoid false states for the indigo devices
try: try:
@ -704,8 +720,8 @@ class Plugin(indigo.PluginBase):
level=logging.DEBUG) level=logging.DEBUG)
return False return False
# If message received <1.5 seconds after standby state, ignore # If message received <2 seconds after standby state, ignore
elif node.states['playState'] == "Standby" and time_delta1 < 1.5: # Condition 2 elif node.states['playState'] == "Standby" and time_delta1 < 2.0: # Condition 2
if self.debug: if self.debug:
indigo.server.log(message['Device'] + " in Standby: " + str(round(time_delta1, 2)) + indigo.server.log(message['Device'] + " in Standby: " + str(round(time_delta1, 2)) +
" seconds elapsed since last state update - ignoring message!", " seconds elapsed since last state update - ignoring message!",
@ -1117,7 +1133,7 @@ class Plugin(indigo.PluginBase):
if self.playlist_blue != 'None': if self.playlist_blue != 'None':
self.iTunes.play_playlist(self.playlist_blue) self.iTunes.play_playlist(self.playlist_blue)
#elif message['State_Update']['command'] in ["0xf2", "Red", "MOTS"]: # elif message['State_Update']['command'] in ["0xf2", "Red", "MOTS"]:
elif message['State_Update']['command'] == "Red": elif message['State_Update']['command'] == "Red":
# More of the same (start a playlist with just current track and let autoplay find similar tunes) # More of the same (start a playlist with just current track and let autoplay find similar tunes)
# script = ASBridge.__file__[:-12] + '/Scripts/red.scpt' # script = ASBridge.__file__[:-12] + '/Scripts/red.scpt'
@ -1131,7 +1147,8 @@ class Plugin(indigo.PluginBase):
track_info = self.iTunes.get_current_track_info() track_info = self.iTunes.get_current_track_info()
if track_info[0] not in [None, 'None']: if track_info[0] not in [None, 'None']:
# Construct track info string # Construct track info string
track_info_ = "'" + track_info[0] + "' by " + track_info[2] + " from the album '" + track_info[1] + "'" track_info_ = "'" + track_info[0].decode('utf8') + "' by " + track_info[2].decode('utf8') + \
" from the album '" + track_info[1].decode('utf8') + "'"
# Add now playing info to the message block # Add now playing info to the message block
if 'Type' in message and message['Type'] == "AV RENDERER" and 'source' in message['State_Update'] \ if 'Type' in message and message['Type'] == "AV RENDERER" and 'source' in message['State_Update'] \
@ -1147,16 +1164,15 @@ class Plugin(indigo.PluginBase):
indigo.server.log("\n\t----------------------------------------------------------------------------" indigo.server.log("\n\t----------------------------------------------------------------------------"
"\n\tiTUNES CURRENT TRACK INFO:" "\n\tiTUNES CURRENT TRACK INFO:"
"\n\t============================================================================" "\n\t============================================================================"
"\n\tNow playing: '" + track_info[0] + "'" "\n\tNow playing: '" + track_info[0].decode('utf8') + "'"
"\n\t by " + track_info[2] + "\n\t by " + track_info[2].decode('utf8') +
"\n\t from the album '" + track_info[1] + "'" "\n\t from the album '" + track_info[1].decode('utf8') + "'"
"\n\t----------------------------------------------------------------------------" "\n\t----------------------------------------------------------------------------"
"\n\tACTIVE AUDIO RENDERERS: " + str(self.gateway.states['AudioRenderers']) + "\n\n") "\n\tACTIVE AUDIO RENDERERS: " + str(self.gateway.states['AudioRenderers']) + "\n\n")
if self.notifymode: if self.notifymode:
# Post track information to Apple Notification Centre # Post track information to Apple Notification Centre
self.iTunes.notify(track_info_ + " from source " + src, self.iTunes.notify(track_info_ + " from source " + src, "Now Playing:")
"Now Playing:")
# Update nowPlaying on the gateway device # Update nowPlaying on the gateway device
if track_info_ != self.gateway.states['nowPlaying'] and \ if track_info_ != self.gateway.states['nowPlaying'] and \