daylin/viv
1
0
Fork 0
mirror of https://github.com/daylinmorgan/viv.git synced 2024-11-09 19:13:14 -06:00
Code Issues Projects Releases Packages Wiki Activity

fix: prefer exact matches for id's

Browse source
This commit is contained in:
Daylin Morgan 2023-08-08 01:03:03 -05:00
parent 91d3fcdaf4
commit 65af6834bd
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/viv/viv.py
View file

@ -53,7 +53,7 @@ from typing import (
from urllib.error import HTTPError from urllib.error import HTTPError
from urllib.request import urlopen from urllib.request import urlopen
__version__ = "23.8a1-12-g6bf2ae4-dev" __version__ = "23.8a1-14-g3201e56-dev"
class Spinner: class Spinner:
@ -838,7 +838,7 @@ class ViVenv:
spec = self._validate_spec(spec) spec = self._validate_spec(spec)
id = id if id else get_hash(spec, track_exe) id = id if id else get_hash(spec, track_exe)
self.name = name if name else self.id[:8] self.name = name if name else id[:8]
self.set_path(path) self.set_path(path)
if not metadata: if not metadata:
@ -1262,6 +1262,8 @@ class Viv:
def _match_vivenv(self, name_id: str) -> ViVenv: # type: ignore[return] def _match_vivenv(self, name_id: str) -> ViVenv: # type: ignore[return]
matches: List[ViVenv] = [] matches: List[ViVenv] = []
for k, v in self.vivenvs.items(): for k, v in self.vivenvs.items():
if name_id == v.meta.id:
matches.append(v)
if name_id == k or v.name == name_id: if name_id == k or v.name == name_id:
matches.append(v) matches.append(v)
elif k.startswith(name_id) or ( elif k.startswith(name_id) or (