mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-15 04:34:56 +00:00
add logic to only start logo server if it's required
This commit is contained in:
@@ -538,6 +538,20 @@ namespace PepperDash.Essentials
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
void LoadLogoServer()
|
void LoadLogoServer()
|
||||||
{
|
{
|
||||||
|
if (ConfigReader.ConfigObject.Rooms == null)
|
||||||
|
{
|
||||||
|
Debug.Console(0, Debug.ErrorLogLevel.Notice, "No rooms configured. Bypassing Logo server startup.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
!ConfigReader.ConfigObject.Rooms.Any(
|
||||||
|
CheckRoomConfig))
|
||||||
|
{
|
||||||
|
Debug.Console(0, Debug.ErrorLogLevel.Notice, "No rooms configured to use system Logo server. Bypassing Logo server startup");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
LogoServer = new HttpLogoServer(8080, Global.DirectorySeparator + "html" + Global.DirectorySeparator + "logo");
|
LogoServer = new HttpLogoServer(8080, Global.DirectorySeparator + "html" + Global.DirectorySeparator + "logo");
|
||||||
@@ -547,5 +561,30 @@ namespace PepperDash.Essentials
|
|||||||
Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
|
Debug.Console(0, Debug.ErrorLogLevel.Notice, "NOTICE: Logo server cannot be started. Likely already running in another program");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool CheckRoomConfig(DeviceConfig c)
|
||||||
|
{
|
||||||
|
string logoDark = null;
|
||||||
|
string logoLight = null;
|
||||||
|
string logo = null;
|
||||||
|
|
||||||
|
if (c.Properties["logoDark"] != null)
|
||||||
|
{
|
||||||
|
logoDark = c.Properties["logoDark"].Value<string>("type");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c.Properties["logoLight"] != null)
|
||||||
|
{
|
||||||
|
logoLight = c.Properties["logoLight"].Value<string>("type");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c.Properties["logo"] != null)
|
||||||
|
{
|
||||||
|
logo = c.Properties["logo"].Value<string>("type");
|
||||||
|
}
|
||||||
|
|
||||||
|
return ((logoDark != null && logoDark == "system") ||
|
||||||
|
(logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user