-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Drop DB codenames, crystallize DB editor naming responsibilities
Drop database codenames in favor of specific database display name registry that centralizes all database name handling. This makes it clearer who is responsible of giving names to DB editor tabs. Also, moved DB editor window/tab management out of DB manager where it arguable doesn't belong.
- Loading branch information
Showing
62 changed files
with
914 additions
and
526 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
###################################################################################################################### | ||
# Copyright (C) 2017-2022 Spine project consortium | ||
# Copyright Spine Toolbox contributors | ||
# This file is part of Spine Toolbox. | ||
# Spine Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General | ||
# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) | ||
# any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; | ||
# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General | ||
# Public License for more details. You should have received a copy of the GNU Lesser General Public License along with | ||
# this program. If not, see <http://www.gnu.org/licenses/>. | ||
###################################################################################################################### | ||
|
||
"""This module contains functionality to manage database display names.""" | ||
import hashlib | ||
import pathlib | ||
from PySide6.QtCore import QObject, Signal, Slot | ||
from sqlalchemy.engine.url import URL, make_url | ||
|
||
|
||
class NameRegistry(QObject): | ||
display_name_changed = Signal(str, str) | ||
"""Emitted when the display name of a database changes.""" | ||
|
||
def __init__(self, parent=None): | ||
""" | ||
Args: | ||
parent (QObject, optional): parent object | ||
""" | ||
super().__init__(parent) | ||
self._names_by_url: dict[str, set[str]] = {} | ||
|
||
@Slot(str, str) | ||
def register(self, db_url, name): | ||
"""Registers a new name for given database URL. | ||
Args: | ||
db_url (URL or str): database URL | ||
name (str): name to register | ||
""" | ||
url = str(db_url) | ||
if url in self._names_by_url and name in self._names_by_url[url]: | ||
return | ||
self._names_by_url.setdefault(url, set()).add(name) | ||
self.display_name_changed.emit(url, self.display_name(db_url)) | ||
|
||
@Slot(str, str) | ||
def unregister(self, db_url, name): | ||
"""Removes a name from the registry. | ||
Args: | ||
db_url (URL or str): database URL | ||
name (str): name to remove | ||
""" | ||
url = str(db_url) | ||
names = self._names_by_url[url] | ||
old_name = self.display_name(url) if len(names) in (1, 2) else None | ||
names.remove(name) | ||
if old_name is not None: | ||
new_name = self.display_name(url) | ||
self.display_name_changed.emit(url, new_name) | ||
|
||
def display_name(self, db_url): | ||
"""Makes display name for a database. | ||
Args: | ||
db_url (URL or str): database URL | ||
Returns: | ||
str: display name | ||
""" | ||
try: | ||
registered_names = self._names_by_url[str(db_url)] | ||
except KeyError: | ||
return suggest_display_name(db_url) | ||
else: | ||
if len(registered_names) == 1: | ||
return next(iter(registered_names)) | ||
return suggest_display_name(db_url) | ||
|
||
def display_name_iter(self, db_maps): | ||
"""Yields database mapping display names. | ||
Args: | ||
db_maps (Iterable of DatabaseMapping): database mappings | ||
Yields: | ||
str: display name | ||
""" | ||
yield from (self.display_name(db_map.sa_url) for db_map in db_maps) | ||
|
||
def map_display_names_to_db_maps(self, db_maps): | ||
"""Returns a dictionary that maps display names to database mappings. | ||
Args: | ||
db_maps (Iterable of DatabaseMapping): database mappings | ||
Returns: | ||
dict: database mappings keyed by display names | ||
""" | ||
return {self.display_name(db_map.sa_url): db_map for db_map in db_maps} | ||
|
||
|
||
def suggest_display_name(db_url): | ||
"""Returns a short name for the database mapping. | ||
Args: | ||
db_url (URL or str): database URL | ||
Returns: | ||
str: suggested name for the database for display purposes. | ||
""" | ||
if not isinstance(db_url, URL): | ||
db_url = make_url(db_url) | ||
if not db_url.drivername.startswith("sqlite"): | ||
return db_url.database | ||
if db_url.database is not None: | ||
return pathlib.Path(db_url.database).stem | ||
hashing = hashlib.sha1() | ||
hashing.update(bytes(str(id(db_url)), "utf-8")) | ||
return hashing.hexdigest() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
###################################################################################################################### | ||
# Copyright (C) 2017-2022 Spine project consortium | ||
# Copyright Spine Toolbox contributors | ||
# This file is part of Spine Toolbox. | ||
# Spine Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General | ||
# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) | ||
# any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; | ||
# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General | ||
# Public License for more details. You should have received a copy of the GNU Lesser General Public License along with | ||
# this program. If not, see <http://www.gnu.org/licenses/>. | ||
###################################################################################################################### | ||
|
||
"""Contains functionality to keep track on open MultiTabWindow instances.""" | ||
from spinetoolbox.widgets.multi_tab_window import MultiTabWindow | ||
|
||
|
||
class MultiTabWindowRegistry: | ||
"""Registry that holds multi tab windows.""" | ||
|
||
def __init__(self): | ||
self._multi_tab_windows: list[MultiTabWindow] = [] | ||
|
||
def has_windows(self): | ||
"""Tests if there are any windows registered. | ||
Returns: | ||
bool: True if editor windows exist, False otherwise | ||
""" | ||
return bool(self._multi_tab_windows) | ||
|
||
def windows(self): | ||
"""Returns a list of multi tab windows. | ||
Returns: | ||
list of MultiTabWindow: windows | ||
""" | ||
return list(self._multi_tab_windows) | ||
|
||
def tabs(self): | ||
"""Returns a list of tabs across all windows. | ||
Returns: | ||
list of QWidget: tab widgets | ||
""" | ||
return [ | ||
window.tab_widget.widget(k) for window in self._multi_tab_windows for k in range(window.tab_widget.count()) | ||
] | ||
|
||
def register_window(self, window): | ||
"""Registers a new multi tab window. | ||
Args: | ||
window (MultiTabWindow): window to register | ||
""" | ||
self._multi_tab_windows.append(window) | ||
|
||
def unregister_window(self, window): | ||
"""Removes multi tab window from the registry. | ||
Args: | ||
window (MultiTabWindow): window to unregister | ||
""" | ||
self._multi_tab_windows.remove(window) | ||
|
||
def get_some_window(self): | ||
"""Returns a random multi tab window or None if none is available. | ||
Returns: | ||
MultiTabWindow: editor window | ||
""" | ||
return self._multi_tab_windows[0] if self._multi_tab_windows else None |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
###################################################################################################################### | ||
# Copyright (C) 2017-2022 Spine project consortium | ||
# Copyright Spine Toolbox contributors | ||
# This file is part of Spine Toolbox. | ||
# Spine Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General | ||
# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) | ||
# any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; | ||
# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General | ||
# Public License for more details. You should have received a copy of the GNU Lesser General Public License along with | ||
# this program. If not, see <http://www.gnu.org/licenses/>. | ||
###################################################################################################################### | ||
|
||
"""Contains Spine Database editor's window registry.""" | ||
from spinetoolbox.multi_tab_windows import MultiTabWindowRegistry | ||
|
||
db_editor_registry = MultiTabWindowRegistry() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.