enable logging and open logs from options

FTPbox · Sep 13, 2013 · 44df05d · 44df05d
1 parent 0836154
commit 44df05d
Show file tree

Hide file tree

Showing 9 changed files with 652 additions and 664 deletions.
diff --git a/FTPboxLib/FTPboxLib/Console/Log.cs b/FTPboxLib/FTPboxLib/Console/Log.cs
@@ -40,7 +40,7 @@ public class Log
 
         private static string _fname;
         private static l _level;
-        private static bool _debug;
+        public static bool DebugEnabled;
 
         private const string FontFormat = "<font color=\"{0}\">{1}</font>";
         private const string OutputFormat = "[ {0} - {1} ] : {2} <br />";   // timestamp, caller, log message
@@ -49,9 +49,9 @@ public static void Init(string fname, l level, bool del, bool debug)
         {
             _fname = fname;
             _level = level;
-            _debug = debug;
+            DebugEnabled = debug;
 
-            if (del)
+            if (del && File.Exists(fname))
             {
                 try
                 {
@@ -65,8 +65,8 @@ public static void Init(string fname, l level, bool del, bool debug)
                     Log.Write(l.Warning, "Could not delete previous log file");
                 }
             }
-
-            Thread wrtThread = new Thread(new ThreadStart(LogWriter));
+            
+            Thread wrtThread = new Thread(LogWriter);
             wrtThread.Start();
         }
 
@@ -125,7 +125,7 @@ private static void outputLog(int iIndex)
             DateTime thisDate = DateTime.Now;
             CultureInfo culture = new CultureInfo("en-US");
 
-            if (_debug)
+            if (DebugEnabled)
                 finalWrite(formatOutLine(lItem));
 
             if ((_level & lItem.Level) != lItem.Level)
@@ -204,7 +204,7 @@ private static string getColorCode(l li)
             // if l.Client            
             return "green";
 
-        }
+        }        
 
         private class LogItem
         {

diff --git a/FTPboxLib/FTPboxLib/Profile.cs b/FTPboxLib/FTPboxLib/Profile.cs
@@ -66,6 +66,11 @@ public static string AppdataFolder
 	        }
 	    }
 
+	    public static string DebugLogPath
+	    {
+	        get { return Path.Combine(AppdataFolder, "Debug.html"); }
+	    }
+
         public static string WebInterfaceLink
         {
             get

diff --git a/FTPboxLib/FTPboxLib/Settings.cs b/FTPboxLib/FTPboxLib/Settings.cs
@@ -242,6 +242,8 @@ public class SettingsGeneral
             public int UploadLimit = 0;
 
             public int DefaultProfile = 0;
+
+            public bool EnableLogging = true;
         }
 
         public class SettingsProfile

diff --git a/Windows/FTPbox.suo b/Windows/FTPbox.suo
diff --git a/Windows/FTPbox/FTPboxLib.dll b/Windows/FTPbox/FTPboxLib.dll
diff --git a/Windows/FTPbox/Forms/fMain.Designer.cs b/Windows/FTPbox/Forms/fMain.Designer.cs
diff --git a/Windows/FTPbox/Forms/fMain.cs b/Windows/FTPbox/Forms/fMain.cs
@@ -60,6 +60,9 @@ private void fMain_Load(object sender, EventArgs e)
             Common.LoadLocalFolders();
             Load_Recent();
 
+            if (!Log.DebugEnabled && Settings.settingsGeneral.EnableLogging)
+                Log.DebugEnabled = true;
+
             Notifications.NotificationReady += (o, n) =>
                 {
                     link = Common.LinkToRecent();
@@ -237,6 +240,7 @@ public void UpdateDetails()
             tParent.Text = Profile.HttpPath;
 
             chkShowNots.Checked = Settings.settingsGeneral.Notifications;
+            chkEnableLogging.Checked = Settings.settingsGeneral.EnableLogging;
 
             if (Profile.TrayAction == TrayAction.OpenInBrowser)
                 rOpenInBrowser.Checked = true;
@@ -445,7 +449,8 @@ private void Set_Language(string lan)
             chkWebInt.Text = Common.Languages.Get(lan + "/web_interface/use_webint", "Use the Web Interface");
             labViewInBrowser.Text = Common.Languages.Get(lan + "/web_interface/view", "(View in browser)");
             chkShowNots.Text = Common.Languages.Get(lan + "/main_form/show_nots", "Show notifications");
-            chkStartUp.Text = Common.Languages.Get(lan + "/main_form/start_on_startup", "Start on system start-up");            
+            chkStartUp.Text = Common.Languages.Get(lan + "/main_form/start_on_startup", "Start on system start-up");
+            chkEnableLogging.Text = Common.Languages.Get(lan + "/main_form/view_log", "View Log");
             //account tab
             lProfile.Text = Common.Languages.Get(lan + "/main_form/profile", "Profile") + ":";
             gDetails.Text = Common.Languages.Get(lan + "/main_form/details", "Details");
@@ -536,20 +541,6 @@ private void Set_Language(string lan)
             Settings.SaveGeneral();
         }
 
-        private void cmbLang_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            string lan = cmbLang.Text.Substring(cmbLang.Text.IndexOf("(") + 1);
-            lan = lan.Substring(0, lan.Length - 1);
-            try
-            {
-                Set_Language(lan);
-            }
-            catch (Exception ex)
-            {
-                Common.LogError(ex);
-            }
-        }
-
         /// <summary>
         /// When the user changes to another language, translate every label etc to that language.
         /// </summary>
@@ -1310,6 +1301,23 @@ private void labViewInBrowser_LinkClicked(object sender, LinkLabelLinkClickedEve
             Process.Start(Profile.WebInterfaceLink);
         }
 
+        private void chkEnableLogging_CheckedChanged(object sender, EventArgs e)
+        {
+            Settings.settingsGeneral.EnableLogging = chkEnableLogging.Checked;
+            Settings.SaveGeneral();
+
+            Log.DebugEnabled = chkEnableLogging.Checked || Profile.IsDebugMode;
+        }
+
+        private void bBrowseLogs_Click(object sender, EventArgs e)
+        {
+            string logFile = Path.Combine(Profile.AppdataFolder, "Debug.html");
+
+            if (File.Exists(logFile))
+                Process.Start("explorer.exe", logFile);
+
+        }
+
         #endregion
 
         #region Account Tab - Event Handlers