OSDN > Pesquisar Software > System > Systems Administration > Windowsで発生するいろいろにいろいろできるようにするEventWatch略してewatch > SCM > SVN > Commit

Windowsで発生するいろいろにいろいろできるようにするEventWatch略してewatch

ewatch: Commit

ファイル監視のSJIS対応

--- trunk/EWatch/EWatch/Utils/FileAndEncoding.cs (nonexistent)

+++ trunk/EWatch/EWatch/Utils/FileAndEncoding.cs (revision 38)

		@@ -0,0 +1,40 @@
	1	+/*
	2	+ * Created by SharpDevelop.
	3	+ * User: banana
	4	+ * Date: 2017/08/08
	5	+ * Time: 13:59
	6	+ *
	7	+ * To change this template use Tools \| Options \| Coding \| Edit Standard Headers.
	8	+ */
	9	+using System;
	10	+using System.Text;
	11	+using System.Text.RegularExpressions;
	12	+
	13	+namespace EWatch.Utils
	14	+{
	15	+ /// <summary>
	16	+ /// ファイル名とエンコーディングを保持します。
	17	+ /// </summary>
	18	+ public class FileAndEncoding
	19	+ {
	20	+ public string File { get; set; }
	21	+ public Encoding Encoding { get; set; }
	22	+
	23	+ public FileAndEncoding()
	24	+ {
	25	+ Encoding = Encoding.UTF8;
	26	+ }
	27	+
	28	+ public static FileAndEncoding Parse(string line)
	29	+ {
	30	+ var result = new FileAndEncoding();
	31	+ result.File = line;
	32	+ var match = Regex.Match(line, "^(\\[([0-9]+)\\])?(.*)$");
	33	+ if(match.Success && !string.IsNullOrEmpty(match.Groups[2].Value)){
	34	+ result.Encoding = Encoding.GetEncoding(int.Parse(match.Groups[2].Value));
	35	+ result.File = match.Groups[3].Value;
	36	+ }
	37	+ return result;
	38	+ }
	39	+ }
	40	+}

--- trunk/EWatch/EWatch/Watchers/WatchThread.cs (revision 37)

+++ trunk/EWatch/EWatch/Watchers/WatchThread.cs (revision 38)

		@@ -9,8 +9,10 @@
9	9	using System;
10	10	using System.Collections.Generic;
11	11	using System.Text;
	12	+using System.Text.RegularExpressions;
12	13	using System.Threading;
13	14	using EWatch.Models.Configurations;
	15	+using EWatch.Utils;
14	16
15	17	namespace EWatch.Watchers
16	18	{

		@@ -79,7 +81,8 @@
79	81	}
80	82	Dictionary<string,List<ActionTable>> files = config.File;
81	83	foreach(string path in files.Keys){
82		- BaseWatcher watcher = new FileWatcher(path, Encoding.UTF8, files[path]);
	84	+ var fileAndEncoding = FileAndEncoding.Parse(path);
	85	+ BaseWatcher watcher = new FileWatcher(fileAndEncoding.File, fileAndEncoding.Encoding, files[path]);
83	86	watchers.Add(watcher);
84	87	}
85	88	Dictionary<string,List<ActionTable>> syslogs = config.Syslog;

--- trunk/EWatch/EWatchUI/FormRuleEdit.Designer.cs (revision 37)

+++ trunk/EWatch/EWatchUI/FormRuleEdit.Designer.cs (revision 38)

		@@ -64,6 +64,7 @@
64	64	this.textBoxSource = new System.Windows.Forms.TextBox();
65	65	this.textBoxEventID = new System.Windows.Forms.TextBox();
66	66	this.label11 = new System.Windows.Forms.Label();
	67	+ this.checkBoxShiftJIS = new System.Windows.Forms.CheckBox();
67	68	this.SuspendLayout();
68	69	//
69	70	// label1

		@@ -301,6 +302,15 @@
301	302	this.label11.TabIndex = 7;
302	303	this.label11.Text = "Event ID";
303	304	//
	305	+ // checkBoxShiftJIS
	306	+ //
	307	+ this.checkBoxShiftJIS.Location = new System.Drawing.Point(380, 33);
	308	+ this.checkBoxShiftJIS.Name = "checkBoxShiftJIS";
	309	+ this.checkBoxShiftJIS.Size = new System.Drawing.Size(76, 24);
	310	+ this.checkBoxShiftJIS.TabIndex = 25;
	311	+ this.checkBoxShiftJIS.Text = "ShiftJIS";
	312	+ this.checkBoxShiftJIS.UseVisualStyleBackColor = true;
	313	+ //
