diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 24d4c9a73..591bbdea3 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -38,13 +38,15 @@ namespace Flow.Launcher.Plugin
/// Thrown when unable to find the file specified in the command
/// Thrown when error occurs during the execution of the command
void ShellRun(string cmd, string filename = "cmd.exe");
-
+
///
- /// If the passed in text is the path to a file or directory, the actual file/directory will
- /// be copied to clipboard. Otherwise the text itself will be copied to clipboard.
+ /// Copies the passed in text and shows a message indicating whether the operation was completed successfully.
+ /// When directCopy is set to true and passed in text is the path to a file or directory,
+ /// the actual file/directory will be copied to clipboard. Otherwise the text itself will still be copied to clipboard.
///
/// Text to save on clipboard
- public void CopyToClipboard(string text);
+ /// When true it will directly copy the file/folder from the path specified in text
+ public void CopyToClipboard(string text, bool directCopy = false);
///
/// Save everything, all of Flow Launcher and plugins' data and settings
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 6ee0e24c1..b4417eb59 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -63,8 +63,7 @@ namespace Flow.Launcher
if (QueryTextBox.SelectionLength == 0 && result != null)
{
string copyText = result.CopyText;
- _viewModel.ResultCopy(copyText);
-
+ App.API.CopyToClipboard(copyText, directCopy: true);
}
else if (!string.IsNullOrEmpty(QueryTextBox.Text))
{
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index b61e22d5e..ff1619b0a 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -24,6 +24,7 @@ using Flow.Launcher.Infrastructure.Logger;
using Flow.Launcher.Infrastructure.Storage;
using System.Collections.Concurrent;
using System.Diagnostics;
+using System.Collections.Specialized;
namespace Flow.Launcher
{
@@ -116,10 +117,35 @@ namespace Flow.Launcher
ShellCommand.Execute(startInfo);
}
- public void CopyToClipboard(string text)
+ public void CopyToClipboard(string stringToCopy, bool directCopy = false)
{
- _mainVM.ResultCopy(text);
+ if (string.IsNullOrEmpty(stringToCopy))
+ return;
+
+ var isFile = File.Exists(stringToCopy);
+ if (directCopy && (isFile || Directory.Exists(stringToCopy)))
+ {
+ var paths = new StringCollection
+ {
+ stringToCopy
+ };
+
+ Clipboard.SetFileDropList(paths);
+
+ ShowMsg(
+ $"{GetTranslation("copy")} {(isFile ? GetTranslation("fileTitle") : GetTranslation("folderTitle"))}",
+ GetTranslation("completedSuccessfully"));
+ }
+ else
+ {
+ Clipboard.SetDataObject(stringToCopy);
+
+ ShowMsg(
+ $"{GetTranslation("copy")} {GetTranslation("textTitle")}",
+ GetTranslation("completedSuccessfully"));
+ }
}
+
public void StartLoadingBar() => _mainVM.ProgressBarVisibility = Visibility.Visible;
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 354b625a4..84c13442d 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -1103,43 +1103,6 @@ namespace Flow.Launcher.ViewModel
Results.AddResults(resultsForUpdates, token);
}
- ///
- /// Copies the specified file or folder path to the clipboard, or the specified text if it is not a valid file or folder path.
- /// Shows a message indicating whether the operation was completed successfully.
- ///
- /// The file or folder path, or text to copy to the clipboard.
- /// Nothing.
- public void ResultCopy(string stringToCopy)
- {
- if (string.IsNullOrEmpty(stringToCopy))
- return;
-
- var isFile = File.Exists(stringToCopy);
- var isFolder = isFile ? false : Directory.Exists(stringToCopy); // No need to eval directory exists if determined that file exists
- if (isFile || isFolder)
- {
- var paths = new StringCollection
- {
- stringToCopy
- };
-
- Clipboard.SetFileDropList(paths);
-
- App.API.ShowMsg(
- $"{App.API.GetTranslation("copy")} {(isFile ? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle"))}",
- App.API.GetTranslation("completedSuccessfully"));
- }
- else
- {
- Clipboard.SetDataObject(stringToCopy);
-
- App.API.ShowMsg(
- $"{App.API.GetTranslation("copy")} {App.API.GetTranslation("textTitle")}",
- App.API.GetTranslation("completedSuccessfully"));
- }
- return;
- }
-
#endregion
}
}
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index 5e5cab2f5..4f6e84654 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -124,7 +124,7 @@ namespace Flow.Launcher.Plugin.Explorer
{
try
{
- Clipboard.SetDataObject(record.FullPath);
+ Context.API.CopyToClipboard(record.FullPath);
return true;
}
catch (Exception e)
@@ -147,10 +147,7 @@ namespace Flow.Launcher.Plugin.Explorer
{
try
{
- Clipboard.SetFileDropList(new System.Collections.Specialized.StringCollection
- {
- record.FullPath
- });
+ Context.API.CopyToClipboard(record.FullPath, directCopy: true);
return true;
}
catch (Exception e)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs
index 82a5d5441..e4056131d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs
@@ -79,7 +79,7 @@ namespace Flow.Launcher.Plugin.Explorer
? action
: _ =>
{
- Clipboard.SetDataObject(e.ToString());
+ Context.API.CopyToClipboard(e.ToString());
return new ValueTask(true);
}
}
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index f64f5d376..46290b345 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -406,7 +406,7 @@ namespace Flow.Launcher.Plugin.Shell
Title = context.API.GetTranslation("flowlauncher_plugin_cmd_copy"),
Action = c =>
{
- Clipboard.SetDataObject(selectedResult.Title);
+ context.API.CopyToClipboard(selectedResult.Title);
return true;
},
IcoPath = "Images/copy.png",