mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-15 12:09:18 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Jeremy Wu 2019-11-08 05:40:45 +11:00
commit d818a15aea
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Wox.Plugin.Program/Logger/ProgramLogger.cs
View File

@ -41,7 +41,8 @@ namespace Wox.Plugin.Program.Logger
} }
/// <summary> /// <summary>
/// Please follow exception format: |class name|calling method name|loading program path|user friendly message that explains the error /// Please follow exception format, there are four parts to an error message that need to be specified:
/// |class name|calling method name|loading program path|user friendly message that explains the error
/// => Example: |Win32|LnkProgram|c:\..\chrome.exe|Permission denied on directory, but Wox should continue /// => Example: |Win32|LnkProgram|c:\..\chrome.exe|Permission denied on directory, but Wox should continue
/// </summary> /// </summary>
[MethodImpl(MethodImplOptions.Synchronized)] [MethodImpl(MethodImplOptions.Synchronized)]

8
Plugins/Wox.Plugin.Program/Programs/UWP.cs
View File

@ -159,15 +159,15 @@ namespace Wox.Plugin.Program.Programs
#if !DEBUG #if !DEBUG
catch (Exception e) catch (Exception e)
{ {
ProgramLogger.LogException("|UWP|All|An unexpected error occured and " ProgramLogger.LogException($"|UWP|All|{p.InstalledLocation}|An unexpected error occured and "
+ $"unable to convert Package to UWP for {p.Id.FullName}", e); + $"unable to convert Package to UWP for {p.Id.FullName}", e);
return new Application[] { }; return new Application[] { };
} }
#endif #endif
#if DEBUG //make developer aware and implement handling #if DEBUG //make developer aware and implement handling
catch(Exception) catch(Exception e)
{ {
throw; throw e;
} }
#endif #endif
return u.Apps; return u.Apps;
@ -207,7 +207,7 @@ namespace Wox.Plugin.Program.Programs
} }
catch (Exception e) catch (Exception e)
{ {
ProgramLogger.LogException("|UWP|CurrentUserPackages|An unexpected error occured and " ProgramLogger.LogException("|UWP|CurrentUserPackages|Not available|An unexpected error occured and "
+ $"unable to verify if package is valid", e); + $"unable to verify if package is valid", e);
return false; return false;
} }