snoopy/pyssh-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ajouter les tags de session et les parametres par defaut de groupe

Browse Source 
Tags : une session peut porter plusieurs tags libres (Session.tags), saisis
comme une liste separee par des virgules dans l'editeur (normalises : espaces
retires, doublons insensibles a la casse elimines), avec autocompletion sur
les tags deja utilises. Affiches dans l'arbre des sessions, et filtrables via
un champ dedie au-dessus de l'arbre (masque les sessions ne correspondant pas,
sans toucher aux dossiers/terminaux locaux/hosts OpenSSH).

Parametres de groupe : choix architectural deliberement plus simple qu'une
resolution dynamique a la connexion. app/groups.py (GroupSettingsStore, meme
pattern que les autres stores) associe un dossier (Session.group) a des
valeurs par defaut (utilisateur, port, authentification, cle, bastion,
keepalive). Ces valeurs ne s'appliquent qu'au moment de la creation d'une
session, via un bouton explicite "↓ Heriter du groupe" dans SessionDialog -
jamais de resolution automatique/retroactive. Ce choix evite d'introduire des
valeurs sentinelles "herite vs. explicite" sur chaque champ (port=22 est a la
fois une valeur par defaut ET une vraie valeur possible, par exemple) dans
tout le reste du code (ConnectionController, SSHConnection...), pour une
fonctionnalite que la priorisation du projet place parmi les secondaires. Une
session reste ensuite un ensemble de valeurs normales, librement modifiables
- "surcharger une valeur heritee" est donc trivialement satisfait.

Clic droit sur un dossier dans le panneau lateral : "Nouvelle session dans ce
dossier..." (pre-remplit le champ Dossier) et "Parametres du groupe..."
(GroupSettingsDialog).

tests/test_tags_and_groups.py : persistance des tags, CRUD GroupSettingsStore,
normalisation de la saisie des tags, heritage applique/absent, filtrage dans
l'arbre.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Florian
2026-09-05 03:10:01 +02:00
parent ff4a73e6e6
commit b615ed52af
8 changed files with 610 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app/controllers/session_controller.py
View File

