Cleanup and Fixes

Fix some bugs introduced in the last couple commits and generally
cleanup the code a bit.

source/app.d

@@ -4,8 +4,8 @@
   The two files are separated for testing purposes
 */
 
-import run : OPTS, runCommands;
-import cli : parseOpts;
+import run : runCommands;
+import cli : OPTS, parseOpts;
 import util : err;
 
 import core.memory;
@@ -27,8 +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
+            // This is a special case where the options parsing wants to stop
+            // execution but there was no error
         case -1:
             return 0;
         default:

source/cli.d

@@ -2,8 +2,7 @@
   CLI flag parsing and structure using D's getopt implementation
 */
 
-import ver : COPY_TEXT, VER, VER_NAME, VER_TEXT;
-import run : OPTS;
+import ver : COPY_TEXT, VER_TEXT;
 import util : log, err;
 
 import std.getopt;
@@ -65,8 +64,28 @@ struct Opts {
     @property @safe string dirsize_file() const nothrow {
         return trash_dir.buildPath("directorysizes");
     }
+
+    /// Reset the global OPTS to default values
+    @safe void reset() {
+        OPTS.dir = false;
+        OPTS.recursive = false;
+        OPTS.verbose = false;
+        OPTS.interactive = false;
+        OPTS.force = false;
+        OPTS.ver = false;
+
+        OPTS.list = false;
+        OPTS.orphans = false;
+        OPTS.empty = false;
+        OPTS.rm = false;
+        OPTS.restore = null;
+        OPTS.del = null;
+    }
 }
 
+/// The parsed CLI options are stored here on a global `Opts` struct
+static Opts OPTS;
+
 /**
    Parses the command line options into the `OPTS` global struct using D's built-in `getopt` parser
 */
