prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rename method to reflect behaviour

Browse source
This commit is contained in:
Jeremy Wu 2020-06-02 20:21:28 +10:00
parent 5c46464a41
commit 2225cbff92
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs
View file

@ -187,11 +187,11 @@ namespace Flow.Launcher.Plugin.SharedCommands
}
///<summary>
/// Gets the previous level directory from a path string.
/// Does not check that previous level directory exists and returns
/// passed in string if is complete path
/// Returns the previous level directory if path incomplete.
/// Does not check if previous level directory exists.
/// Returns passed in string if is complete path
///</summary>
public static string GetPreviousLevelDirectoryIfPathIncomplete(string path)
public static string ReturnPreviousDirectoryIfIncompleteString(string path)
{
if (!path.EndsWith("\\"))
{

2
Flow.Launcher.Test/Plugins/ExplorerTest.cs
View file

@ -229,7 +229,7 @@ namespace Flow.Launcher.Test.Plugins
public void WhenGivenAPath_ThenShouldReturnThePreviousDirectoryPathIfIncompleteOrOriginalString(
string path, string expectedString)
{
var returnedPath = FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(path);
var returnedPath = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(path);
//Then
Assert.IsTrue(returnedPath == expectedString,

2
Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
View file

@ -50,7 +50,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
{
var results = new List<Result>();
var path = FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(search);
var path = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(search);
var folderList = new List<Result>();
var fileList = new List<Result>();

2
Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
View file

@ -47,7 +47,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
internal static Result CreateOpenCurrentFolderResult(string path, bool windowsIndexed = false)
{
var retrievedDirectoryPath = FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(path);
var retrievedDirectoryPath = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(path);
var folderName = retrievedDirectoryPath.TrimEnd(Constants.DirectorySeperator).Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None).Last();

4
Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
View file

@ -51,7 +51,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
var results = new List<Result>();
if (!FilesFolders.LocationExists(FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(locationPath)))
if (!FilesFolders.LocationExists(FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath)))
return results;
var useIndexSearch = UseWindowsIndexForDirectorySearch(locationPath);
@ -113,7 +113,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
return false;
if (_settings.WindowsIndexExcludedDirectories
.Any(x => x.Path == FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(locationPath)))
.Any(x => x.Path == FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath)))
return false;
return _indexSearch.PathIsIndexed(locationPath);