controls/DiscoveryPanel.py
author Edouard Tisserant <edouard@beremiz.fr>
Thu, 28 Nov 2024 14:13:03 +0100
changeset 4050 b27df24a0ea8
parent 4039 9ff455817691
permissions -rw-r--r--
Tests: extend FOR loop tests in IEC-61131 language test
1571
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     1
#!/usr/bin/env python
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     2
# -*- coding: utf-8 -*-
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     3
1571
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     4
# This file is part of Beremiz, a Integrated Development Environment for
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     5
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     6
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     7
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
1696
8043f32de7b8 make all dialog have non-fixed size
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1571
diff changeset
     8
# Copyright (C) 2017: Andrey Skvortsov <andrej.skvortzov@gmail.com>
1571
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     9
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    10
# See COPYING file for copyrights details.
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    11
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    12
# This program is free software; you can redistribute it and/or
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    13
# modify it under the terms of the GNU General Public License
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    14
# as published by the Free Software Foundation; either version 2
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    15
# of the License, or (at your option) any later version.
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    16
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    17
# This program is distributed in the hope that it will be useful,
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    18
# but WITHOUT ANY WARRANTY; without even the implied warranty of
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    19
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    20
# GNU General Public License for more details.
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    21
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    22
# You should have received a copy of the GNU General Public License
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    23
# along with this program; if not, write to the Free Software
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    24
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    25
1881
091005ec69c4 fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1850
diff changeset
    26
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    27
import wx
1738
d2e979738700 clean-up: fix PEP8 E271 multiple spaces after keyword
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1736
diff changeset
    28
import wx.lib.mixins.listctrl as listmix
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
    29
from connectors.ZeroConfListener import ZeroConfListenerClass
1736
7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1734
diff changeset
    30
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
    31
class AutoWidthListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
2737
38afed869ff6 Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.
Edouard Tisserant
parents: 2521
diff changeset
    32
    def __init__(self, parent, name, pos=wx.DefaultPosition,
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    33
                 size=wx.DefaultSize, style=0):
2737
38afed869ff6 Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.
Edouard Tisserant
parents: 2521
diff changeset
    34
        wx.ListCtrl.__init__(self, parent, wx.ID_ANY, pos, size, style, name=name)
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    35
        listmix.ListCtrlAutoWidthMixin.__init__(self)
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    36
2332
03a94f862465 'Merged' URI editor dialog and Discovery dialog, also clean up related code
Edouard Tisserant
parents: 1881
diff changeset
    37
class DiscoveryPanel(wx.Panel, listmix.ColumnSorterMixin):
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    38
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    39
    def _init_coll_MainSizer_Items(self, parent):
3303
0ffb41625592 Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2737
diff changeset
    40
        parent.Add(self.staticText1,    0, border=20, flag=wx.TOP | wx.LEFT | wx.RIGHT | wx.GROW)
0ffb41625592 Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2737
diff changeset
    41
        parent.Add(self.ServicesList,   0, border=20, flag=wx.LEFT | wx.RIGHT | wx.GROW)
0ffb41625592 Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2737
diff changeset
    42
        parent.Add(self.ButtonGridSizer, 0, border=20, flag=wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.GROW)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    43
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    44
    def _init_coll_MainSizer_Growables(self, parent):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    45
        parent.AddGrowableCol(0)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    46
        parent.AddGrowableRow(1)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    47
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    48
    def _init_coll_ButtonGridSizer_Items(self, parent):
3303
0ffb41625592 Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2737
diff changeset
    49
        parent.Add(self.RefreshButton, 0, border=0, flag=0)
0ffb41625592 Preliminary support for WxPython 4.1.0. Needs more testing. Grid selection/focus seems broken, and probably many other bugs hidden in dialogs and editors.
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 2737
diff changeset
    50
        # parent.Add(self.ByIPCheck, 0, border=0, flag=0)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    51
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    52
    def _init_coll_ButtonGridSizer_Growables(self, parent):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    53
        parent.AddGrowableCol(0)
1494
00910a8572d9 fix wrong Row number in DiscoveryDialog.py that caused following traceback:
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 814
diff changeset
    54
        parent.AddGrowableRow(0)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    55
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    56
    def _init_sizers(self):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    57
        self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=10)
