Limited initial list of entities, added possibility to right-click a menu item

PiotrMachowski · PiotrMachowski · commit 1153e9e8ea76 · 2020-07-01T01:00:28.000+02:00
diff --git a/Home Assistant Taskbar Menu/Entities/Automation.cs b/Home Assistant Taskbar Menu/Entities/Automation.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 
@@ -34,6 +35,15 @@ protected override MenuItem ToMenuItem(Dispatcher dispatcher, string name)
                 root.Icon = new PackIcon {Kind = PackIconKind.Tick};
             }
 
+            root.PreviewMouseDown += (sender, args) =>
+            {
+                if (args.ChangedButton == MouseButton.Right)
+                {
+                    HaClientContext.CallService(dispatcher, this, "toggle");
+                    args.Handled = true;
+                }
+            };
+
             new List<Tuple<string, string>>
             {
                 Tuple.Create("turn_on", "Turn On"),
diff --git a/Home Assistant Taskbar Menu/Entities/Cover.cs b/Home Assistant Taskbar Menu/Entities/Cover.cs
@@ -1,5 +1,6 @@
 ﻿using System.Collections.Generic;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 
@@ -54,6 +55,23 @@ protected override MenuItem ToMenuItem(Dispatcher dispatcher, string name)
             }
             else
             {
+                root.PreviewMouseDown += (sender, args) =>
+                {
+                    if (args.ChangedButton == MouseButton.Right)
+                    {
+                        if (IsSupported(SupportedFeatures.Open, SupportedFeatures.Close))
+                        {
+                            HaClientContext.CallService(dispatcher, this, "toggle");
+                        }
+                        else if (IsSupported(SupportedFeatures.OpenTilt, SupportedFeatures.CloseTilt))
+                        {
+                            HaClientContext.CallService(dispatcher, this, "toggle");
+                        }
+
+                        args.Handled = true;
+                    }
+                };
+
                 AddMenuItemIfSupported(dispatcher, root, SupportedFeatures.Open);
                 AddMenuItemIfSupported(dispatcher, root, SupportedFeatures.Close);
                 AddMenuItemIfSupported(dispatcher, root, SupportedFeatures.Stop);
diff --git a/Home Assistant Taskbar Menu/Entities/Entity.cs b/Home Assistant Taskbar Menu/Entities/Entity.cs
@@ -114,9 +114,10 @@ protected List<int> GetSupportedFeatures()
 
         protected abstract MenuItem ToMenuItem(Dispatcher dispatcher, string name);
 
-        protected bool IsSupported(int supportedFeature)
+        protected bool IsSupported(params int[] supportedFeatures)
         {
-            return GetSupportedFeatures().Contains(supportedFeature);
+            return supportedFeatures.ToList()
+                .TrueForAll(supportedFeature => GetSupportedFeatures().Contains(supportedFeature));
         }
 
         protected void AddMenuItemIfSupported(Dispatcher dispatcher, ItemsControl root, int supportedFeature)
diff --git a/Home Assistant Taskbar Menu/Entities/Fan.cs b/Home Assistant Taskbar Menu/Entities/Fan.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 
@@ -45,6 +46,15 @@ protected override MenuItem ToMenuItem(Dispatcher dispatcher, string name)
             }
             else
             {
+                root.PreviewMouseDown += (sender, args) =>
+                {
+                    if (args.ChangedButton == MouseButton.Right)
+                    {
+                        HaClientContext.CallService(dispatcher, this, "toggle");
+                        args.Handled = true;
+                    }
+                };
+
                 root.Items.Add(CreateMenuItem(dispatcher, "turn_on", "Turn On"));
                 root.Items.Add(CreateMenuItem(dispatcher, "turn_off", "Turn Off"));
                 if (features.Contains(SupportedFeatures.SetSpeed))
diff --git a/Home Assistant Taskbar Menu/Entities/Light.cs b/Home Assistant Taskbar Menu/Entities/Light.cs
@@ -1,5 +1,6 @@
 ﻿using System.Collections.Generic;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 
@@ -40,14 +41,23 @@ protected override MenuItem ToMenuItem(Dispatcher dispatcher, string name)
             };
             if (IsOn())
             {
-                root.Icon = new PackIcon { Kind = PackIconKind.Tick };
+                root.Icon = new PackIcon {Kind = PackIconKind.Tick};
             }