@@ -76,9 +95,20 @@ int parseOpts(ref string[] args) {
 
     // Always reset the global options at each call
     // This is mostly useful for testing
-    // TODO this is funky, clean it up a bit
-    const Opts o;
-    OPTS = o;
+    OPTS.reset();
+
+    // Figure out where the trash dir is based on env variables
+    OPTS.trash_dir = environment.get("TRASH_D_DIR");
+    if (OPTS.trash_dir is null) {
+        // Get the correct XDG directory
+        string data_home = environment.get("XDG_DATA_HOME");
+        if (data_home is null) {
+            data_home = expandTilde("~/.local/share");
+        }
+        // Set the trash dir option
+        OPTS.trash_dir = data_home.buildPath("Trash").absolutePath();
+        log("trash directory: %s", OPTS.trash_dir);
+    }
 
     // Parse CLI options using D's getopt
     GetoptResult helpInfo;
@@ -98,7 +128,7 @@ int parseOpts(ref string[] args) {
                 "version", "Output the version and exit.", &OPTS.ver,
 
                 "list", "List out the files in the trash.", &OPTS.list,
-		"orphans", "List orphaned files in the trash.", &OPTS.orphans,
+                "orphans", "List orphaned files in the trash.", &OPTS.orphans,
                 "restore", "Restore a file from the trash.", &OPTS.restore,
                 "delete", "Delete a file from the trash.", &OPTS.del,
                 "empty", "Empty the trash bin.", &OPTS.empty,
@@ -120,30 +150,11 @@ int parseOpts(ref string[] args) {
 
         if (arglen < 2)
             return 1;
-        return -1;
-    }
 
-    // Print the version number and return
-    // This is here so that the program quits out on --version quickly
-    if (OPTS.ver) {
-        writefln("\033[1m%s\033[0m\n\n%s", VER_TEXT, COPY_TEXT);
+        // This function is a little special because it has a unique return code
+        // -1 means "stop program and with status code 0"
         return -1;
     }
 
-    OPTS.trash_dir = environment.get("TRASH_D_DIR");
-    if (OPTS.trash_dir is null) {
-        // Get the correct XDG directory
-        string data_home = environment.get("XDG_DATA_HOME");
-        if (data_home is null) {
-            data_home = expandTilde("~/.local/share");
-        } else {
-            // Set the trash dir option
-            OPTS.trash_dir = data_home.buildPath("Trash").absolutePath();
-            log("trash directory: %s", OPTS.trash_dir);
-        }
-    }
-
-    // This function is a little special because it has a unique return code
-    // -1 means "stop program and with status code 0"
     return 0;
 }

source/operations.d

@@ -2,7 +2,7 @@
    The various file operations that trash-d can perform
 */
 
-import run : OPTS;
+import cli : OPTS;
 import trashfile : TrashFile;
 import util;
 
@@ -115,6 +115,7 @@ void list() {
     }
 
     // Map the `DirEntry`s to `TrashFile`s
+    // MUST call .array() to ensure this doesn't get altered by subsequent algos
     auto tf = entries.map!(e => TrashFile(e.name.baseName().stripExtension())).array();
 
     // Calculate the maximum length of the name and path for formatting
@@ -137,13 +138,21 @@ void list() {
   These can be secretly lurking files that are wasting space
 */
 void orphans() {
-    auto files = OPTS.files_dir.dirEntries(SpanMode.shallow);
+    const auto files = OPTS.files_dir.dirEntries(SpanMode.shallow).array();
+
+    // If the trash is empty then say so
+    if (files.length <= 0) {
+        writeln("No orphaned files");
+        return;
+    }
+
     auto tf = files.map!(f => buildNormalizedPath(OPTS.info_dir, f) ~ ".trashinfo")
-                 .filter!(p => !p.exists()).array();
+        .filter!(p => !p.exists());
 
     foreach (TrashFile file; tf) {
-        writefln("%s", file.file_name);
+        writefln("%s", buildNormalizedPath(OPTS.files_dir, file.file_name));
     }
+    writefln("\nUse %s --empty to delete these permanently", OPTS.prog_name);
 }
 
 /**

source/run.d

@@ -9,21 +9,26 @@
   - https://specifications.freedesktop.org/trash-spec/trashspec-latest.html
 */
 
-import cli : Opts, parseOpts;
+import cli : OPTS, parseOpts;
 import operations;
 import util : createMissingFolders, err, log;
+import ver : COPY_TEXT, VER_TEXT;
 
+import std.stdio : writefln;
 import std.string : startsWith;
 
-/// The parsed CLI options are stored here on a global `Opts` struct
-static Opts OPTS;
-
 /**
    Given the remaining string arguments and the global `OPTS` struct, runs the
    given commands. In other words, this function wraps around all the real
    operations and acts as a secondary entrypoint that `main()` can `try`.
 */
 int runCommands(string[] args) {
+    // Print the version number and return
+    if (OPTS.ver) {
+        writefln("\033[1m%s\033[0m\n\n%s", VER_TEXT, COPY_TEXT);
+        return -1;
+    }
+
     // Create missing folders if needed
     createMissingFolders();
 
@@ -36,7 +41,7 @@ int runCommands(string[] args) {
     // Handle listing out orphans
     if (OPTS.orphans) {
         orphans();
-	return 0;
+        return 0;
     }
 
     // Handle restoring trash files

source/tests.d

@@ -2,8 +2,8 @@
   Integration tests for trash-d
 */
 
-import run : OPTS, runCommands;
-import cli : parseOpts;
+import run : runCommands;
+import cli : OPTS, parseOpts;
 import trashfile : TrashFile;
 
 import std.file;
@@ -27,6 +27,9 @@ int mini(string[] args) {
     if (res != 0)
         return res;
 
+    // Test for a nasty bug that came up
+    assert(!(OPTS.trash_dir is null));
+
     // Enable verbosity and change the trash directory for testing
     OPTS.verbose = true;
     OPTS.trash_dir = test_trash_dir;
@@ -342,7 +345,7 @@ unittest {
     // Run a command so that the trash directory is created
     assert(mini(["--list"]) == 0);
 
-    string testname = "test.file";
+    const string testname = "test.file";
     string testfile = OPTS.files_dir ~ "/" ~ testname;
     testfile.write("hello");
     scope (failure)
@@ -376,7 +379,7 @@ unittest {
     // Restoring a file that doesn't exist
     assert(mini(["--restore", ne]) == 1);
     // Deleting a file that doesn't exist
-    assert(mini(["--rm", ne]) == 1)
+    assert(mini(["--rm", ne]) == 1);
 
     // Unknown options should just be ignored
     assert(mini(["--unknown"]) == 0);

source/trashfile.d

@@ -2,7 +2,7 @@
    TrashFile structure which handles information related to a file in the trash
 */
 
-import run : OPTS;
+import cli : OPTS;
 import util : log;
 
 import core.sys.posix.sys.stat : S_IWUSR;

source/util.d

@@ -2,7 +2,7 @@
   Helper utility functions to perform various common operations
 */
 
-import run : OPTS;
+import cli : OPTS;
 
 import core.stdc.errno : EXDEV;
 import std.stdio : stderr, stdin, writef;