@@ -9,13 +9,15 @@ import uuid
from PySide6.QtCore import Qt, Signal, QObject
from PySide6.QtWidgets import (
QWidget, QVBoxLayout, QHBoxLayout, QToolButton, QTreeWidget, QTreeWidgetItem,
QMenu, QMessageBox,
QMenu, QMessageBox, QComboBox, QLabel,
)
from app.session_manager import SessionStore, Session
from app.key_manager import KeyManager
from app.groups import GroupSettingsStore
from app.local_terminal import SHELL_LABELS
from app.dialogs.session_dialog import SessionDialog
from app.dialogs.group_settings_dialog import GroupSettingsDialog
from app.openssh.config import (
OpenSSHHost, default_config_path, load_openssh_hosts, session_from_openssh_host,
)
@@ -23,6 +25,7 @@ from app.openssh.config import (
SESSION_ROLE = Qt.UserRole + 10
LOCAL_SHELL_ROLE = Qt.UserRole + 11
OPENSSH_HOST_ROLE = Qt.UserRole + 12
GROUP_PATH_ROLE = Qt.UserRole + 13
class SessionController(QObject):
@@ -41,10 +44,12 @@ class SessionController(QObject):
broadcast_button: QToolButton,
parent_widget: QWidget | None = None,
openssh_config_path=None,
group_store: GroupSettingsStore | None = None,
):
super().__init__(parent_widget)
self.session_store = session_store
self.key_manager = key_manager
self.group_store = group_store
self._parent_widget = parent_widget
self._openssh_config_path = openssh_config_path or default_config_path()
@@ -57,7 +62,7 @@ class SessionController(QObject):
new_btn = QToolButton()
new_btn.setObjectName("primary")
new_btn.setText("+ Session")
new_btn.clicked.connect(self.new_session)
new_btn.clicked.connect(lambda: self.new_session())
toolbar.addWidget(new_btn)
term_btn = QToolButton()
@@ -93,6 +98,16 @@ class SessionController(QObject):
layout.addLayout(toolbar)
filter_row = QHBoxLayout()
filter_row.addWidget(QLabel("🏷"))
self.tag_filter_combo = QComboBox()
self.tag_filter_combo.setEditable(True)
self.tag_filter_combo.setInsertPolicy(QComboBox.NoInsert)
self.tag_filter_combo.lineEdit().setPlaceholderText("Filtrer les sessions par tag...")
self.tag_filter_combo.currentTextChanged.connect(self._apply_tag_filter)
filter_row.addWidget(self.tag_filter_combo, 1)
layout.addLayout(filter_row)
self.tree = QTreeWidget()
self.tree.setHeaderHidden(True)
self.tree.itemDoubleClicked.connect(self._on_tree_double_click)
@@ -138,13 +153,17 @@ class SessionController(QObject):
parent_item = get_folder(parent_path)
item = QTreeWidgetItem([f"📁 {name}"])
item.setFlags(item.flags() & ~Qt.ItemIsSelectable)
item.setData(0, GROUP_PATH_ROLE, path)
parent_item.addChild(item)
folder_items[path] = item
return item
for session in sorted(self.session_store.sessions, key=lambda s: s.name.lower()):
parent = get_folder(session.group)
item = QTreeWidgetItem([f"🖥 {session.name} ({session.host})"])
label = f"🖥 {session.name} ({session.host})"
if session.tags:
label += " [" + ", ".join(session.tags) + "]"
item = QTreeWidgetItem([label])
item.setData(0, SESSION_ROLE, session.id)
parent.addChild(item)
@@ -178,6 +197,30 @@ class SessionController(QObject):
openssh_header.addChild(hint)
self.tree.expandAll()
self._reload_tag_filter()
self._apply_tag_filter()
def _reload_tag_filter(self) -> None:
current = self.tag_filter_combo.currentText()
self.tag_filter_combo.blockSignals(True)
self.tag_filter_combo.clear()
self.tag_filter_combo.addItem("") # aucun filtre
self.tag_filter_combo.addItems(self.session_store.tags())
self.tag_filter_combo.setCurrentText(current)
self.tag_filter_combo.blockSignals(False)
def _apply_tag_filter(self, _text: str = "") -> None:
query = self.tag_filter_combo.currentText().strip().lower()
def visit(item: QTreeWidgetItem) -> None:
session = self._session_from_item(item)
if session is not None:
item.setHidden(bool(query) and not any(query in t.lower() for t in session.tags))
for i in range(item.childCount()):
visit(item.child(i))
for i in range(self.tree.topLevelItemCount()):
visit(self.tree.topLevelItem(i))
def _session_from_item(self, item: QTreeWidgetItem) -> Session | None:
if not item:
@@ -197,6 +240,11 @@ class SessionController(QObject):
return None
return item.data(0, OPENSSH_HOST_ROLE)
def _group_from_item(self, item: QTreeWidgetItem) -> str | None:
if not item:
return None
return item.data(0, GROUP_PATH_ROLE)
def _on_tree_double_click(self, item: QTreeWidgetItem, _col: int) -> None:
session = self._session_from_item(item)
if session:
@@ -216,6 +264,7 @@ class SessionController(QObject):
session = self._session_from_item(item) if item else None
shell = self._shell_from_item(item) if item else None
openssh_host = self._openssh_host_from_item(item) if item else None
group_path = self._group_from_item(item) if item else None
if session:
connect_action = menu.addAction("🖥 Ouvrir un terminal SSH")
@@ -252,6 +301,15 @@ class SessionController(QObject):
self.import_openssh_host(openssh_host)
elif action == refresh_action:
self.reload()
elif group_path:
new_in_group_action = menu.addAction("Nouvelle session dans ce dossier...")
menu.addSeparator()
group_settings_action = menu.addAction("Parametres du groupe...")
action = menu.exec(self.tree.viewport().mapToGlobal(pos))
if action == new_in_group_action:
self.new_session(group=group_path)
elif action == group_settings_action:
self.open_group_settings(group_path)
else:
new_action = menu.addAction("Nouvelle session...")
action = menu.exec(self.tree.viewport().mapToGlobal(pos))
@@ -259,15 +317,20 @@ class SessionController(QObject):
self.new_session()
# ---------- CRUD ----------
def new_session(self) -> None:
dialog = SessionDialog(self.key_manager, parent=self._parent_widget, session_store=self.session_store)
def new_session(self, group: str = "") -> None:
prefill = Session(group=group) if group else None
dialog = SessionDialog(
self.key_manager, session=prefill, parent=self._parent_widget,
session_store=self.session_store, group_store=self.group_store,
)
if dialog.exec():
self.session_store.add(dialog.result_session())
self.reload()
def edit_session(self, session: Session) -> None:
dialog = SessionDialog(
self.key_manager, session=session, parent=self._parent_widget, session_store=self.session_store,
self.key_manager, session=session, parent=self._parent_widget,
session_store=self.session_store, group_store=self.group_store,
)
if dialog.exec():
self.session_store.update(dialog.result_session())
@@ -294,7 +357,17 @@ class SessionController(QObject):
dialog = SessionDialog(
self.key_manager, session=session_from_openssh_host(host), parent=self._parent_widget,
title=f"Importer « {host.alias} » comme session", session_store=self.session_store,
group_store=self.group_store,
)
if dialog.exec():
self.session_store.add(dialog.result_session())
self.reload()
# ---------- parametres de groupe ----------
def open_group_settings(self, group_path: str) -> None:
if self.group_store is None:
return
dialog = GroupSettingsDialog(
group_path, self.group_store, self.key_manager, self.session_store, parent=self._parent_widget,
)
dialog.exec()