mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 00:14:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

autovox: Fix algorithm to cd correctly

Browse source
This commit is contained in:
Jamie Bliss 2020-02-03 13:25:06 -05:00
parent 49cd2812bb
commit 66d133952d
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xontrib/autovox.py
View file

@ -59,12 +59,15 @@ def get_venv(vox, dirpath):
return venvs[0]
def check_for_new_venv(curdir):
def check_for_new_venv(curdir, olddir):
vox = voxapi.Vox()
try:
oldve = vox[...]
except KeyError:
oldve = None
if olddir is ... or olddir is None:
try:
oldve = vox[...]
except KeyError:
oldve = None
else:
oldve = get_venv(vox, olddir)
newve = get_venv(vox, curdir)
if oldve != newve:
@ -76,8 +79,8 @@ def check_for_new_venv(curdir):
# Core mechanism: Check for venv when the current directory changes
@events.on_chdir
def cd_handler(newdir, **_):
check_for_new_venv(Path(newdir))
def cd_handler(newdir, olddir, **_):
check_for_new_venv(Path(newdir), Path(olddir))
# Recalculate when venvs are created or destroyed
@ -85,12 +88,12 @@ def cd_handler(newdir, **_):
@events.vox_on_create
def create_handler(**_):
check_for_new_venv(Path.cwd())
check_for_new_venv(Path.cwd(), ...)
@events.vox_on_destroy
def destroy_handler(**_):
check_for_new_venv(Path.cwd())
check_for_new_venv(Path.cwd(), ...)
# Initial activation before first prompt
@ -98,4 +101,4 @@ def destroy_handler(**_):
@events.on_post_init
def load_handler(**_):
check_for_new_venv(Path.cwd())
check_for_new_venv(Path.cwd(), None)