vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-11 01:24:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a timeout for zenity check

Browse source
This commit is contained in:
Concedo 2025-04-18 13:07:26 +08:00
parent bce519cee7
commit 5d57d62665
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
koboldcpp.py
View file

@ -3518,7 +3518,7 @@ def zenity(filetypes=None, initialdir="", initialfile="", **kwargs) -> Tuple[int
def zenity_sanity_check(): #make sure zenity is sane def zenity_sanity_check(): #make sure zenity is sane
nonlocal zenity_bin nonlocal zenity_bin
try: # Run `zenity --help` and pipe to grep try: # Run `zenity --help` and pipe to grep
result = subprocess.run(f"{zenity_bin} --help | grep Usage", shell=True, capture_output=True, text=True) result = subprocess.run(f"{zenity_bin} --help | grep Usage", shell=True, capture_output=True, text=True, encoding='utf-8', timeout=10)
if result.returncode == 0 and "Usage" in result.stdout: if result.returncode == 0 and "Usage" in result.stdout:
return True return True
else: else:
@ -3584,15 +3584,6 @@ def zentk_askopenfilename(**options):
result = askopenfilename(**options) result = askopenfilename(**options)
return result return result
def zentk_askopenmultiplefilenames(**options):
try:
files = zenity(filetypes=options.get("filetypes"), initialdir=options.get("initialdir"), title=options.get("title"), multiple=True, separator="\n")[1].splitlines()
result = tuple(filter(os.path.isfile, files))
except Exception:
from tkinter.filedialog import askopenfilenames
result = askopenfilenames(**options)
return result
def zentk_askdirectory(**options): def zentk_askdirectory(**options):
try: try:
result = zenity(initialdir=options.get("initialdir"), title=options.get("title"), directory=True)[1] result = zenity(initialdir=options.get("initialdir"), title=options.get("title"), directory=True)[1]
@ -3994,7 +3985,7 @@ def show_gui():
changed_gpu_choice_var() changed_gpu_choice_var()
def on_picked_model_file(filepath): def on_picked_model_file(filepath):
if filepath.lower().endswith('.kcpps') or filepath.lower().endswith('.kcppt'): if filepath and (filepath.lower().endswith('.kcpps') or filepath.lower().endswith('.kcppt')):
#load it as a config file instead #load it as a config file instead
with open(filepath, 'r', encoding='utf-8', errors='ignore') as f: with open(filepath, 'r', encoding='utf-8', errors='ignore') as f:
dict = json.load(f) dict = json.load(f)