Skip to content

Fix unauthorize exception lead to the whole directory unable to index. #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 19, 2020
Merged

Fix unauthorize exception lead to the whole directory unable to index. #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27313cd
Fix unauthorize exception lead to the whole directory unable to index.
taooceros Nov 17, 2020
5cf0f65
try to fix the index out of bound for programlogger
taooceros Nov 17, 2020
898bb06
bump version
taooceros Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Plugins/Flow.Launcher.Plugin.Program/Logger/ProgramLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,17 @@ internal static void LogException(string classname, string callingMethodName, st
internal static void LogException(string message, Exception e)
{
//Index 0 is always empty.
var parts = message.Split('|');
var parts = message.Split('|', StringSplitOptions.RemoveEmptyEntries);
if (parts.Length < 4)
{
var logger = LogManager.GetLogger("");
logger.Error(e, $"fail to log exception in program logger, parts length is too small: {parts.Length}, message: {message}");
}

var classname = parts[1];
var callingMethodName = parts[2];
var loadingProgramPath = parts[3];
var interpretationMessage = parts[4];
var classname = parts[0];
var callingMethodName = parts[1];
var loadingProgramPath = parts[2];
var interpretationMessage = parts[3];

LogException(classname, callingMethodName, loadingProgramPath, interpretationMessage, e);
}
Expand Down
10 changes: 7 additions & 3 deletions Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public List<Result> ContextMenus(IPublicAPI api)
? $"/select,\"{FullPath}\""
: Settings.ExplorerArgs;

Main.StartProcess(Process.Start,
Main.StartProcess(Process.Start,
new ProcessStartInfo(
!string.IsNullOrWhiteSpace(Main._settings.CustomizedExplorer)
? Main._settings.CustomizedExplorer
Expand Down Expand Up @@ -267,10 +267,14 @@ private static IEnumerable<string> ProgramPaths(string directory, string[] suffi
return new string[] { };
try
{
var paths = Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories)
var paths = Directory.EnumerateFiles(directory, "*", new EnumerationOptions
{
IgnoreInaccessible = true,
RecurseSubdirectories = true
})
.Where(x => suffixes.Contains(Extension(x)));
return paths;

return paths;
}
catch (DirectoryNotFoundException e)
{
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.Program/plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Name": "Program",
"Description": "Search programs in Flow.Launcher",
"Author": "qianlifeng",
"Version": "1.1.0",
"Version": "1.1.1",
"Language": "csharp",
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
"ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",
Expand Down