From 893fc2cd539cb4ccef01833a1209696e448df8d9 Mon Sep 17 00:00:00 2001 From: Mario Aichinger Date: Mon, 12 Sep 2016 00:05:24 +0200 Subject: [PATCH] :penguin: Add support for different trash implementations Make the trash implemantation in MoveItemToTrash selectable via an environment variable --- atom/common/platform_util_linux.cc | 43 +++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/atom/common/platform_util_linux.cc b/atom/common/platform_util_linux.cc index 9811c8760d06..f8db830bf69d 100644 --- a/atom/common/platform_util_linux.cc +++ b/atom/common/platform_util_linux.cc @@ -11,15 +11,13 @@ #include "base/process/launch.h" #include "url/gurl.h" +#define ELECTRON_TRASH "ELECTRON_TRASH" +#define ELECTRON_DEFAULT_TRASH "gvfs-trash" + namespace { -bool XDGUtil(const std::string& util, - const std::string& arg, +bool XDGUtilV(const std::vector& argv, const bool wait_for_exit) { - std::vector argv; - argv.push_back(util); - argv.push_back(arg); - base::LaunchOptions options; options.allow_new_privs = true; // xdg-open can fall back on mailcap which eventually might plumb through @@ -44,6 +42,16 @@ bool XDGUtil(const std::string& util, return (exit_code == 0); } +bool XDGUtil(const std::string& util, + const std::string& arg, + const bool wait_for_exit) { + std::vector argv; + argv.push_back(util); + argv.push_back(arg); + + return XDGUtilV(argv, wait_for_exit); +} + bool XDGOpen(const std::string& path, const bool wait_for_exit) { return XDGUtil("xdg-open", path, wait_for_exit); } @@ -81,7 +89,28 @@ bool OpenExternal(const GURL& url, bool activate) { } bool MoveItemToTrash(const base::FilePath& full_path) { - return XDGUtil("gvfs-trash", full_path.value(), true); + std::string trash; + if (getenv(ELECTRON_TRASH) != NULL) { + trash = getenv(ELECTRON_TRASH); + } else { + trash = ELECTRON_DEFAULT_TRASH; + } + + std::vector argv; + + if (trash.compare("kioclient5") == 0 || trash.compare("kioclient") == 0) { + argv.push_back(trash); + argv.push_back("move"); + argv.push_back(full_path.value()); + argv.push_back("trash:/"); + } else if (trash.compare("trash-cli") == 0) { + argv.push_back("trash-put"); + argv.push_back(full_path.value()); + } else { + argv.push_back(ELECTRON_DEFAULT_TRASH); + argv.push_back(full_path.value()); + } + return XDGUtilV(argv, true); } void Beep() {