ignore for channel and pilots

MyUncleSam · Jun 10, 2018 · 17a135f · 17a135f
1 parent 2ecadd3
commit 17a135f
Show file tree

Hide file tree

Showing 7 changed files with 191 additions and 22 deletions.
diff --git a/EveChatNotifier/FormMain.cs b/EveChatNotifier/FormMain.cs
@@ -234,6 +234,13 @@ private void ToAdd_RemovedLog(object sender, LogFile.EveChatEventArgs e)
         private void NewChatLines(object sender, LogFile.EveChatEventArgs e)
         {
             LogFile curLog = (LogFile)sender;
+
+			// check for channel ignore list
+			if(IsIgnoredChannel(curLog))
+			{
+				return;
+			}
+
             string logLines = e.NewLogLines;
 
             // check log lines - line for line
@@ -263,6 +270,12 @@ private void NewChatLines(object sender, LogFile.EveChatEventArgs e)
                     continue;
                 }
 
+				// check if the sender is on the ignore list
+				if(IsIgnoredPilot(le))
+				{
+					continue;
+				}
+
                 // check if sender is "EVE-System" to prevent MOTD notifications
                 if(Properties.Settings.Default.IgnoreMotd && le.Sender.Equals(Properties.Settings.Default.MotdUsername.Trim(), StringComparison.OrdinalIgnoreCase))
                 {
@@ -297,6 +310,38 @@ private void NewChatLines(object sender, LogFile.EveChatEventArgs e)
             }
         }
 
+		/// <summary>
+		/// check if the current logfile is on the ignore list for channels
+		/// </summary>
+		/// <param name="lf"></param>
+		/// <returns></returns>
+		public bool IsIgnoredChannel(LogFile lf)
+		{
+			if(string.IsNullOrWhiteSpace(Properties.Settings.Default.IgnoreChannels))
+			{
+				return false;
+			}
+
+			string[] ignoreChannels = Properties.Settings.Default.IgnoreChannels.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+			return ignoreChannels.Any(a => a.Trim().Equals(lf.LogInfo.ChannelName, StringComparison.OrdinalIgnoreCase));
+		}
+
+		/// <summary>
+		/// check if the sender is on the ignore list
+		/// </summary>
+		/// <param name="le"></param>
+		/// <returns></returns>
+		public bool IsIgnoredPilot(LogEntry le)
+		{
+			if(string.IsNullOrWhiteSpace(Properties.Settings.Default.IgnorePilots))
+			{
+				return false;
+			}
+
+			string[] ignorePilots = Properties.Settings.Default.IgnorePilots.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+			return ignorePilots.Any(a => a.Trim().Equals(le.Sender.Trim(), StringComparison.OrdinalIgnoreCase));
+		}
+
         private void notifyIcon_DoubleClick(object sender, EventArgs e)
         {
             if(_Settings == null)

diff --git a/EveChatNotifier/Properties/AssemblyInfo.cs b/EveChatNotifier/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyVersion("2.10.0.0")]
+[assembly: AssemblyFileVersion("2.10.0.0")]
diff --git a/EveChatNotifier/Properties/Settings.Designer.cs b/EveChatNotifier/Properties/Settings.Designer.cs
diff --git a/EveChatNotifier/Properties/Settings.settings b/EveChatNotifier/Properties/Settings.settings
@@ -98,5 +98,11 @@
     <Setting Name="MotdUsername" Type="System.String" Scope="User">
       <Value Profile="(Default)">EVE-System</Value>
     </Setting>
+    <Setting Name="IgnorePilots" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="IgnoreChannels" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/EveChatNotifier/Settings.Designer.cs b/EveChatNotifier/Settings.Designer.cs
diff --git a/EveChatNotifier/Settings.cs b/EveChatNotifier/Settings.cs
@@ -70,6 +70,10 @@ public Settings()
 			// set motd username
 			tbMotdUsername.Text = Properties.Settings.Default.MotdUsername;
 
+			// set ignore pilot and channel
+			tbIgnoreChannels.Text = Properties.Settings.Default.IgnoreChannels;
+			tbIgnorePilots.Text = Properties.Settings.Default.IgnorePilots;
+
             // set autostart object
             try
             {
@@ -236,6 +240,8 @@ private void SaveChanges()
             Properties.Settings.Default.IgnoreMotd = cbIgnoreMotd.Checked;
             Properties.Settings.Default.IgnoreOwnMessages = cbIgnoreOwn.Checked;
 			Properties.Settings.Default.MotdUsername = tbMotdUsername.Text;
+			Properties.Settings.Default.IgnoreChannels = tbIgnoreChannels.Text;
+			Properties.Settings.Default.IgnorePilots = tbIgnorePilots.Text;
 
             NotifyOptions no = (NotifyOptions)cbNotify.SelectedItem;
             switch (no)
@@ -268,5 +274,15 @@ private void SaveChanges()
                 }
             }
         }
+
+		private void lblIgnorePilots_MouseEnter(object sender, EventArgs e)
+		{
+			tbHelp.Text = string.Format("Here you can specify pilotnames (sender) which are ignored for notification. Please seperate them using ',' - not case sensitive.");
+		}
+
+		private void lblIgnoreChannels_MouseEnter(object sender, EventArgs e)
+		{
+			tbHelp.Text = string.Format("Here you can specify channelname which are ignored for notification. Please seperate them using ',' - not case sensitive.");
+		}
 	}
 }
diff --git a/EveChatNotifier/app.config b/EveChatNotifier/app.config
@@ -58,6 +58,12 @@
             <setting name="MotdUsername" serializeAs="String">
                 <value>EVE-System</value>
             </setting>
+            <setting name="IgnorePilots" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="IgnoreChannels" serializeAs="String">
+                <value />
+            </setting>
         </EveChatNotifier.Properties.Settings>
     </userSettings>
     <applicationSettings>