Add CriticalSection for file ops

Implement ITvPresetsProvider

PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs

@@ -23,6 +23,10 @@ namespace PepperDash.Essentials.Room.Config
         [JsonProperty("scheduledEvents")]
         public List<ScheduledEventConfig> ScheduledEvents;
 
+        [JsonProperty("isPrimary")] public bool IsPrimary;
+
+        [JsonProperty("isTvPresetsProvider")] public bool IsTvPresetsProvider;
+
         public EssentialsTechRoomConfig()
         {
             Displays = new List<string>();

PepperDashEssentials/Room/Types/EssentialsTechRoom.cs

@@ -7,13 +7,14 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsTechRoom : EssentialsRoomBase
+    public class EssentialsTechRoom : EssentialsRoomBase, ITvPresetsProvider
     {
         private readonly EssentialsTechRoomConfig _config;
         private readonly Dictionary<string, TwoWayDisplayBase> _displays;
@@ -41,7 +42,7 @@ namespace PepperDash.Essentials
             CreateOrUpdateScheduledEvents();
         }
 
-        public DevicePresetsModel TunerPresets
+        public DevicePresetsModel TvPresets
         {
             get { return _tunerPresets; }
         }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs

@@ -131,6 +131,16 @@ namespace PepperDash.Essentials.Core.Bridges
                 }
             }
 
+            RegisterEisc();
+        }
+
+        private void RegisterEisc()
+        {
+            if (Eisc.Registered)
+            {
+                return;
+            }
+
             var registerResult = Eisc.Register();
 
             if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
@@ -142,6 +152,27 @@ namespace PepperDash.Essentials.Core.Bridges
             Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
         }
 
+        public void LinkToRooms()
+        {
+            Debug.Console(1, this, "Linking Rooms...");
+
+            foreach (var room in PropertiesConfig.Rooms)
+            {
+                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
+
+                if (rm == null)
+                {
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Notice,
+                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
+                    continue;
+                }
+
+                rm.LinkToApi(Eisc, room.JoinStart, room.JoinMapKey, this);
+            }
+
+            RegisterEisc();
+        }
+
         /// <summary>
         /// Adds a join map
         /// </summary>
@@ -290,6 +321,9 @@ namespace PepperDash.Essentials.Core.Bridges
         [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
+        [JsonProperty("rooms")]
+        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
+
 
         public class ApiDevicePropertiesConfig
         {
@@ -303,6 +337,18 @@ namespace PepperDash.Essentials.Core.Bridges
             public string JoinMapKey { get; set; }
         }
 
+        public class ApiRoomPropertiesConfig
+        {
+            [JsonProperty("roomKey")]
+            public string RoomKey { get; set; }
+
+            [JsonProperty("joinStart")]
+            public uint JoinStart { get; set; }
+
+            [JsonProperty("joinMapKey")]
+            public string JoinMapKey { get; set; }
+        }
+
     }
 
     public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/ITvPresetsProvider.cs

@@ -0,0 +1,9 @@
+using PepperDash.Essentials.Core.Presets;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface ITvPresetsProvider
+    {
+        DevicePresetsModel TvPresets { get; }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -199,6 +199,7 @@
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/DevicePresets.cs

@@ -15,6 +15,7 @@ namespace PepperDash.Essentials.Core.Presets
     /// </summary>
     public class DevicePresetsModel : Device
     {
+        private CCriticalSection _fileOps = new CCriticalSection();
         private readonly bool _initSuccess;
 
         /// <summary>
@@ -101,27 +102,35 @@ namespace PepperDash.Essentials.Core.Presets
 
         public void LoadChannels()
         {
-            PresetsAreLoaded = false;
             try
             {
-                var pl = JsonConvert.DeserializeObject<PresetsList>(File.ReadToEnd(_filePath, Encoding.ASCII));
-                Name = pl.Name;
-                PresetsList = pl.Channels;
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this,
-                    "LoadChannels: Error reading presets file. These presets will be empty:\r  '{0}'\r  Error:{1}",
-                    _filePath, e.Message);
-                // Just save a default empty list
-                PresetsList = new List<PresetChannel>();
-            }
-            PresetsAreLoaded = true;
+                _fileOps.Enter();
+                PresetsAreLoaded = false;
+                try
+                {
+                    var pl = JsonConvert.DeserializeObject<PresetsList>(File.ReadToEnd(_filePath, Encoding.ASCII));
+                    Name = pl.Name;
+                    PresetsList = pl.Channels;
+                }
+                catch (Exception e)
+                {
+                    Debug.Console(2, this,
+                        "LoadChannels: Error reading presets file. These presets will be empty:\r  '{0}'\r  Error:{1}",
+                        _filePath, e.Message);
+                    // Just save a default empty list
+                    PresetsList = new List<PresetChannel>();
+                }
+                PresetsAreLoaded = true;
 
-            var handler = PresetsLoaded;
-            if (handler != null)
+                var handler = PresetsLoaded;
+                if (handler != null)
+                {
+                    handler(this, EventArgs.Empty);
+                }
+            }
+            finally
             {
-                handler(this, EventArgs.Empty);
+                _fileOps.Leave();
             }
         }
 
@@ -209,12 +218,21 @@ namespace PepperDash.Essentials.Core.Presets
 
         private void SavePresets()
         {
-            var json = JsonConvert.SerializeObject(PresetsList);
-
-            using (var file = File.Open(_filePath, FileMode.Truncate))
+            try
             {
-                file.Write(json, Encoding.UTF8);
+                _fileOps.Enter();
+                var json = JsonConvert.SerializeObject(PresetsList);
+
+                using (var file = File.Open(_filePath, FileMode.Truncate))
+                {
+                    file.Write(json, Encoding.UTF8);
+                }
             }
+            finally
+            {
+                _fileOps.Leave();
+            }
+            
         }
 
         private void Pulse(Action<bool> act)