fix the F5 and F6 copy and move to panel shorcuts in default confv1.2.2

12 files changed, 19 insertions, 15 deletions

diff --git a/Cargo.toml b/Cargo.toml
index f77d50a..2038e7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "broot"
-version = "1.2.2-dev"
+version = "1.2.2"
 authors = ["dystroy <denys.seguret@gmail.com>"]
 repository = "https://github.com/Canop/broot"
 documentation = "https://dystroy.org/broot"
diff --git a/src/app/context.rs b/src/app/context.rs
index b8b132b..1d429d9 100644
--- a/src/app/context.rs
+++ b/src/app/context.rs
@@ -6,8 +6,8 @@ use {
         errors::ConfError,
         icon::*,
         pattern::SearchModeMap,
+        path::SpecialPath,
         skin::ExtColorMap,
-        tree::SpecialPath,
         verb::VerbStore,
     },
     std::{
diff --git a/src/conf/conf.rs b/src/conf/conf.rs
index 6d405bc..4edbd3e 100644
--- a/src/conf/conf.rs
+++ b/src/conf/conf.rs
@@ -7,7 +7,7 @@ use {
         display::ColsConf,
         errors::ProgramError,
         skin::SkinEntry,
-        tree::*,
+        path::{Glob, SpecialHandling},
     },
     crossterm::style::Attribute,
     fnv::FnvHashMap,
diff --git a/src/conf/default_conf.rs b/src/conf/default_conf.rs
index dd2e669..10bca56 100644
--- a/src/conf/default_conf.rs
+++ b/src/conf/default_conf.rs
@@ -228,14 +228,15 @@ pub const DEFAULT_CONF_FILE: &str = r#"
 
 		# You can reproduce the bindings of Norton Commander
 		# on copying or moving to the other panel:
-		#
 		# {
 		# 	key: F5
-		# 	execution: ":copy_to_panel"
+		# 	external: "cp -r {file} {other-panel-directory}"
+		# 	leave_broot: false
 		# }
 		# {
 		# 	key: F6
-		# 	execution: ":move_to_panel"
+		# 	external: "mv {file} {other-panel-directory}"
+		# 	leave_broot: false
 		# }
 	]
 
diff --git a/src/file_sum/sum_computation.rs b/src/file_sum/sum_computation.rs
index e5a086c..d3013f0 100644
--- a/src/file_sum/sum_computation.rs
+++ b/src/file_sum/sum_computation.rs
@@ -2,8 +2,8 @@ use {
     super::FileSum,
     crate::{
         app::*,
+        path::*,
         task_sync::Dam,
-        tree::*,
     },
     crossbeam::channel,
     fnv::FnvHashMap,
diff --git a/src/path/mod.rs b/src/path/mod.rs
index 543782c..defcbb5 100644
--- a/src/path/mod.rs
+++ b/src/path/mod.rs
@@ -2,10 +2,12 @@ mod anchor;
 mod closest;
 mod from;
 mod normalize;
+mod special_path;
 
 pub use {
     anchor::*,
     closest::*,
     from::*,
     normalize::*,
+    special_path::*,
 };
diff --git a/src/tree/special_path.rs b/src/path/special_path.rs
index b8674c1..9462654 100644
--- a/src/tree/special_path.rs
+++ b/src/path/special_path.rs
@@ -45,7 +45,6 @@ impl<'de> Deserialize<'de> for SpecialHandling {
                 s
             ))),
         }
-
     }
 }
 
diff --git a/src/time.rs b/src/time.rs
index 4931289..aac7d86 100644
--- a/src/time.rs
+++ b/src/time.rs
@@ -12,8 +12,7 @@ macro_rules! time {
     ($level: ident, $name: expr, $timed: expr $(,)?) => {{
         use log::Level::*;
         if log_enabled!($level) {
-            use std::time::Instant;
-            let start = Instant::now();
+            let start = std::time::Instant::now();
             let value = $timed;
             log!($level, "{} took {:?}", $name, start.elapsed());
             value
@@ -24,8 +23,7 @@ macro_rules! time {
     ($level: ident, $cat: expr, $name :expr,  $timed: expr $(,)?) => {{
         use log::Level::*;
         if log_enabled!($level) {
-            use std::time::Instant;
-            let start = Instant::now();
+            let start = std::time::Instant::now();
             let value = $timed;
             log!($level, "{} on {:?} took {:?}", $cat, $name, start.elapsed());
             value
diff --git a/src/tree/mod.rs b/src/tree/mod.rs
index f52b93c..4f3ccc5 100644
--- a/src/tree/mod.rs
+++ b/src/tree/mod.rs
@@ -1,6 +1,5 @@
 
 mod sort;
-mod special_path;
 mod tree;
 mod tree_line;
 mod tree_line_type;
@@ -8,7 +7,6 @@ mod tree_options;
 
 pub use {
     sort::Sort,
-    special_path::*,
     tree::Tree,
     tree_line::TreeLine,
     tree_line_type::TreeLineType,
diff --git a/src/tree_build/bline.rs b/src/tree_build/bline.rs
index 3eefdbc..e4a74b1 100644
--- a/src/tree_build/bline.rs
+++ b/src/tree_build/bline.rs
@@ -1,9 +1,10 @@
 use {
     super::bid::BId,
     crate::{
-    app::AppContext,
+        app::AppContext,
         errors::TreeBuildError,
         git::GitIgnoreChain,
+        path::SpecialHandling,
         tree::*,
     },
     id_arena::Arena,
diff --git a/src/tree_build/builder.rs b/src/tree_build/builder.rs
index 0dae30f..660a9df 100644
--- a/src/tree_build/builder.rs
+++ b/src/tree_build/builder.rs
@@ -8,6 +8,7 @@ use {
         errors::TreeBuildError,
         git::{GitIgnoreChain, GitIgnorer, LineStatusComputer},
         pattern::Candidate,
+        path::{SpecialHandling, SpecialPathList},
         task_sync::ComputationResult,
         task_sync::Dam,
         tree::*,
diff --git a/website/docs/skins.md b/website/docs/skins.md
index 47c378e..b7b655e 100644
--- a/website/docs/skins.md
+++ b/website/docs/skins.md
@@ -373,7 +373,11 @@ skin: {
 }
 ```
 
+If your terminal is dark, you may prefer to make broot transparent by changing the `default` line to
 
+```
+default: rgb(235, 219, 178) none / rgb(189, 174, 147) rgb(40, 40, 40)
+```
 
 # Contribute your own skin