304	314	// FormRuleEdit
305	315	//
306	316	this.AcceptButton = this.buttonOK;

		@@ -308,6 +318,7 @@
308	318	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
309	319	this.CancelButton = this.buttonCancel;
310	320	this.ClientSize = new System.Drawing.Size(468, 343);
	321	+ this.Controls.Add(this.checkBoxShiftJIS);
311	322	this.Controls.Add(this.textBoxEventID);
312	323	this.Controls.Add(this.label11);
313	324	this.Controls.Add(this.textBoxSource);

		@@ -371,5 +382,6 @@
371	382	private System.Windows.Forms.Button buttonRef;
372	383	private System.Windows.Forms.ComboBox comboBoxTarget;
373	384	private System.Windows.Forms.Label label1;
	385	+ private System.Windows.Forms.CheckBox checkBoxShiftJIS;
374	386	}
375	387	}

--- trunk/EWatch/EWatchUI/FormRuleEdit.cs (revision 37)

+++ trunk/EWatch/EWatchUI/FormRuleEdit.cs (revision 38)

		@@ -9,7 +9,9 @@
9	9	using System;
10	10	using System.Collections.Generic;
11	11	using System.Drawing;
	12	+using System.Linq;
12	13	using System.Text;
	14	+using System.Text.RegularExpressions;
13	15	using System.Windows.Forms;
14	16	using EWatch.Actions;
15	17	using EWatch.Models.Configurations;

		@@ -42,6 +44,7 @@
42	44
43	45	void FormRuleEditLoad(object sender, EventArgs e)
44	46	{
	47	+ checkBoxShiftJIS.Visible = Type == WatchType.File;
45	48	switch (Type) {
46	49	case WatchType.EventLog:
47	50	SetDataForEventLog();

		@@ -116,7 +119,8 @@
116	119	private void SetDataForFile()
117	120	{
118	121	comboBoxTarget.Items.Clear();
119		- comboBoxTarget.Items.AddRange(TargetValues);
	122	+ comboBoxTarget.Items.AddRange(TargetValues.Select(
	123	+ x => FileAndEncoding.Parse(x).File).ToArray());
120	124	buttonRef.Visible = true;
121	125
122	126	comboBoxLogLevel.Enabled = false;

		@@ -124,7 +128,9 @@
124	128	textBoxEventID.Enabled = false;
125	129
126	130	if(Table != null){
127		- comboBoxTarget.Text = Target;
	131	+ var fe = FileAndEncoding.Parse(Target);
	132	+ comboBoxTarget.Text = fe.File;
	133	+ checkBoxShiftJIS.Checked = fe.Encoding.CodePage == 932;
128	134	textBoxHostname.Text = Table.HostName;
129	135	textBoxMatch.Text = Table.MatchPattern;
130	136	textBoxIgnore.Text = Table.IgnorePattern;

		@@ -156,9 +162,18 @@
156	162	Close();
157	163	}
158	164
	165	+ private string GetTarget()
	166	+ {
	167	+ var result = comboBoxTarget.Text;
	168	+ if(Type == WatchType.File && checkBoxShiftJIS.Checked){
	169	+ result = string.Format("[{0}]{1}", 932, result);
	170	+ }
	171	+ return result;
	172	+ }
	173	+
159	174	private void GetData()
160	175	{
161		- Target = comboBoxTarget.Text;
	176	+ Target = GetTarget();
162	177	if(comboBoxLogLevel.Enabled){
163	178	Table.LogLevel = comboBoxLogLevel.Text;
164	179	}

--- trunk/EWatch/EWatchUI/MainForm.cs (revision 37)

+++ trunk/EWatch/EWatchUI/MainForm.cs (revision 38)

		@@ -171,9 +171,13 @@
171	171	if(item != null){
172	172	FormRuleEdit form = new FormRuleEdit();
173	173	SetFormRuleEditData(form, item);
	174	+ var originalTarget = form.Target;
174	175	if(form.ShowDialog() == DialogResult.OK){
175		- List<ActionTable> tables = GetActionTableList(GetCurrentActionDictionary(), form.Target);
	176	+ var actionDic = GetCurrentActionDictionary();
	177	+ List<ActionTable> tables = GetActionTableList(actionDic, originalTarget);
176	178	tables[(int)item.Tag] = form.Table;
	179	+ actionDic.Remove(originalTarget);
	180	+ actionDic.Add(form.Target, tables);
177	181	SetListItems();
178	182	Dirty = true;
179	183	}