refactored logging

added digest to ptz commands updated connection factory
ispysoftware · Nov 27, 2015 · 33c2879 · 33c2879
1 parent 494a1cf
commit 33c2879
Show file tree

Hide file tree

Showing 74 changed files with 685 additions and 629 deletions.
diff --git a/AddCamera.cs b/AddCamera.cs
@@ -16,6 +16,7 @@
 using iSpyApplication.Sources;
 using iSpyApplication.Sources.Audio;
 using iSpyApplication.Sources.Video;
+using iSpyApplication.Utilities;
 using iSpyPRO.DirectShow.Internals;
 
 
@@ -917,7 +918,7 @@ private void CameraNewFrame(object sender, NewFrameEventArgs e)
             }
             catch(Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
             }
         }
 
@@ -1805,7 +1806,7 @@ private void SendPtzCommand(string cmd, bool wait)
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
                 MessageBox.Show(ex.Message, LocRm.GetString("Error"));
             }
         }

diff --git a/AddFloorPlan.cs b/AddFloorPlan.cs
@@ -5,6 +5,7 @@
 using AForge.Imaging.Filters;
 using System.Linq;
 using iSpyApplication.Controls;
+using iSpyApplication.Utilities;
 
 namespace iSpyApplication
 {
@@ -39,7 +40,7 @@ private void AddFloorPlanLoad(object sender, EventArgs e)
                 }
                 catch (Exception ex)
                 {
-                    MainForm.LogExceptionToFile(ex);
+                    Logger.LogExceptionToFile(ex);
                 }
             }
 

diff --git a/CheckPassword.cs b/CheckPassword.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Windows.Forms;
+using iSpyApplication.Utilities;
 
 namespace iSpyApplication
 {
@@ -21,7 +22,7 @@ private void DoCheckPassword()
                     MainForm.NeedsResourceUpdate = true;
                 MainForm.Group = g.name;
                 DialogResult = DialogResult.OK;
-                MainForm.LogMessageToFile("Login: "+g.name);
+                Logger.LogMessageToFile("Login: "+g.name);
                 Close();
                 return;
             }

diff --git a/Cloud/Drive.cs b/Cloud/Drive.cs
@@ -11,6 +11,7 @@
 using Google.Apis.Services;
 using Google.Apis.Upload;
 using Google.Apis.Util.Store;
+using iSpyApplication.Utilities;
 using File = Google.Apis.Drive.v2.Data.File;
 
 namespace iSpyApplication.Cloud
@@ -115,7 +116,7 @@ public static bool Authorise()
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
                 return false;
             }
 
@@ -140,7 +141,7 @@ private static string GetOrCreateFolder(string path)
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
                 return "";
             }
             bool first = true;
@@ -253,7 +254,7 @@ private static void Upload(object state)
                 catch(Exception ex)
                 {
                     //file doesn't exist
-                    MainForm.LogExceptionToFile(ex);
+                    Logger.LogExceptionToFile(ex);
                     return;
                 }
                 var mt = MimeTypes.GetMimeType(fi.Extension);
@@ -275,13 +276,13 @@ private static void Upload(object state)
                         }
                         catch (Exception ex)
                         {
-                            MainForm.LogExceptionToFile(ex);
+                            Logger.LogExceptionToFile(ex);
                         }
                     }
                 }
                 catch (Exception ex)
                 {
-                    MainForm.LogExceptionToFile(ex);
+                    Logger.LogExceptionToFile(ex);
                 }
                 Upload(null);
             }
@@ -294,7 +295,7 @@ private static void Upload(object state)
         static void RequestResponseReceived(File obj)
         {
             string msg = "File uploaded to google drive: <a href=\"" + obj.DownloadUrl + "\">" +obj.Title + "</a>";
-            MainForm.LogMessageToFile(msg);
+            Logger.LogMessageToFile(msg);
         }
 
         private static void RequestProgressChanged(IUploadProgress obj)
@@ -303,17 +304,17 @@ private static void RequestProgressChanged(IUploadProgress obj)
             {
                 case UploadStatus.Failed:
                     if (obj.Exception!=null)
-                        MainForm.LogErrorToFile("Upload to Google Drive failed ("+obj.Exception.Message+")");
+                        Logger.LogErrorToFile("Upload to Google Drive failed ("+obj.Exception.Message+")");
                     else
                     {
-                        MainForm.LogErrorToFile("Upload to Google Drive failed");
+                        Logger.LogErrorToFile("Upload to Google Drive failed");
                     }
                     break;
             }
 
             if (obj.Exception != null)
             {
-                MainForm.LogExceptionToFile(obj.Exception);
+                Logger.LogExceptionToFile(obj.Exception);
             }
 
 