2332
03a94f862465 'Merged' URI editor dialog and Discovery dialog, also clean up related code
Edouard Tisserant
parents: 1881
diff changeset
    58
        self.ButtonGridSizer = wx.FlexGridSizer(cols=2, hgap=5, rows=1, vgap=0)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    59
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    60
        self._init_coll_MainSizer_Items(self.MainSizer)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    61
        self._init_coll_MainSizer_Growables(self.MainSizer)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    62
        self._init_coll_ButtonGridSizer_Items(self.ButtonGridSizer)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    63
        self._init_coll_ButtonGridSizer_Growables(self.ButtonGridSizer)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    64
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    65
        self.SetSizer(self.MainSizer)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    66
1836
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
    67
    def _init_list_ctrl(self):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    68
        # Set up list control
1768
691083b5682a clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1762
diff changeset
    69
        self.ServicesList = AutoWidthListCtrl(
691083b5682a clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1762
diff changeset
    70
            name='ServicesList', parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 0),
691083b5682a clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1762
diff changeset
    71
            style=wx.LC_REPORT | wx.LC_EDIT_LABELS | wx.LC_SORT_ASCENDING | wx.LC_SINGLE_SEL)
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
    72
        for col, (label, width) in enumerate([
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
    73
                (_('NAME'), 150), (_('TYPE'), 150), (_('IP'), 150), (_('PORT'), 150)]):
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
    74
            self.ServicesList.InsertColumn(col, label)
1696
8043f32de7b8 make all dialog have non-fixed size
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1571
diff changeset
    75
        self.ServicesList.SetInitialSize(wx.Size(-1, 300))
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
    76
            
2737
38afed869ff6 Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.
Edouard Tisserant
parents: 2521
diff changeset
    77
        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self.ServicesList)
38afed869ff6 Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.
Edouard Tisserant
parents: 2521
diff changeset
    78
        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated, self.ServicesList)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    79