+
             if (GetSupportedFeatures().Count == 0)
             {
-                root.Click += (sender, args) => { HaClientContext.CallService(dispatcher, this, "toggle"); };
+                root.Click += (sender, args) => HaClientContext.CallService(dispatcher, this, "toggle");
             }
             else
             {
+                root.PreviewMouseDown += (sender, args) =>
+                {
+                    if (args.ChangedButton == MouseButton.Right)
+                    {
+                        HaClientContext.CallService(dispatcher, this, "toggle");
+                        args.Handled = true;
+                    }
+                };
                 root.Items.Add(CreateMenuItem(dispatcher, "turn_on", "Turn On"));
                 root.Items.Add(CreateMenuItem(dispatcher, "turn_off", "Turn Off"));
                 AddSliderIfSupported(dispatcher, root, SupportedFeatures.Brightness, 0, 255,
diff --git a/Home Assistant Taskbar Menu/Entities/MediaPlayer.cs b/Home Assistant Taskbar Menu/Entities/MediaPlayer.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 
@@ -43,6 +44,14 @@ protected override MenuItem ToMenuItem(Dispatcher dispatcher, string name)
             {
                 root.Icon = new PackIcon { Kind = PackIconKind.Tick };
             }
+            root.PreviewMouseDown += (sender, args) =>
+            {
+                if (args.ChangedButton == MouseButton.Right)
+                {
+                    HaClientContext.CallService(dispatcher, this, "toggle");
+                    args.Handled = true;
+                }
+            };
             AddMenuItemIfSupported(dispatcher, root, SupportedFeatures.TurnOn);
             AddMenuItemIfSupported(dispatcher, root, SupportedFeatures.TurnOff);
             AddMenuItemIfSupported(dispatcher, root, SupportedFeatures.Play);
diff --git a/Home Assistant Taskbar Menu/Entities/Vacuum.cs b/Home Assistant Taskbar Menu/Entities/Vacuum.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 
@@ -46,6 +47,15 @@ protected override MenuItem ToMenuItem(Dispatcher dispatcher, string name)
             }
             GetSupportedFeatures()
                 .ForEach(supportedFeature => AddMenuItemIfSupported(dispatcher, root, supportedFeature));
+            root.PreviewMouseDown += (sender, args) =>
+            {
+                if (args.ChangedButton == MouseButton.Right && IsSupported(SupportedFeatures.TurnOn, SupportedFeatures.TurnOff))
+                {
+                    HaClientContext.CallService(dispatcher, this, "toggle");
+                    args.Handled = true;
+                }
+            };
+
             if (IsSupported(SupportedFeatures.FanSpeed))
             {
                 var fanSpeedItem = new MenuItem {Header = "Fan Speed", StaysOpenOnClick = true};
@@ -63,8 +73,8 @@ protected override MenuItem ToMenuItem(Dispatcher dispatcher, string name)
 
         private static class SupportedFeatures
         {
-            private const int TurnOn = 1;
-            private const int TurnOff = 2;
+            public const int TurnOn = 1;
+            public const int TurnOff = 2;
             private const int Pause = 4;
             private const int Stop = 8;
             private const int ReturnHome = 16;
diff --git a/Home Assistant Taskbar Menu/Properties/AssemblyInfo.cs b/Home Assistant Taskbar Menu/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/Home Assistant Taskbar Menu/Utils/Storage.cs b/Home Assistant Taskbar Menu/Utils/Storage.cs
@@ -63,7 +63,10 @@ public static void Save(ViewConfiguration viewConfiguration)
         {
             using (var streamWriter = new StreamWriter(ViewConfigPath))
             {
-                streamWriter.Write(JsonConvert.SerializeObject(viewConfiguration));
+                streamWriter.Write(JsonConvert.SerializeObject(viewConfiguration, Formatting.Indented, new JsonSerializerSettings()
+                {
+                    NullValueHandling = NullValueHandling.Ignore
+                }));
             }
         }
 
diff --git a/Home Assistant Taskbar Menu/Utils/ViewConfiguration.cs b/Home Assistant Taskbar Menu/Utils/ViewConfiguration.cs
@@ -17,18 +17,20 @@ public class ViewConfiguration
 
         public string EntityId { get; set; }
 
-        public List<ViewConfiguration> Children { get; set; } = new List<ViewConfiguration>();
+        public List<ViewConfiguration> Children { get; set; }
 
-        public Dictionary<string, string> Properties = new Dictionary<string, string>();
+        public Dictionary<string, string> Properties;
 
         public bool ContainsEntity(Entity stateObject)
         {
-            return stateObject.EntityId == EntityId || Children.Any(c => c.ContainsEntity(stateObject));
+            return NodeType == Type.Entity && stateObject.EntityId == EntityId
+                   || (NodeType == Type.Folder || NodeType == Type.Root)
+                   && Children.Any(c => c.ContainsEntity(stateObject));
         }
 
         public string GetProperty(string key)
         {
-            return Properties.ContainsKey(key) ? Properties[key] : "";
+            return Properties != null && Properties.ContainsKey(key) ? Properties[key] : "";
         }
 
         public static ViewConfiguration Default()
@@ -68,7 +70,8 @@ public static ViewConfiguration Folder(string name)
             return new ViewConfiguration
             {
                 NodeType = Type.Folder,
-                Name = name
+                Name = name,
+                Children = new List<ViewConfiguration>()
             };
         }
 
diff --git a/Home Assistant Taskbar Menu/Views/MainWindow.xaml.cs b/Home Assistant Taskbar Menu/Views/MainWindow.xaml.cs
@@ -35,10 +35,10 @@ public MainWindow(Configuration configuration, ViewConfiguration viewConfigurati
         {
             var latestVersion = ResourceProvider.LatestVersion();
             _viewConfiguration = viewConfiguration;
-            _defaultMenuItems = CreateDefaultMenuItems(configuration.Url, latestVersion);
-            Menu = new ObservableCollection<UIElement>();
             _stateObjects = new List<Entity>();
+            Menu = new ObservableCollection<UIElement>();
             InitializeComponent();
+            _defaultMenuItems = CreateDefaultMenuItems(configuration.Url, latestVersion);
             TaskbarMenuRoot.ItemsSource = Menu;
             Task.Run(() => { InitConnection(configuration).Wait(); });
         }
@@ -81,6 +81,7 @@ private List<Control> CreateDefaultMenuItems(string configurationUrl,
             if (!ResourceProvider.IsUpToDate(latestVersion))
             {
                 list.Add(updateItem);
+                ShowNotification("Home Assistant Taskbar Menu", "Update is available");
             }
 
             list.Add(exitItem);
@@ -108,7 +109,10 @@ private async Task InitConnection(Configuration configuration)
         private List<Control> CreateStructure(List<Entity> stateObjects, ViewConfiguration viewConfiguration)
         {
             return viewConfiguration.Children.Count == 0
-                ? stateObjects.Select(e => (Control) e.ToMenuItemSafe(Dispatcher, null)).ToList()
+                ? stateObjects.Where(e => e.Domain() != Automation.DomainName && e.Domain() != Script.DomainName)
+                    .Select(e => (Control) e.ToMenuItemSafe(Dispatcher, null))
+                    .Take(100)
+                    .ToList()
                 : viewConfiguration.Children.Select(c => MapToControl(stateObjects, c)).ToList();
         }
 
@@ -186,11 +190,15 @@ private void HandleNotification(NotificationEvent notification)
             ConsoleWriter.WriteLine($"NOTIFICATION RECEIVED: {notification.Id}", ConsoleColor.Green);
             if (_viewConfiguration.GetProperty(ViewConfiguration.MirrorNotificationsKey) == true.ToString())
             {
-                var customIcon = GetIcon();
-                TaskbarIcon.ShowBalloonTip(notification.Title, notification.Message, customIcon, true);
+                ShowNotification(notification.Title, notification.Message);
             }
         }
 
+        private void ShowNotification(string title, string message)
+        {
+            TaskbarIcon.ShowBalloonTip(title, message, GetIcon(), true);
+        }
+
         private Icon GetIcon()
         {
             using (Stream iconStream = Application.GetResourceStream(new Uri("pack://application:,,,/Images/small.ico"))
diff --git a/Home Assistant Taskbar Menu/Views/ViewConfigurationDialog.xaml.cs b/Home Assistant Taskbar Menu/Views/ViewConfigurationDialog.xaml.cs
@@ -35,7 +35,8 @@ public ViewConfigurationDialog()
         private void Save(object sender, RoutedEventArgs e)
         {
             ViewConfiguration = _isEntity
-                ? ViewConfiguration.Entity(((Entity)EntityIdComboBox.SelectedItem).EntityId, NameTextBox.Text)
+                ? ViewConfiguration.Entity(((Entity) EntityIdComboBox.SelectedItem).EntityId,
+                    string.IsNullOrEmpty(NameTextBox.Text) ? null : NameTextBox.Text)
                 : ViewConfiguration.Folder(NameTextBox.Text);
             DialogResult = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,10 @@ protected List<int> GetSupportedFeatures()`
`114`	`114`
`115`	`115`	`protected abstract MenuItem ToMenuItem(Dispatcher dispatcher, string name);`
`116`	`116`
`117`		`- protected bool IsSupported(int supportedFeature)`
	`117`	`+ protected bool IsSupported(params int[] supportedFeatures)`
`118`	`118`	`{`
`119`		`- return GetSupportedFeatures().Contains(supportedFeature);`
	`119`	`+ return supportedFeatures.ToList()`
	`120`	`+ .TrueForAll(supportedFeature => GetSupportedFeatures().Contains(supportedFeature));`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`protected void AddMenuItemIfSupported(Dispatcher dispatcher, ItemsControl root, int supportedFeature)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,10 @@ public static void Save(ViewConfiguration viewConfiguration)`
`63`	`63`	`{`
`64`	`64`	`using (var streamWriter = new StreamWriter(ViewConfigPath))`
`65`	`65`	`{`
`66`		`- streamWriter.Write(JsonConvert.SerializeObject(viewConfiguration));`
	`66`	`+ streamWriter.Write(JsonConvert.SerializeObject(viewConfiguration, Formatting.Indented, new JsonSerializerSettings()`
	`67`	`+ {`
	`68`	`+ NullValueHandling = NullValueHandling.Ignore`
	`69`	`+ }));`
`67`	`70`	`}`
`68`	`71`	`}`
`69`	`72`
Original file line number	Diff line number	Diff line change
`@@ -17,18 +17,20 @@ public class ViewConfiguration`
`17`	`17`
`18`	`18`	`public string EntityId { get; set; }`
`19`	`19`
`20`		`- public List<ViewConfiguration> Children { get; set; } = new List<ViewConfiguration>();`
	`20`	`+ public List<ViewConfiguration> Children { get; set; }`
`21`	`21`
`22`		`- public Dictionary<string, string> Properties = new Dictionary<string, string>();`
	`22`	`+ public Dictionary<string, string> Properties;`
`23`	`23`
`24`	`24`	`public bool ContainsEntity(Entity stateObject)`
`25`	`25`	`{`
`26`		`- return stateObject.EntityId == EntityId \|\| Children.Any(c => c.ContainsEntity(stateObject));`
	`26`	`+ return NodeType == Type.Entity && stateObject.EntityId == EntityId`
	`27`	`+ \|\| (NodeType == Type.Folder \|\| NodeType == Type.Root)`
	`28`	`+ && Children.Any(c => c.ContainsEntity(stateObject));`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`public string GetProperty(string key)`
`30`	`32`	`{`
`31`		`- return Properties.ContainsKey(key) ? Properties[key] : "";`
	`33`	`+ return Properties != null && Properties.ContainsKey(key) ? Properties[key] : "";`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`public static ViewConfiguration Default()`
`@@ -68,7 +70,8 @@ public static ViewConfiguration Folder(string name)`
`68`	`70`	`return new ViewConfiguration`
`69`	`71`	`{`
`70`	`72`	`NodeType = Type.Folder,`
`71`		`- Name = name`
	`73`	`+ Name = name,`
	`74`	`+ Children = new List<ViewConfiguration>()`
`72`	`75`	`};`
`73`	`76`	`}`
`74`	`77`