focus on requested folder

fsel/app.py

@@ -82,8 +82,9 @@ def update_recents(recent, rel_path_from_root):
 
 def main():
     path_args = [arg for arg in sys.argv[1:] if not arg.startswith('-')]
-    folder = os.getenv('PWD') if len(path_args) != 1 else os.path.realpath(path_args[0])
-    debug("main", folder=folder)
+    wd = os.getenv('PWD')
+    folder = wd if len(path_args) != 1 else os.path.realpath(path_args[0])
+    search_root_from_work_dir = '-W' in sys.argv[1:]
     target_is_file = '-f' in sys.argv[1:]
     target_is_executable = '-x' in sys.argv[1:]
     show_dot_files = '-a' in sys.argv[1:]
@@ -93,7 +94,11 @@ def main():
     else:
         field_for_recent = 'recent-folders'
     all_settings = AllSettingsFolder(os.getenv("HOME") + "/.cache/fsel")
-    root, folder = find_root(folder, all_settings.roots)
+    if search_root_from_work_dir:
+        root, _ = find_root(wd, all_settings.roots)
+    else:
+        root, folder = find_root(folder, all_settings.roots)
+    debug("main", root=root, folder=folder)
     settings_for_root = all_settings.load_settings(root)
     recent = field_or_else(settings_for_root, field_for_recent, [])
     if show_recent:

key_bindings.bash

@@ -15,13 +15,13 @@ __fsel_cd__() {
   while true; do
     local dir
     local res
-    dir=$(python3 -m fsel.app "${args[@]}")
+    dir=$(python3 -m fsel.app -W "${args[@]}")
     res=$?
 
     # On Alt+Enter, continue with the link target
     [[ $res == 80 ]] && args=($(realpath "$dir")) && continue
     # On Alt+Home, continue with the parent of the returned root folder
-    [[ $res == 95 ]] && args=($(dirname "$dir")) && continue
+    [[ $res == 95 ]] && cd $(dirname "$dir") && args=($dir) && continue
 
     [[ $res == 14 ]] && printf 'rm -rf %q' "$dir"
     [[ $res == 0 ]] && printf 'cd %q' "$dir"