hexedtech/codemp-sublime
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp-sublime.git synced 2025-03-29 21:01:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix connection workflow

Browse source
This commit is contained in:
cschen 2025-02-17 22:32:29 +01:00
parent 0f5351e20b
commit d4f09bc564
1 changed files with 7 additions and 6 deletions

13
plugin/commands/client.py
View file

@ -16,9 +16,11 @@ from ..input_handlers import SimpleListInput
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def valid_profiles(profiles): def valid_profiles(profiles):
return [p for p in profiles if "name" in p] return [p for p in profiles if "name" in p]
def get_profile_index_by_name(profiles, name): def get_profile_index_by_name(profiles, name):
return next((index for (index, d) in enumerate(profiles) if d["name"] == name)) return next((index for (index, d) in enumerate(profiles) if d["name"] == name))
@ -27,11 +29,11 @@ def get_default_profile(profiles):
i = get_profile_index_by_name(profiles, "Default") i = get_profile_index_by_name(profiles, "Default")
return profiles[i] return profiles[i]
class CodempConnectCommand(sublime_plugin.WindowCommand): class CodempConnectCommand(sublime_plugin.WindowCommand):
def __init__(self, window): def __init__(self, window):
super().__init__(window) super().__init__(window)
self.connprofile = {} self.connprofile = {}
self.selectedprofile = 0
def is_enabled(self) -> bool: def is_enabled(self) -> bool:
return not session.is_active() return not session.is_active()
@ -70,7 +72,7 @@ class CodempConnectCommand(sublime_plugin.WindowCommand):
self.connprofile["password"] = pwd self.connprofile["password"] = pwd
self.update_config_and_connect() self.update_config_and_connect()
panel = self.window.show_input_panel("Password:", "" , __, None, None) panel = self.window.show_input_panel("Password:", "", __, None, None)
# Very undocumented feature, the input panel if has the setting 'password' set to true # Very undocumented feature, the input panel if has the setting 'password' set to true
# will hide the input. # will hide the input.
panel.settings().set("password", True) panel.settings().set("password", True)
@ -80,13 +82,12 @@ class CodempConnectCommand(sublime_plugin.WindowCommand):
self.connprofile["username"] = usr self.connprofile["username"] = usr
self.maybe_get_password() self.maybe_get_password()
panel = self.window.show_input_panel("username:", "" , __, None, None) panel = self.window.show_input_panel("Username:", "", __, None, None)
panel.settings().set("password", False) panel.settings().set("password", False)
def run(self): # pyright: ignore[reportIncompatibleMethodOverride] def run(self): # pyright: ignore[reportIncompatibleMethodOverride]
def _run(index): def _run(index):
self.selectedprofile = index
profile = profiles[index] profile = profiles[index]
default_profile = get_default_profile(profiles) default_profile = get_default_profile(profiles)
self.connprofile = {**default_profile, **profile} self.connprofile = {**default_profile, **profile}
@ -94,10 +95,10 @@ class CodempConnectCommand(sublime_plugin.WindowCommand):
if self.connprofile["username"] and self.connprofile["password"]: if self.connprofile["username"] and self.connprofile["password"]:
self.update_config_and_connect() self.update_config_and_connect()
if not self.connprofile["username"]: if not self.connprofile["username"] and not self.connprofile["password"]:
self.maybe_get_user() self.maybe_get_user()
if not self.connprofile["password"]: if self.connprofile["username"] and not self.connprofile["password"]:
self.maybe_get_password() self.maybe_get_password()
profiles = valid_profiles(get_setting("profiles")) profiles = valid_profiles(get_setting("profiles"))