Merge pull request ogham#597 from FliegendeWurst/bugfixes

ogham · web-flow · commit 416818fda243 · 2020-01-19T00:55:58.000Z
Two small bugfixes
diff --git a/src/options/view.rs b/src/options/view.rs
@@ -81,7 +81,7 @@ impl Mode {
 
             // If the terminal width couldn’t be matched for some reason, such
             // as the program’s stdout being connected to a file, then
-            // fallback to the lines view.
+            // fallback to the lines or details view.
             else if matches.has(&flags::TREE)? {
                 let details = details::Options {
                     table: None,
@@ -92,7 +92,10 @@ impl Mode {
 
                 Ok(Mode::Details(details))
             }
-            else {
+            else if matches.has(&flags::LONG)? {
+                let details = long()?;
+                Ok(Mode::Details(details))
+            } else {
                 let lines = lines::Options { icons: matches.has(&flags::ICONS)?, };
                 Ok(Mode::Lines(lines))
             }
diff --git a/src/output/escape.rs b/src/output/escape.rs
@@ -2,15 +2,15 @@ use ansi_term::{ANSIString, Style};
 
 
 pub fn escape<'a>(string: String, bits: &mut Vec<ANSIString<'a>>, good: Style, bad: Style) {
-    if string.chars().all(|c| c >= 0x20 as char) {
+    if string.chars().all(|c| c >= 0x20 as char && c != 0x7f as char) {
         bits.push(good.paint(string));
     }
     else {
         for c in string.chars() {
             // The `escape_default` method on `char` is *almost* what we want here, but
             // it still escapes non-ASCII UTF-8 characters, which are still printable.
 
-            if c >= 0x20 as char {
+            if c >= 0x20 as char && c != 0x7f as char {
                 // TODO: This allocates way too much,
                 // hence the `all` check above.
                 let mut s = String::new();
