refactoring

Author: capocchi

Dockerfile

@@ -1,25 +1,38 @@
-# Use an official Python runtime as a parent image
-FROM python:3.13-slim-buster
-
-# Set the working directory in the container
-WORKDIR /app
-
-# Install additional dependencies for wxPython
-RUN apt-get update && apt-get install -y build-essential libgtk-3-dev
-RUN pip install --upgrade pip
-
-RUN pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/debian-9 wxPython
-
-# RUN pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython
-
-COPY requirements.txt requirements.txt
-RUN pip install -r requirements.txt
-
-# Copy the local wxPython app source code into the container
-COPY . .
-
-# Set the display environment variable for GUI support
-ENV DISPLAY=:0
-
-# Run the wxPython GUI app
-CMD ["python", "devsimpy.py"]
+# Utiliser une base Ubuntu
+FROM ubuntu:22.04
+
+# Mettre à jour et installer les dépendances nécessaires
+RUN apt-get update && apt-get install -y \
+    xfce4 xfce4-goodies \
+    x11vnc xvfb \
+    python3 python3-pip python3-venv \
+    supervisor wget curl git \
+    && rm -rf /var/lib/apt/lists/*
+
+# Installer noVNC
+RUN mkdir -p /opt/novnc \
+    && git clone https://github.com/novnc/noVNC.git /opt/novnc \
+    && git clone https://github.com/novnc/websockify /opt/novnc/utils/websockify \
+    && ln -s /opt/novnc/vnc.html /opt/novnc/index.html
+
+# Installer TigerVNC
+RUN apt-get update && apt-get install -y tigervnc-standalone-server
+
+# Installer DEVSimPy
+RUN python3 -m venv /opt/devsimpy-env \
+    && /opt/devsimpy-env/bin/pip install --upgrade pip \
+    && /opt/devsimpy-env/bin/pip install devsimpy wxpython
+
+# Configurer un mot de passe VNC (par défaut "password")
+RUN mkdir -p /root/.vnc \
+    && echo "password" | vncpasswd -f > /root/.vnc/passwd \
+    && chmod 600 /root/.vnc/passwd
+
+# Configurer Supervisor pour gérer les services
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Exposer les ports VNC et noVNC
+EXPOSE 5901 6080
+
+# Lancer les services
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

devsimpy/PreferencesGUI.py

@@ -264,18 +264,11 @@ def OnwxPythonVersionChanged(self, event):
 
 		### if ini file exist we remove old section and option
 		if os.path.exists(path):
-			try:
+			if parser.has_option(section, option):
 				parser.remove_option(section, option)
-			except:
-				pass
-			try:
+			if parser.has_section(section):
 				parser.remove_section(section)
-			except:
-				pass
-			try:
-				parser.add_section(section)
-			except:
-				pass
+			parser.add_section(section)
 
 		if not parser.has_section(section):
 			parser.add_section(section)
@@ -400,21 +393,15 @@ def InitUI(self):
 	def OnAbout(self, evt):
 		""" Search doc directory into 'doc' directory of DEVS package
 		"""
-		### DEVS package
 		choice = self.cb3.GetValue()
+		doc_path = os.path.join(os.path.dirname(getattr(builtins, 'DEVS_DIR_PATH_DICT').get(choice)), 'doc', 'index.html')
 
-		### possible path of doc directory
-		path = os.path.join(os.path.dirname(getattr(builtins,'DEVS_DIR_PATH_DICT').get(choice)), 'doc', 'index.html')
-
-		### Html frame
-		frame = HtmlFrame(self, wx.NewIdRef(), "Doc", (600,600))
-		### if page exist in <package_dir>/<doc>
-		if os.path.exists(path):
-			frame.LoadFile(path)
+		frame = HtmlFrame(self, wx.NewIdRef(), "Doc", (600, 600))
+		if os.path.exists(doc_path):
+			frame.LoadFile(doc_path)
 		else:
-			frame.SetPage(_("<p> %s documentation directory not found! <p>")%choice)
+			frame.SetPage(_("<p> %s documentation directory not found! <p>") % choice)
 
-		### Show frame
 		frame.Show()
 
 	def OnSelectSound(self, evt):
@@ -463,8 +450,7 @@ def onCb1Check(self, evt):
 	def onCb4(self, evt):
 		""" ComboBox has been checked.
 		"""
-		val = evt.GetEventObject().GetValue()
-		self.sim_defaut_strategy = val
+		self.sim_defaut_strategy = evt.GetEventObject().GetValue()
 
 	def onCb3(self, evt):
 		""" ComboBox has been checked.
@@ -490,8 +476,7 @@ def onCb3(self, evt):
 	def onSc(self, evt):
 		""" CheckBox has been checked.
 		"""
-		val = evt.GetEventObject().GetValue()
-		self.sim_defaut_plot_dyn_freq = val
+		self.sim_defaut_plot_dyn_freq = evt.GetEventObject().GetValue()
 
 	def OnApply(self, evt):
 		""" Apply changes.
@@ -559,11 +544,7 @@ def InitUI(self):
 		choices = []
 
 		for editor in EditorPanel.EDITORS:
-			try:
-				importlib.import_module(editor)
-			except:
-				pass
-			else:
+			if importlib.util.find_spec(editor) is not None:
 				choices.append(editor)
 
 		### add the choice object to select one external code editor
@@ -602,17 +583,16 @@ def OnUpdateExternalEditors(self, event):
 		""" Update Button has been clicked in order to update the list of available external editors.
 		"""
 
-		installed = False
+		installed_editors = []
 		for editor in EditorPanel.EDITORS:
 			if self.choice.FindString(editor) == wx.NOT_FOUND and BuzyCursorNotification(install(editor)):
-				installed = True
-				items = self.choice.GetItems()+[editor]
-				self.choice.SetItems(items)
+				installed_editors.append(editor)
 
-		if installed:
-			msg = _('You need to restart DEVSimPy to use the new installed code editor.')
+		if installed_editors:
+			self.choice.AppendItems(installed_editors)
+			msg = _('You need to restart DEVSimPy to use the newly installed code editor(s).')
 		else:
-			msg = _('All external editors are installed.')
+			msg = _('All external editors are already installed.')
 
 		dial = wx.MessageDialog(self.parent, msg, _("External Code Editor Installation"), wx.OK | wx.ICON_INFORMATION)
 		dial.ShowModal()

devsimpy/searchTreeList.py

@@ -2,6 +2,8 @@
 import sys
 
 class TreeItem(object):
+	"""
+	"""
 	def __init__(self, text, data=None, filterable=True):
 		self._children = []
 		self._text = text

supervisord.conf

@@ -0,0 +1,27 @@
+[supervisord]
+nodaemon=true
+
+[program:Xvfb]
+command=Xvfb :1 -screen 0 1920x1080x24
+autostart=true
+autorestart=true
+
+[program:fluxbox]
+command=fluxbox
+autostart=true
+autorestart=true
+
+[program:x11vnc]
+command=x11vnc -display :1 -forever -shared -rfbport 5901 -passwd password
+autostart=true
+autorestart=true
+
+[program:noVNC]
+command=/opt/novnc/utils/novnc_proxy --vnc localhost:5901 --listen 6080
+autostart=true
+autorestart=true
+
+[program:devsimpy]
+command=python /app/devsimpy.py
+autostart=true
+autorestart=true