Minor fixes

A few minor bugfixes and tweaks to cover more of the program

README.md

@@ -34,7 +34,7 @@ portable.
 
 You can build it with Dub using `dub build` and run tests with `dub test`.
 
-Alternatively you can build with GDC using `gdc source/trash.d source/app.d -o trash`.
+CMake build files can be generated using `dub generate cmake`.
 
 ### Installing
 

source/app.d

@@ -27,6 +27,8 @@ int main(string[] args) {
     switch (res) {
         case 0:
             break;
+        // This is a special case where the options parsing wants to stop
+        // execution but there was no error
         case -1:
             return 0;
         default:

source/operations.d

@@ -167,7 +167,11 @@ int restoreOrDel(in string name, bool del) {
     if (del) {
         tfile.file_path.remove();
     } else {
-        tfile.file_path.renameOrCopy(tfile.orig_path);
+        // If the original desination is writeable
+        if (tfile.writeable
+                || prompt("%s is write protected, attempt restore anyway?", tfile.orig_path)) {
+            tfile.file_path.renameOrCopy(tfile.orig_path);
+        }
     }
     // Always remove the trashinfo file
     tfile.info_path.remove();

source/tests.d

@@ -165,7 +165,7 @@ unittest {
    Test recursively trashing a folder then emptying the trash
 */
 unittest {
-    string testdir = "test-dir";
+    string testdir = "test-dir/";
     testdir.mkdir();
     scope (failure)
         testdir.rmdirRecurse();
@@ -205,6 +205,9 @@ unittest {
     assert(OPTS.info_dir.exists());
     assert(OPTS.dirsize_file.exists());
 
+    // Empty operands should error
+    assert(mini(["-f"]) == 1);
+
     // Cleanup
     scope (success)
         test_trash_dir.rmdirRecurse();