diff --git a/Cloud/Dropbox.cs b/Cloud/Dropbox.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading;
 using DropNet;
+using iSpyApplication.Utilities;
 
 namespace iSpyApplication.Cloud
 {
@@ -73,7 +74,7 @@ public static bool Authorise()
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
                 return false;
             }
             return true;
@@ -110,7 +111,7 @@ public static bool Authorised
                 }
                 catch (Exception ex)
                 {
-                    MainForm.LogExceptionToFile(ex);
+                    Logger.LogExceptionToFile(ex);
                 }
                 return false;
             }
@@ -120,7 +121,7 @@ public static string Upload(string filename, string path)
         {
             if (!Authorised)
             {
-                MainForm.LogMessageToFile("Authorise dropbox in settings");
+                Logger.LogMessageToFile("Authorise dropbox in settings");
                 return LocRm.GetString("CloudAddSettings");
             }
             if (UploadList.SingleOrDefault(p => p.SourceFilename == filename) != null)
@@ -193,11 +194,11 @@ private static void Upload(object state)
                     {
                         string p = "/" + entry.DestinationPath.Replace("\\", "/").Trim('/') + "/";
                         var r = Service.UploadFile(p, fi.Name, stream);
-                        MainForm.LogMessageToFile("Uploaded to dropbox: /iSpy" + r.Path);
+                        Logger.LogMessageToFile("Uploaded to dropbox: /iSpy" + r.Path);
                     }
                     catch (Exception ex)
                     {
-                        MainForm.LogExceptionToFile(ex);
+                        Logger.LogExceptionToFile(ex);
                     }
                 }
                 Upload(null);

diff --git a/Cloud/YouTubeUploader.cs b/Cloud/YouTubeUploader.cs
@@ -11,6 +11,7 @@
 using Google.Apis.Util.Store;
 using Google.Apis.YouTube.v3;
 using Google.Apis.YouTube.v3.Data;
+using iSpyApplication.Utilities;
 
 namespace iSpyApplication.Cloud
 {
@@ -131,7 +132,7 @@ public static bool Authorise()
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
                 return false;
 
             }
@@ -212,7 +213,7 @@ private static void Upload(object state)
                 }
                 catch (Exception ex)
                 {
-                    MainForm.LogExceptionToFile(ex);
+                    Logger.LogExceptionToFile(ex);
                 }
                 Upload(null);
             }
@@ -234,7 +235,7 @@ static void VideosInsertRequestProgressChanged(IUploadProgress progress)
                     break;
 
                 case UploadStatus.Failed:
-                    MainForm.LogMessageToFile($"Upload to YouTube failed ({progress.Exception})");
+                    Logger.LogMessageToFile($"Upload to YouTube failed ({progress.Exception})");
                     break;
             }
         }
@@ -244,7 +245,7 @@ static void VideosInsertRequestResponseReceived(Video video)
             string msg = "YouTube video uploaded: <a href=\"http://www.youtube.com/watch?v=" + video.Id + "\">" +
                                 video.Id + "</a>";
             msg += " ("+video.Status.PrivacyStatus+")";
-            MainForm.LogMessageToFile(msg);
+            Logger.LogMessageToFile(msg);
             _uploaded = true;
         }
 

diff --git a/Controls/Camera.cs b/Controls/Camera.cs
@@ -12,6 +12,7 @@
 using AForge.Imaging.Filters;
 using iSpyApplication.Sources;
 using iSpyApplication.Sources.Video;
+using iSpyApplication.Utilities;
 using iSpyApplication.Vision;
 using Point = System.Drawing.Point;
 
@@ -620,7 +621,7 @@ private void PiP(Bitmap bmp)
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
             }
         }
 

diff --git a/Controls/CameraWindow.cs b/Controls/CameraWindow.cs
@@ -25,6 +25,7 @@
 using iSpyApplication.Sources.Audio;
 using iSpyApplication.Sources.Video;
 using iSpyApplication.Sources.Video.Ximea;
