From a6c6f34080bfa947e5b4f152f26761e4b225007d Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Apr 2016 12:43:53 -0700 Subject: [PATCH] Fixes a crash with preferences, as well as fixes a bug where a non-existing item can be added to the list even though it exists in the users preferences. Moved a script function retrieval into a try/catch block. Fixed a file list bug, needed to make a copy and clear; also if a crash happened the list would never be cleared, and a script could get stuck on one file. Scripts should have their own try/catch around each individual file if they want to continue processing files without interruption. --- code/libs/.gitkeep | 0 code/src/FileGroupTab.cs | 15 ++++++++++----- code/src/NewFileGroup.cs | 5 ++++- code/src/Preferences.cs | 10 ++++++++-- code/src/TimerPlus.cs | 4 ++-- 5 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 code/libs/.gitkeep diff --git a/code/libs/.gitkeep b/code/libs/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/code/src/FileGroupTab.cs b/code/src/FileGroupTab.cs index 3645681..c204476 100644 --- a/code/src/FileGroupTab.cs +++ b/code/src/FileGroupTab.cs @@ -562,18 +562,18 @@ namespace FileWatcher m_TickCounter.Enabled = false; - Form1.Instance.notifyIcon1.ShowBalloonTip(1000, "Script Running", "Running '" + ScriptPath + "'", ToolTipIcon.Info); + //Form1.Instance.notifyIcon1.ShowBalloonTip(500, "Script Running", "Running '" + ScriptPath + "'", ToolTipIcon.Info); //scriptWorker.RunWorkerAsync(m_UpdatedFiles); - // run script in separate thread - Func, bool> updated = pyScope.GetVariable, bool>>("process_updated_files"); - try { - var updateFiles = m_UpdatedFiles; + var updateFiles = m_UpdatedFiles.ToList(); m_UpdatedFiles.Clear(); + // run script in separate thread + Func, bool> updated = pyScope.GetVariable, bool>>("process_updated_files"); + updated(updateFiles); Logger.Log("Just finished running '" + ScriptPath + "'"); @@ -602,6 +602,11 @@ namespace FileWatcher { Logger.Log("Directory not found exception in '" + ScriptPath + "':" + ex.Message + Environment.NewLine + ex.StackTrace + Environment.NewLine + ex.TargetSite); } + else if (ex is System.IO.IOException) + { + Logger.Log("IOException in '" + ScriptPath + "':" + ex.Message + Environment.NewLine + ex.StackTrace + Environment.NewLine + ex.TargetSite); + Logger.Log("Your script had an IO exception, you should alter your script to catch individual file errors so you can try to process them all even when an exception happens. You may also want to alter your file IO in case you can get around this error."); + } else { Logger.Log("Error running '" + ScriptPath + "':" + ex.Message + Environment.NewLine + ex.StackTrace); diff --git a/code/src/NewFileGroup.cs b/code/src/NewFileGroup.cs index 4d3591b..53d6fbc 100644 --- a/code/src/NewFileGroup.cs +++ b/code/src/NewFileGroup.cs @@ -43,7 +43,10 @@ namespace FileWatcher private void createButton_Click(object sender, EventArgs e) { Directory.CreateDirectory(Path.GetDirectoryName(textBox3.Text)); - using (var fileStream = File.Open(textBox3.Text, FileMode.OpenOrCreate, FileAccess.ReadWrite)); + using (var fileStream = File.Open(textBox3.Text, FileMode.OpenOrCreate, FileAccess.ReadWrite)) + { + // don't do anything, just create the file. + }; } private void textBox3_KeyPress(object sender, KeyPressEventArgs e) diff --git a/code/src/Preferences.cs b/code/src/Preferences.cs index b57aa1f..84fc176 100644 --- a/code/src/Preferences.cs +++ b/code/src/Preferences.cs @@ -137,6 +137,8 @@ namespace FileWatcher } } + defaultPrograms.RemoveAll(str => !programs.ContainsKey(str) || !File.Exists(programs[str].Path)); + UnboundBindingList = new BindingList(defaultPrograms); foreach (string str in programs.Keys) { @@ -210,8 +212,12 @@ namespace FileWatcher { if (listBox1.SelectedValue != null) { - string path = programs[(string)listBox1.SelectedValue].Path; - textBox1.Text = path; + string selectedValue = (string)listBox1.SelectedValue; + if (programs.ContainsKey(selectedValue)) + { + string path = programs[(string)listBox1.SelectedValue].Path; + textBox1.Text = path; + } } } diff --git a/code/src/TimerPlus.cs b/code/src/TimerPlus.cs index fe56b2f..a2f4d2c 100644 --- a/code/src/TimerPlus.cs +++ b/code/src/TimerPlus.cs @@ -26,14 +26,14 @@ namespace FileWatcher { } - public void Start() + public new void Start() { m_Running = true; m_Start = DateTime.Now; base.Start(); } - public void Stop() + public new void Stop() { m_End = DateTime.Now; m_Running = false;