Fix deleting of directories on Linux

[maiself]

Trailing slash of directories was mishandled, and incorrect derived paths
were formed. Stripping the slash fixes this.

[akien-mga]

Some of the style changes are not valid for our clang-format configuration: https://github.com/godotengine/godot/runs/5261982845?check_suite_focus=true

(It might work if you keep the operator before the line break, and use two tabs for continuation)

[akien-mga]

Do you have an example of how the bug can be reproduced exactly?

[maiself]

Thanks for the reply, I'll give your suggestion on formatting a try, and see if I can get format checks going locally.

Do you have an example of how the bug can be reproduced exactly?

I recently did some moving around and bind mounting of my ~/src and godot repository checkouts for faster file access on an SSD. The configuration caused this function to fail pretty far down: gio won't trash across mount points, kioclient5 and gvfs-trash not available, $mnt_point/.Trash-1000 didn't exist.

$XDG_DATA_HOME/Trash and $HOME/.local/share/Trash are good tho, which brings us down to:

// Rename our resource before moving it to the trash can.

and this expression (which is the most important thing replaced by this patch):

p_path.get_base_dir() + "/" + file_name

Step by step...

p_path = "/path/dir/" (Thing to delete, passed in as argument)
file_name = "dir" (Future name of thing in trash, from a few lines up file_name = p_path.get_file(); if (...)

substitute: "/path/dir/".get_base_dir() + "/" + "dir"
eval: "/path/dir" + "/" + "dir"
concat: "/path/dir/dir" (This is not a vaild path)

Because this expression produces an invalid path and is used for all subsequent operations, nothing else will succeed.

[maiself]

I wasn't able to figure out how to make clang-format happy with breaking up the long lines, it accepted one line with your suggestion, but continued rejecting the others.

[akien-mga]

Thanks!