Skip to content

QPL-98: Handle missing QMS service in recent list #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

QPL-98: Handle missing QMS service in recent list #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7d342b
Handle missing QMS service in recent list
ArtLod Aug 6, 2025
e28ac3b
Add instant update after service removal in recently used list
ArtLod Aug 11, 2025
2a2be48
Use Qt signals to trigger UI refresh
ArtLod Aug 14, 2025
ab41b95
Remove unused code
ArtLod Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 34 additions & 24 deletions src/quick_map_services/i18n/QuickMapServices_ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,27 +200,27 @@ p, li { white-space: pre-wrap; }
<translation>Поместить авторство в нижнем правом углу</translation>
</message>
<message>
<location filename="../ds_edit_dialog.ui" line="14"/>
<location filename="../group_edit_dialog.ui" line="14"/>
<source>Dialog</source>
<translation>Диалог</translation>
</message>
<message>
<location filename="../ds_edit_dialog.ui" line="24"/>
<location filename="../group_edit_dialog.ui" line="24"/>
<source>General</source>
<translation>Общие</translation>
</message>
<message>
<location filename="../ds_edit_dialog.ui" line="30"/>
<location filename="../group_edit_dialog.ui" line="33"/>
<source>ID</source>
<translation>ID</translation>
</message>
<message>
<location filename="../ds_edit_dialog.ui" line="40"/>
<location filename="../group_edit_dialog.ui" line="43"/>
<source>Alias</source>
<translation>Алиас</translation>
</message>
<message>
<location filename="../ds_edit_dialog.ui" line="88"/>
<location filename="../group_edit_dialog.ui" line="77"/>
<source>Icon</source>
<translation>Иконка</translation>
</message>
Expand Down Expand Up @@ -255,7 +255,7 @@ p, li { white-space: pre-wrap; }
<translation>Условия использования</translation>
</message>
<message>
<location filename="../ds_edit_dialog.ui" line="98"/>
<location filename="../group_edit_dialog.ui" line="93"/>
<source>Choose</source>
<translation>Выбрать</translation>
</message>
Expand Down Expand Up @@ -454,7 +454,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Form</name>
<message>
<location filename="../gui/editor_widget_geojson.ui" line="14"/>
<location filename="../gui/editor_widget_wms.ui" line="14"/>
<source>Form</source>
<translation>Форма</translation>
</message>
Expand All @@ -464,7 +464,7 @@ p, li { white-space: pre-wrap; }
<translation>Файл GDAL</translation>
</message>
<message>
<location filename="../gui/editor_widget_geojson.ui" line="23"/>
<location filename="../gui/editor_widget_wms.ui" line="23"/>
<source>URL</source>
<translation>URL</translation>
</message>
Expand Down Expand Up @@ -680,40 +680,50 @@ p, li { white-space: pre-wrap; }
<context>
<name>QmsSearchResultItemWidget</name>
<message>
<location filename="../qms_service_toolbox.py" line="423"/>
<location filename="../qms_service_toolbox.py" line="424"/>
<source>details</source>
<translation>подробнее</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="435"/>
<location filename="../qms_service_toolbox.py" line="436"/>
<source>report a problem</source>
<translation>сообщить о проблеме</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="458"/>
<location filename="../qms_service_toolbox.py" line="459"/>
<source>Add</source>
<translation>Добавить</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="485"/>
<source>Service not found</source>
<translation>Сервис не найден</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="485"/>
<source>The service does not exist anymore. It will be removed from the recent list.</source>
<translation>Сервис больше не существует. Он будет удалён из списка недавно использованных.</translation>
</message>
</context>
<context>
<name>QmsServiceToolbox</name>
<message>
<location filename="../qms_service_toolbox.py" line="138"/>
<location filename="../qms_service_toolbox.py" line="139"/>
<source>Search string...</source>
<translation>Поиск геосервиса...</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="322"/>
<location filename="../qms_service_toolbox.py" line="323"/>
<source>Searching...</source>
<translation>Поиск...</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="356"/>
<location filename="../qms_service_toolbox.py" line="357"/>
<source>No results!</source>
<translation>Нет результатов!</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="301"/>
<location filename="../qms_service_toolbox.py" line="302"/>
<source>Last used:</source>
<translation>Недавно использованы:</translation>
</message>
Expand All @@ -728,12 +738,12 @@ p, li { white-space: pre-wrap; }
<translation>Введите часть имени сервиса</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="331"/>
<location filename="../qms_service_toolbox.py" line="332"/>
<source>No results.</source>
<translation>Ничего не найдено.</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="331"/>
<location filename="../qms_service_toolbox.py" line="332"/>
<source>You can add a service to become searchable. Start &lt;a href=&apos;{}&apos;&gt;here&lt;/a&gt;.</source>
<translation>Вы можете &lt;a href='{}'&gt;добавить сервис&lt;/a&gt; самостоятельно, и он станет доступен через поиск.</translation>
</message>
Expand All @@ -743,22 +753,22 @@ p, li { white-space: pre-wrap; }
<translation>Фильтр по охвату</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="131"/>
<location filename="../qms_service_toolbox.py" line="132"/>
<source>All</source>
<translation>Все</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="367"/>
<location filename="../qms_service_toolbox.py" line="368"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="132"/>
<location filename="../qms_service_toolbox.py" line="133"/>
<source>Valid</source>
<translation>Рабочие</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="262"/>
<location filename="../qms_service_toolbox.py" line="263"/>
<source>Need at least 3 symbols to start searching...</source>
<translation>Для поиска нужно минимум 3 символа...</translation>
</message>
Expand Down Expand Up @@ -821,21 +831,21 @@ The previous settings will be overwritten!</source>
<context>
<name>SearchThread</name>
<message>
<location filename="../qms_service_toolbox.py" line="575"/>
<location filename="../qms_service_toolbox.py" line="603"/>
<source>Network error!
{0}</source>
<translation>Сетевая ошибка!
{0}</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="586"/>
<location filename="../qms_service_toolbox.py" line="614"/>
<source>Error of processing!
{0}: {1}</source>
<translation>Ошибка обработки!
{0}: {1}</translation>
</message>
<message>
<location filename="../qms_service_toolbox.py" line="581"/>
<location filename="../qms_service_toolbox.py" line="609"/>
<source>Network error: {0}</source>
<translation>Сетевая ошибка</translation>
</message>
Expand Down
50 changes: 49 additions & 1 deletion src/quick_map_services/qms_service_toolbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
QThread,
QTimer,
pyqtSignal,
pyqtSlot,
)
from qgis.PyQt.QtGui import (
QCursor,
Expand All @@ -28,6 +29,7 @@
QHBoxLayout,
QLabel,
QListWidgetItem,
QMessageBox,
QSizePolicy,
QToolButton,
QWidget,
Expand Down Expand Up @@ -233,6 +235,18 @@ def stop_search_thread(self):
self.search_threads.wait()
self.search_threads = None

@pyqtSlot()
def refresh_last_used_services(self):
"""
Refresh the list of last used geoservices.

This method clears the current search result list and adds the
last used geoservices again. It is intended to be called after
a geoservice is removed from the recent list.
"""
self.lstSearchResult.clear()
self.add_last_used_services()

def start_search(self):
search_text = None
geom_filter = None
Expand Down Expand Up @@ -307,6 +321,9 @@ def add_last_used_services(self):
custom_widget = QmsSearchResultItemWidget(
attributes, image_qByteArray
)
custom_widget.refresh_recent_services.connect(
self.refresh_last_used_services
)
new_item = QListWidgetItem(self.lstSearchResult)
new_item.setSizeHint(custom_widget.sizeHint())
self.lstSearchResult.addItem(new_item)
Expand Down Expand Up @@ -376,6 +393,8 @@ def show_error(self, error_text):


class QmsSearchResultItemWidget(QWidget):
refresh_recent_services = pyqtSignal()

def __init__(
self, geoservice, image_ba, parent=None, extent_renderer=None
):
Expand Down Expand Up @@ -467,11 +486,40 @@ def __init__(
self.image_ba = image_ba

def addToMap(self):
"""
Try to add the selected geoservice to the map. If the service does not
exist anymore, show a warning and remove it from the recent list.

:raises: Shows a warning dialog if the service is not found.
"""
try:
QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
client = Client()
client.set_proxy(*QGISSettings.get_qgis_proxy())
geoservice_info = client.get_geoservice_info(self.geoservice)
try:
geoservice_info = client.get_geoservice_info(self.geoservice)
except Exception as error:
# Show a warning if the service is not found
QMessageBox.warning(
self,
self.tr("Service not found"),
self.tr(
"The service does not exist anymore."
" It will be removed from the recent list."
),
)
# Remove the service from the recent list
cached_services = CachedServices()
cached_services.geoservices = [
gs for gs in cached_services.geoservices
if gs.id != self.geoservice.get("id")
]
PluginSettings.set_last_used_services(
cached_services.geoservices
)
# Refresh the list of last used services
self.refresh_recent_services.emit()
return
ds = DataSourceSerializer.read_from_json(geoservice_info)
add_layer_to_map(ds)

Expand Down