Release v2.2.40

This reverts commit 7c56a2467c.

.github/workflows/add-new-issues-to-project.yml

@@ -0,0 +1,16 @@
+name: Add new issues to GNS3 project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.4.0
+        with:
+          project-url: https://github.com/orgs/GNS3/projects/3
+          github-token: ${{ secrets.ADD_NEW_ISSUES_TO_PROJECT }}

CHANGELOG

@@ -1,5 +1,25 @@
 # Change Log
 
+## 2.2.40 06/06/2023
+
+* Change log messages for Websocket errors
+* Do not proceed if an appliance symbol cannot be downloaded. Ref #3466
+* Delete a node or link from topology summary view using Delete key. Ref #3445
+* Fix "Start the capture visualization program" checkbox works only one (first) time for a given link. Fixes #3442
+* Let the selected link style applied when editing a link. Fixes #3460
+* Fix hovered color shown in style editing dialog. Fixes #3460
+
+## 2.2.39 08/05/2023
+
+* Fix nodes are not snapped to the grid at the moment of creation
+* Upgrade distro and aiohttp dependencies
+
+## 2.2.38 28/02/2023
+
+* Add long description content type in setup.py
+* Automatically add new issues to GNS3 project
+* Development 2.2.38.dev1
+
 ## 2.2.37 25/01/2023
 
 * Upgrade to PyQt5 v5.15.7

gns3/controller.py

@@ -449,7 +449,7 @@ class Controller(QtCore.QObject):
     @qslot
     def _websocket_error(self, error):
         if self._notification_stream:
-            log.error("Websocket notification stream error: {}".format(self._notification_stream.errorString()))
+            log.error("Websocket controller notification stream error: {}".format(self._notification_stream.errorString()))
             self._notification_stream = None
             self._startListenNotifications()
 

gns3/crash_report.py

@@ -51,7 +51,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://433337b5780f4fe8abec8ee5e85c5897@o19455.ingest.sentry.io/38506"
+    DSN = "https://60c5c2bb187449cb8c56478e86a4c516@o19455.ingest.sentry.io/38506"
     _instance = None
 
     def __init__(self):

gns3/dialogs/style_editor_dialog_link.py

@@ -58,7 +58,9 @@ class StyleEditorDialogLink(QtWidgets.QDialog, Ui_StyleEditorDialog):
         self.uiRotationLabel.hide()
         self.uiRotationSpinBox.hide()
 
+        link.setHovered(False)  # make sure we use the right style
         pen = link.pen()
