Merge branch 'develop'

Sharkboy-j · May 19, 2022 · cb3d791 · cb3d791
2 parents 2dff098 + 5b44919
commit cb3d791
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/src/ClearBinObjFolders.bat b/src/ClearBinObjFolders.bat
@@ -0,0 +1 @@
+start for /d /r . %%d in (bin,obj, ClientBin,Generated_Code) do @if exist "%%d" rd /s /q "%%d"
diff --git a/src/Kebler.Services/Log.cs b/src/Kebler.Services/Log.cs
@@ -133,7 +133,7 @@ private static string Format(string message, LogType type, int lineNumber = 0, s
 
         private static string FormatException(Exception ex)
         {
-            return $"{ex.Message}{Environment.NewLine}{ex.StackTrace}";
+            return $"{ex.Message}{Environment.NewLine}{ex.StackTrace}{Environment.NewLine}{ex.InnerException}";
         }
 
         private static string GetClassName(string path)
@@ -173,7 +173,7 @@ private static void CheckFileLength()
                 }
                 catch (Exception ex)
                 {
-                    File.AppendAllTextAsync(FilePath, $"Log file size more than 200mb, but error occured when deleting it.{Environment.NewLine}{ex.Message}");
+                    //File.AppendAllTextAsync(FilePath, $"Log file size more than 200mb, but error occured when deleting it.{Environment.NewLine}{ex.Message}");
                 }
             }
         }

diff --git a/src/Kebler/Kebler.csproj b/src/Kebler/Kebler.csproj
@@ -47,6 +47,7 @@
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <PlatformTarget>x64</PlatformTarget>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Kebler.ico" />

diff --git a/src/Kebler/ViewModels/KeblerViewModel/ConnectionThings.cs b/src/Kebler/ViewModels/KeblerViewModel/ConnectionThings.cs
@@ -215,11 +215,16 @@ private void StartCycle()
                                     _transmissionClient.GetSessionSettingsAsync(_cancelTokenSource.Token),
                                     LocalizationProvider.GetLocalizedValue(
                                         nameof(Resources.Strings.MW_StatusText_Settings)))).Value;
-                                ParseTransmissionServerSettings();
-                                ParseStats();
 
-                                if (allTorrents.Clone() is TransmissionTorrents data)
-                                    ProcessParsingTransmissionResponse(data);
+                                if (allTorrents != null)
+                                {
+                                    ParseTransmissionServerSettings();
+                                    ParseStats();
+
+                                    if (allTorrents?.Clone() is TransmissionTorrents data)
+                                        ProcessParsingTransmissionResponse(data);
+                                }
+
                             }
                             else
                             {

diff --git a/src/Kebler/ViewModels/KeblerViewModel/TitleHeaderMenuActions.cs b/src/Kebler/ViewModels/KeblerViewModel/TitleHeaderMenuActions.cs
@@ -100,7 +100,14 @@ public IEnumerable<MenuItem> ReInitServers(
         /// </summary>
         public void Settings()
         {
-            Process.Start(new ProcessStartInfo("cmd", $"/c start {ConstStrings.CONFIGPATH}") { CreateNoWindow = true });
+            Log.Ui();
+            Log.Info($"Try start => cmd {ConstStrings.CONFIGPATH}");
+            var p = new Process();
+            p.StartInfo = new ProcessStartInfo(@ConstStrings.CONFIGPATH)
+            {
+                UseShellExecute = true
+            };
+            p.Start();
         }
 
 
@@ -109,6 +116,8 @@ public void Settings()
         /// </summary>
         public void Preferences()
         {
+            Log.Ui();
+
             if (_settings != null)
                 manager.ShowDialogAsync(new ServerPreferencesViewModel(_settings));
             else
@@ -123,6 +132,8 @@ public void Preferences()
         /// </summary>
         private void ServerClicked(object sender, RoutedEventArgs e)
         {
+            Log.Ui();
+
             if (!(sender is MenuItem menuItem) || !(menuItem.Tag is Server server))
                 return;
 
@@ -136,6 +147,8 @@ private void ServerClicked(object sender, RoutedEventArgs e)
         /// </summary>
         private void LanguageChanged(object sender, RoutedEventArgs e)
         {
+            Log.Ui();
+
             if (!(sender is MenuItem menuItem) || !(menuItem.Tag is CultureInfo cultureInfo))
                 return;
 

diff --git a/src/Kebler/Views/TopBarView.xaml.cs b/src/Kebler/Views/TopBarView.xaml.cs
@@ -56,7 +56,13 @@ private void OpenLogs(object sender, RoutedEventArgs e)
 
             try
             {
-                Process.Start(new ProcessStartInfo("explorer.exe", $"{Log.LogFileInfo.DirectoryName}") { CreateNoWindow = true });
+                App.Log.Info($"Try start => cmd {Log.LogFileInfo.DirectoryName}");
+                var p = new Process();
+                p.StartInfo = new ProcessStartInfo(@Log.LogFileInfo.DirectoryName)
+                {
+                    UseShellExecute = true
+                };
+                p.Start();
             }
             catch (Exception ex)
             {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		start for /d /r . %%d in (bin,obj, ClientBin,Generated_Code) do @if exist "%%d" rd /s /q "%%d"