1836
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
    80
    def _init_ctrls(self, prnt):
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
    81
        self.staticText1 = wx.StaticText(
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
    82
            label=_('Services available:'), name='staticText1', parent=self,
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
    83
            pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    84
1768
691083b5682a clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1762
diff changeset
    85
        self.RefreshButton = wx.Button(
691083b5682a clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1762
diff changeset
    86
            label=_('Refresh'), name='RefreshButton', parent=self,
691083b5682a clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1762
diff changeset
    87
            pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
2477
4866c01e7428 Added support to PYROS in Zeroconf discovery and publish. For now, PYRO://mdnsname._tcp.local. URI are broken, and discovery panel generate IP based URI by default.
Edouard Tisserant
parents: 2466
diff changeset
    88
        self.RefreshButton.Bind(wx.EVT_BUTTON, self.OnRefreshButton)
2332
03a94f862465 'Merged' URI editor dialog and Discovery dialog, also clean up related code
Edouard Tisserant
parents: 1881
diff changeset
    89
2478
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
    90
        # self.ByIPCheck = wx.CheckBox(self, label=_("Use IP instead of Service Name"))
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
    91
        # self.ByIPCheck.SetValue(True)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    92
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    93
        self._init_sizers()
1696
8043f32de7b8 make all dialog have non-fixed size
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1571
diff changeset
    94
        self.Fit()
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
    95
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    96
    def __init__(self, parent):
2332
03a94f862465 'Merged' URI editor dialog and Discovery dialog, also clean up related code
Edouard Tisserant
parents: 1881
diff changeset
    97
        wx.Panel.__init__(self, parent)
1836
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
    98
2466
98d28d809488 Fixed Discovery panel in URI Editor dialog : double click works back again, and avoid setting URI to unicode type.
Edouard Tisserant
parents: 2459
diff changeset
    99
        self.parent = parent
98d28d809488 Fixed Discovery panel in URI Editor dialog : double click works back again, and avoid setting URI to unicode type.
Edouard Tisserant
parents: 2459
diff changeset
   100
1836
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
   101
        self._init_list_ctrl()
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
   102
        listmix.ColumnSorterMixin.__init__(self, 4)
d42b6cf00fa6 fix error __init__ method from base class is not called
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1830
diff changeset
   103
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   104
        self._init_ctrls(parent)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
   105
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   106
        self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   107
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   108
        self.itemDataMap = {}
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   109
        self.nextItemId = 0
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
   110
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   111
        self.URI = None
2477
4866c01e7428 Added support to PYROS in Zeroconf discovery and publish. For now, PYRO://mdnsname._tcp.local. URI are broken, and discovery panel generate IP based URI by default.
Edouard Tisserant
parents: 2466
diff changeset
   112
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   113
        self.LatestSelection = None
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   114
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   115
        self.ZeroConfListener = None
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   116
221
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   117
        self.RefreshList()
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   118
2477
4866c01e7428 Added support to PYROS in Zeroconf discovery and publish. For now, PYRO://mdnsname._tcp.local. URI are broken, and discovery panel generate IP based URI by default.
Edouard Tisserant
parents: 2466
diff changeset
   119
3717
da9ffd572551 IDE: fix segfault when unselecting network discovery in URI editor
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3303
diff changeset
   120
    def _cleanup(self):
3935
bc51b5a2daa9 IDE: Fix crashing non-thread safe code using Zeroconf
Edouard Tisserant <edouard@beremiz.fr>
parents: 3876
diff changeset
   121
        if self.ZeroConfListener is not None:
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   122
            self.ZeroConfListener.stop()
3935
bc51b5a2daa9 IDE: Fix crashing non-thread safe code using Zeroconf
Edouard Tisserant <edouard@beremiz.fr>
parents: 3876
diff changeset
   123
            self.ZeroConfListener = None
3717
da9ffd572551 IDE: fix segfault when unselecting network discovery in URI editor
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3303
diff changeset
   124
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   125
    def OnDestroy(self, event):
3717
da9ffd572551 IDE: fix segfault when unselecting network discovery in URI editor
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3303
diff changeset
   126
        self._cleanup()
2477
4866c01e7428 Added support to PYROS in Zeroconf discovery and publish. For now, PYRO://mdnsname._tcp.local. URI are broken, and discovery panel generate IP based URI by default.
Edouard Tisserant
parents: 2466
diff changeset
   127
        event.Skip()
4866c01e7428 Added support to PYROS in Zeroconf discovery and publish. For now, PYRO://mdnsname._tcp.local. URI are broken, and discovery panel generate IP based URI by default.
Edouard Tisserant
parents: 2466
diff changeset
   128
4866c01e7428 Added support to PYROS in Zeroconf discovery and publish. For now, PYRO://mdnsname._tcp.local. URI are broken, and discovery panel generate IP based URI by default.
Edouard Tisserant
parents: 2466
diff changeset
   129
    def RefreshList(self):
4866c01e7428 Added support to PYROS in Zeroconf discovery and publish. For now, PYRO://mdnsname._tcp.local. URI are broken, and discovery panel generate IP based URI by default.
Edouard Tisserant
parents: 2466
diff changeset
   130
        self.ServicesList.DeleteAllItems()
3935
bc51b5a2daa9 IDE: Fix crashing non-thread safe code using Zeroconf
Edouard Tisserant <edouard@beremiz.fr>
parents: 3876
diff changeset
   131
        self.ZeroConfListener = ZeroConfListenerClass(self)
221
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   132
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   133
    def OnRefreshButton(self, event):
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   134
        self.RefreshList()
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   135
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   136
    # Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   137
    def GetListCtrl(self):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   138
        return self.ServicesList
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   139
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   140
    def getColumnText(self, index, col):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   141
        item = self.ServicesList.GetItem(index, col)
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   142
        return item.GetText()
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   143
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   144
    def OnItemSelected(self, event):
3935
bc51b5a2daa9 IDE: Fix crashing non-thread safe code using Zeroconf
Edouard Tisserant <edouard@beremiz.fr>
parents: 3876
diff changeset
   145
        self.SetURI(event.GetIndex())
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   146
        event.Skip()
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   147
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   148
    def OnItemActivated(self, event):
3935
bc51b5a2daa9 IDE: Fix crashing non-thread safe code using Zeroconf
Edouard Tisserant <edouard@beremiz.fr>
parents: 3876
diff changeset
   149
        self.SetURI(event.GetIndex())
2466
98d28d809488 Fixed Discovery panel in URI Editor dialog : double click works back again, and avoid setting URI to unicode type.
Edouard Tisserant
parents: 2459
diff changeset
   150
        self.parent.EndModal(wx.ID_OK)
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   151
        event.Skip()
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   152
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   153
#    def SetURI(self, idx):
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   154
#        connect_type = self.getColumnText(idx, 1)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   155
#        connect_address = self.getColumnText(idx, 2)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   156
#        connect_port = self.getColumnText(idx, 3)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
   157
#
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   158
#        self.URI = "%s://%s:%s"%(connect_type, connect_address, connect_port)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   159
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   160
    def SetURI(self, idx):
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   161
        self.LatestSelection = idx
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
   162
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   163
    def GetURI(self):
2332
03a94f862465 'Merged' URI editor dialog and Discovery dialog, also clean up related code
Edouard Tisserant
parents: 1881
diff changeset
   164
        if self.LatestSelection is not None:
2478
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   165
            # if self.ByIPCheck.IsChecked():
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   166
            svcname, scheme, host, port = \
3750
f62625418bff automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents: 3717
diff changeset
   167
                [self.getColumnText(self.LatestSelection, col) for col in range(4)]
2478
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   168
            return ("%s://%s:%s#%s" % (scheme, host, port, svcname)) \
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   169
                if scheme[-1] == "S" \
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   170
                else ("%s://%s:%s" % (scheme, host, port))
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   171
            # else:
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   172
            #     svcname = self.getColumnText(self.LatestSelection, 0)
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   173
            #     connect_type = self.getColumnText(self.LatestSelection, 1)
733d77bf0aa7 Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.
Edouard Tisserant
parents: 2477
diff changeset
   174
            #     return str("MDNS://%s" % svcname)
2332
03a94f862465 'Merged' URI editor dialog and Discovery dialog, also clean up related code
Edouard Tisserant
parents: 1881
diff changeset
   175
        return None
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
   176
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   177
    def removeService(self, name):
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   178
        wx.CallAfter(self._removeService, name)
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   179
644
b511cab580eb Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf
Edouard Tisserant
parents: 399
diff changeset
   180
    def _removeService(self, name):
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   181
        '''
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   182
        called when a service with the desired type goes offline.
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   183
        '''
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
   184
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   185
        # loop through the list items looking for the service that went offline
3750
f62625418bff automated conversion using 2to3-3.9 tool
GP Orcullo <kinsamanka@gmail.com>
parents: 3717
diff changeset
   186
        for idx in range(self.ServicesList.GetItemCount()):
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   187
            # this is the unique identifier assigned to the item
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   188
            item_id = self.ServicesList.GetItemData(idx)
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   189
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   190
            # this is the full typename that was received by addService
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   191
            item_name = self.itemDataMap[item_id][4]
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   192
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   193
            if item_name == name:
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   194
                self.ServicesList.DeleteItem(idx)
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   195
                break
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
   196
4039
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   197
    def addService(self, typename, ip, port, name):
9ff455817691 IDE: refactor discovery panel / zeroconf
Edouard Tisserant <edouard.tisserant@gmail.com>
parents: 3935
diff changeset
   198
        wx.CallAfter(self._addService, typename, ip, port, name)
3935
bc51b5a2daa9 IDE: Fix crashing non-thread safe code using Zeroconf
Edouard Tisserant <edouard@beremiz.fr>
parents: 3876
diff changeset
   199
bc51b5a2daa9 IDE: Fix crashing non-thread safe code using Zeroconf
Edouard Tisserant <edouard@beremiz.fr>
parents: 3876
diff changeset
   200
    def _addService(self, typename, ip, port, name):
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   201
        '''
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   202
        called when a service with the desired type is discovered.
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   203
        '''
1758
845ca626db09 clean-up: fix PEP8 E222 multiple spaces after operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1756
diff changeset
   204
        svcname = name.split(".")[0]
374
8787fa8c6792 bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered.
b.taylor@willowglen.ca
parents: 357
diff changeset
   205
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   206
        num_items = self.ServicesList.GetItemCount()
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   207
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   208
        # display the new data in the list
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   209
        new_item = self.ServicesList.InsertStringItem(num_items, svcname)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   210
        self.ServicesList.SetStringItem(new_item, 1, "%s" % typename)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   211
        self.ServicesList.SetStringItem(new_item, 2, "%s" % ip)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   212
        self.ServicesList.SetStringItem(new_item, 3, "%s" % port)
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   213
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   214
        # record the new data for the ColumnSorterMixin
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   215
        # we assign every list item a unique id (that won't change when items
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   216
        # are added or removed)
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   217
        self.ServicesList.SetItemData(new_item, self.nextItemId)
1730
64d8f52bc8c8 clean-up for PEP8: fix W291 trailing whitespace
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1696
diff changeset
   218
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   219
        # the value of each column has to be stored in the itemDataMap
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   220
        # so that ColumnSorterMixin knows how to sort the column.
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   221
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   222
        # "name" is included at the end so that self.removeService
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   223
        # can access it.
1746
45d6f5fba016 clean-up: fix PEP8 E202 whitespace before ')'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1745
diff changeset
   224
        self.itemDataMap[self.nextItemId] = [svcname, typename, ip, port, name]
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   225
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   226
        self.nextItemId += 1