Directory and file delete to trash

appshell/appshell_extensions.cpp

@@ -281,6 +281,22 @@ class ProcessMessageDelegate : public ClientHandler::ProcessMessageDelegate {
 
                 error = DeleteFileOrDirectory(filename);
 
+                // No additional response args for this function
+            }
+        } else if (message_name == "DeleteFileOrDirectoryToTrash") {
+            // Parameters:
+            //  0: int32 - callback id
+            //  1: string - filename
+            if (argList->GetSize() != 2 ||
+                argList->GetType(1) != VTYPE_STRING) {
+                error = ERR_INVALID_PARAMS;
+            }
+
+            if (error == NO_ERROR) {
+                ExtensionString filename = argList->GetString(1);
+
+                error = DeleteFileOrDirectoryToTrash(filename);
+
                 // No additional response args for this function
             }
         } else if (message_name == "ShowDeveloperTools") {

appshell/appshell_extensions.js

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  * 
- */ 
+ */
 
 // This is the JavaScript code for bridging to native functionality
 // See appshell_extentions_[platform] for implementation of native methods.
@@ -40,7 +40,7 @@ if (!appshell.fs) {
 if (!appshell.app) {
     appshell.app = {};
 }
-(function () {    
+(function () {
     // Error values. These MUST be in sync with the error values
     // at the top of appshell_extensions_platform.h.
 
@@ -295,7 +295,7 @@ if (!appshell.app) {
     };
 
     /**
-     * Delete a file.
+     * Delete a file permanently.
      *
      * @param {string} path The path of the file to delete
      * @param {function(err)} callback Asynchronous callback function. The callback gets one argument (err).
@@ -312,6 +312,25 @@ if (!appshell.app) {
     appshell.fs.unlink = function (path, callback) {
         DeleteFileOrDirectory(callback, path);
     };
+
+    /**
+     * Delete a file non-permanently (to trash).
+     *
+     * @param {string} path The path of the file to delete
+     * @param {function(err)} callback Asynchronous callback function. The callback gets one argument (err).
+     *        Possible error values:
+     *          NO_ERROR
+     *          ERR_UNKNOWN
+     *          ERR_INVALID_PARAMS
+     *          ERR_NOT_FOUND
+     *          ERR_NOT_FILE
+     *
+     * @return None. This is an asynchronous call that sends all return information to the callback.
+     */
+    native function DeleteFileOrDirectoryToTrash();
+    appshell.fs.moveToTrash = function (path, callback) {
+        DeleteFileOrDirectoryToTrash(callback, path);
+    };    
 
     /**
      * Return the number of milliseconds that have elapsed since the application

appshell/appshell_extensions_mac.mm

@@ -460,21 +460,34 @@ int32 DeleteFileOrDirectory(ExtensionString filename)
     NSString* path = [NSString stringWithUTF8String:filename.c_str()];
     BOOL isDirectory;
 
-    // Contrary to the name of this function, we don't actually delete directories
-    if ([[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDirectory]) {
+        // Contrary to the name of this function, we don't actually delete directories
+    if ([[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDirectory]) {                    
         if (isDirectory) {
-            return ERR_NOT_FILE;
-        }
+            return ERR_NOT_FILE;    
+        }            
     } else {
         return ERR_NOT_FOUND;
-    }    
-
+    }
+        
     if ([[NSFileManager defaultManager] removeItemAtPath:path error:&error])
+        return NO_ERROR;       
+
+    return ConvertNSErrorCode(error, false);
+}
+
+int32 DeleteFileOrDirectoryToTrash(ExtensionString filename)
+{
+    NSError* error = nil;
+
+    NSString* path = [NSString stringWithUTF8String:filename.c_str()];
+
+    if ([[NSFileManager defaultManager] moveItemAtPath:path toPath:[[@"~/.Trash/" stringByStandardizingPath] stringByAppendingPathComponent:[path lastPathComponent]] error:&error])        
         return NO_ERROR;
 
     return ConvertNSErrorCode(error, false);
 }
 
+
 void NSArrayToCefList(NSArray* array, CefRefPtr<CefListValue>& list)
 {
     for (NSUInteger i = 0; i < [array count]; i++) {

appshell/appshell_extensions_platform.h

@@ -82,6 +82,8 @@ int32 SetPosixPermissions(ExtensionString filename, int32 mode);
 
 int32 DeleteFileOrDirectory(ExtensionString filename);
 
+int32 DeleteFileOrDirectoryToTrash(ExtensionString filename);
+
 void OnBeforeShutdown();
 
 void CloseWindow(CefRefPtr<CefBrowser> browser);

appshell/appshell_extensions_win.cpp

@@ -690,6 +690,23 @@ int32 DeleteFileOrDirectory(ExtensionString filename)
     return NO_ERROR;
 }
 
+int32 DeleteFileOrDirectoryToTrash(ExtensionString filename)
+{
+    DWORD dwAttr = GetFileAttributes(filename.c_str());
+
+    if (dwAttr == INVALID_FILE_ATTRIBUTES)
+        return ERR_NOT_FOUND;
+
+    SHFILEOPSTRUCT operation;
+    operation.wFunc = FO_DELETE;
+    operation.pFrom = filename.c_str();
+    operation.fFlags = FOF_ALLOWUNDO;
+
+    if (SHFileOperation(&operation))
+        return ConvertWinErrorCode(GetLastError());
+
+    return NO_ERROR;
+}
 
 void OnBeforeShutdown()
 {