+using iSpyApplication.Utilities;
 using iSpyApplication.Vision;
 using iSpyPRO.DirectShow;
 using iSpyPRO.DirectShow.Internals;
@@ -590,7 +591,7 @@ public CameraWindow(objectsCamera cam, MainForm mainForm)
 
         void CameraWindow_ErrorHandler(string message)
         {
-            MainForm.LogErrorToFile(Camobject.name+": "+message);
+            Logger.LogErrorToFile(Camobject.name+": "+message);
         }
 
         private Thread _tFiles;
@@ -2835,7 +2836,7 @@ public void OpenWebInterface()
                 }
                 catch (Exception ex)
                 {
-                    MainForm.LogExceptionToFile(ex,"open web browser");
+                    Logger.LogExceptionToFile(ex,"open web browser");
                 }
             }
         }
@@ -2966,7 +2967,7 @@ private void Record()
                                     }
                                     catch (Exception ex)
                                     {
-                                        MainForm.LogExceptionToFile(ex, "Generating external link to file");
+                                        Logger.LogExceptionToFile(ex, "Generating external link to file");
                                     }
                                     DoAlert("recordingstarted", linktofile);
                                 }
@@ -3199,7 +3200,7 @@ private void Record()
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
             }
         }
 
@@ -3393,7 +3394,7 @@ private void AlertThread(string mode, string msg, int oid)
             string l = mode + ": " + Camobject.name;
             if (msg != "")
                 l += " message: " + msg;
-            MainForm.LogMessageToFile(l);
+            Logger.LogMessageToFile(l);
 
             Bitmap bmp = null;
             if (mode == "alert")
@@ -3424,7 +3425,7 @@ private void AlertThread(string mode, string msg, int oid)
                     }
                     catch (Exception ex)
                     {
-                        MainForm.LogExceptionToFile(ex);
+                        Logger.LogExceptionToFile(ex);
                     }
                 }
 

diff --git a/Controls/FTPConfig.cs b/Controls/FTPConfig.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Windows.Forms;
 using iSpyApplication.Properties;
+using iSpyApplication.Utilities;
 
 namespace iSpyApplication.Controls
 {
@@ -97,7 +98,7 @@ private void btnTest_Click(object sender, EventArgs e)
                     }
                     catch (Exception ex)
                     {
-                        MainForm.LogExceptionToFile(ex);
+                        Logger.LogExceptionToFile(ex);
                         MessageBox.Show(ex.Message);
                     }
                     imageStream.Close();

diff --git a/Controls/FloorPlan.cs b/Controls/FloorPlan.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using AForge.Imaging.Filters;
+using iSpyApplication.Utilities;
 
 namespace iSpyApplication.Controls
 {
@@ -470,7 +471,7 @@ protected override void OnPaint(PaintEventArgs pe)
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
             }
 
             if (_mouseMove > Helper.Now.AddSeconds(-3) && MainForm.Conf.ShowOverlayControls)

diff --git a/Controls/GridView.cs b/Controls/GridView.cs
@@ -4,6 +4,7 @@
 using System.Drawing.Drawing2D;
 using System.Linq;
 using System.Windows.Forms;
+using iSpyApplication.Utilities;
 using Timer = System.Timers.Timer;
 
 namespace iSpyApplication.Controls
@@ -655,7 +656,7 @@ private void DoPaint(PaintEventArgs pe)
             }
             catch (Exception ex)
             {
-                MainForm.LogExceptionToFile(ex);
+                Logger.LogExceptionToFile(ex);
             }
         }
 

diff --git a/Controls/PreviewBox.cs b/Controls/PreviewBox.cs
@@ -227,7 +227,7 @@ public void PlayMedia(Enums.PlaybackMode mode)
                     }
                     catch (Exception ex)
                     {
-                        MainForm.LogExceptionToFile(ex);
+                        Logger.LogExceptionToFile(ex);
                         MessageBox.Show(LocRm.GetString("NoPlayerForThisFile"));
                     }
                     break;

diff --git a/Controls/SelectObjects.cs b/Controls/SelectObjects.cs
@@ -61,6 +61,7 @@ private void button1_Click(object sender, EventArgs e)
                         break;
                 }
             }
+            DialogResult = DialogResult.OK;
             Close();
         }