+        link.setHovered(True)
 
         self._border_color = pen.color()
         self.uiBorderColorPushButton.setStyleSheet("background-color: rgba({}, {}, {}, {});".format(self._border_color.red(),
@@ -102,6 +104,7 @@ class StyleEditorDialogLink(QtWidgets.QDialog, Ui_StyleEditorDialog):
         
         # Store values
         self._link.setLinkStyle(new_link_style)
+        self._link.setHovered(False)  # allow to see the new style
 
     def done(self, result):
         """

gns3/items/drawing_item.py

@@ -213,7 +213,7 @@ class DrawingItem:
 
     def itemChange(self, change, value):
 
-        if change == QtWidgets.QGraphicsItem.ItemPositionChange and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
+        if change == QtWidgets.QGraphicsItem.ItemPositionChange and self._main_window.uiSnapToGridAction.isChecked():
             grid_size = self._graphics_view.drawingGridSize()
             mid_x = self.boundingRect().width() / 2
             value.setX((grid_size * round((value.x() + mid_x) / grid_size)) - mid_x)

gns3/items/link_item.py

@@ -320,13 +320,13 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
 
         if not sip_is_deleted(self):
             # create the contextual menu
+            self.setHovered(True)
             self.setAcceptHoverEvents(False)
             menu = QtWidgets.QMenu()
             self.populateLinkContextualMenu(menu)
             menu.exec_(QtGui.QCursor.pos())
             self.setAcceptHoverEvents(True)
-            self._hovered = False
-            self.adjust()
+            self.setHovered(False)
 
     def keyPressEvent(self, event):
         """

gns3/items/node_item.py

@@ -108,6 +108,9 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
         if node.initialized():
             self.createdSlot(node.id())
 
+        if self._main_window.uiSnapToGridAction.isChecked():
+            self.setPos(QtCore.QPointF(self._node.x() + 0.1, self._node.y()))
+
     def updateNode(self):
         """
         Sync change to the node
@@ -466,7 +469,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
         :param value: value of the change
         """
 
-        if change == QtWidgets.QGraphicsItem.ItemPositionChange and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
+        if change == QtWidgets.QGraphicsItem.ItemPositionChange and self._main_window.uiSnapToGridAction.isChecked():
             grid_size = self._main_window.uiGraphicsView.nodeGridSize()
             mid_x = self.boundingRect().width() / 2
             value.setX((grid_size * round((value.x() + mid_x) / grid_size)) - mid_x)

gns3/packet_capture.py

@@ -112,15 +112,20 @@ class PacketCapture:
         """
         Starts the packet capture reader.
         """
+
         self._startPacketCommand(link, self.settings()["packet_capture_reader_command"])
 
     def stopPacketCaptureReader(self, link):
         """
         Stop the packet capture reader
         """
-        if link in self._tail_process and self._tail_process[link].poll() is None:
+
+        if link in self._tail_process:
             log.debug("Stopping packet capture reader for link {}".format(link.link_id()))
-            self._tail_process[link].kill()
+            try:
+                self._tail_process[link].kill()
+            except (PermissionError, OSError):
+                pass
             del self._tail_process[link]
 
     def startPacketCaptureAnalyzer(self, link):
@@ -183,14 +188,14 @@ class PacketCapture:
                 QtWidgets.QMessageBox.critical(self.parent(), "Packet capture", "Can't create packet capture file {}: {}".format(capture_file_path, str(e)))
                 return
 
-        if link in self._tail_process and self._tail_process[link].poll() is None:
+        if link in self._tail_process:
             try:
                 self._tail_process[link].kill()
             except (PermissionError, OSError):
                 # Sometimes we have condition on windows where the process is in the process to quit
                 pass
             del self._tail_process[link]
-        if link in self._capture_reader_process and self._capture_reader_process[link].poll() is None:
+        if link in self._capture_reader_process:
             try:
                 self._capture_reader_process[link].kill()
             except (PermissionError, OSError):

gns3/project.py

@@ -654,7 +654,7 @@ class Project(QtCore.QObject):
     @qslot
     def _websocket_error(self, error):
         if self._notification_stream:
-            log.error(self._notification_stream.errorString())
+            log.error("Websocket project notification stream error: {}".format(self._notification_stream.errorString()))
             self._notification_stream = None
             self._startListenNotifications()
 

gns3/registry/appliance_to_template.py

@@ -197,7 +197,8 @@ class ApplianceToTemplate:
 
         url = "https://raw.githubusercontent.com/GNS3/gns3-registry/master/symbols/{}".format(symbol_id)
         try:
-            self._downloadApplianceSymbol(url, path)
+            if not self._downloadApplianceSymbol(url, path):
+                return None
             controller.clearStaticCache()
             if controller.isRemote():
                 controller.uploadSymbol(symbol_id, path)
@@ -230,5 +231,7 @@ class ApplianceToTemplate:
                 log.debug("Error while saving appliance symbol to '{}': {}".format(path, e))
                 raise
             log.debug("Appliance symbol downloaded and saved to '{}'".format(path))
+            return True
         else:
-            log.warning("Error when downloading appliance symbol from '{}': {}".format(url, reply.errorString()))
+            log.error("Error when downloading appliance symbol from '{}': {}".format(url, reply.errorString()))
+        return False

gns3/topology_summary_view.py

@@ -415,3 +415,22 @@ class TopologySummaryView(QtWidgets.QTreeWidget):
         for link in self._topology.links():
             if link.suspended():
                 link.toggleSuspend()
+
+    def keyPressEvent(self, event):
+        """
+        Handles key press events
+        """
+
+        from .main_window import MainWindow
+        view = MainWindow.instance().uiGraphicsView
+        # only deleting a link or node is supported for now
+        if event.key() == QtCore.Qt.Key_Delete:
+            current_item = self.currentItem()
+            if isinstance(current_item, TopologyNodeItem):
+                current_item.node().delete()
+            else:
+                link = current_item.data(0, QtCore.Qt.UserRole)
+                for item in view.scene().items():
+                    if isinstance(item, LinkItem) and item.link() == link:
+                        item.delete()
+        super().keyPressEvent(event)

gns3/version.py

@@ -23,8 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.37"
-__version_info__ = (2, 2, 37, 0)
+__version__ = "2.2.40"
+__version_info__ = (2, 2, 40, 0)
 
 if "dev" in __version__:
     try:

requirements.txt

@@ -1,7 +1,7 @@
 jsonschema>=4.17.3,<4.18; python_version >= '3.7'
 jsonschema==3.2.0; python_version < '3.7'  # v3.2.0 is the last version to support Python 3.6
-sentry-sdk==1.12.1,<1.13
+sentry-sdk==1.17.0,<1.18
 psutil==5.9.4
-distro>=1.7.0
+distro>=1.8.0
 setuptools>=60.8.1; python_version >= '3.7'
 setuptools==59.6.0; python_version < '3.7'  # v59.6.0 is the last version to support Python 3.6

setup.py

@@ -67,6 +67,7 @@ setup(
     author_email="package-maintainer@gns3.net",
     description="GNS3 graphical interface for the GNS3 server.",
     long_description=open("README.md", "r").read(),
+    long_description_content_type="text/markdown",
     install_requires=open("requirements.txt", "r").read().splitlines(),
     entry_points={
         "gui_scripts": [

tests/items/test_line_item.py

@@ -61,6 +61,7 @@ def test_toSvg_negative_y(project, controller):
 
 def test_fromSvg(project, controller):
     line = LineItem(project=project)
+    line._main_window.uiSnapToGridAction.isChecked = lambda: False
     line.setPos(50, 84)
     line.fromSvg('<svg height="150" width="250"><line x1="0" y1="0" x2="250" y2="150" stroke-width="5" stroke="#0000ff" stroke-dasharray="5, 25, 25" /></svg>')
     assert line.line().x1() == 0
@@ -75,6 +76,7 @@ def test_fromSvg(project, controller):
 
 def test_fromSvg_top_direction(project, controller):
     line = LineItem(project=project)
+    line._main_window.uiSnapToGridAction.isChecked = lambda: False
     line.setPos(50, 84)
     line.fromSvg('<svg height="150" width="250"><line x1="0" y1="150" x2="250" y2="0" stroke-width="5" stroke="#0000ff" stroke-dasharray="5, 25, 25" /></svg>')
     assert line.line().x1() == 0