start & restart options added + services toggles disabled

Author: AXeL-dev

icons/xampp-dark.svg

@@ -9,7 +9,7 @@
 gi.require_version('Gtk', '3.0')
 gi.require_version('AppIndicator3', '0.1')
 from gi.repository import Gtk, GLib, AppIndicator3 as AI
-import os, sys, subprocess
+import os, subprocess
 
 class ServiceStatus:
 	On, Off, Disabled = ("RUNNING", "NOTRUNNING", "DEACTIVATED")
@@ -19,49 +19,68 @@ def __init__(self):
 		# Setup Indicator Applet
 		self.indicator = AI.Indicator.new("xampp-indicator", "xampp", AI.IndicatorCategory.APPLICATION_STATUS)
 		self.indicator.set_status(AI.IndicatorStatus.ACTIVE)
-		self.indicator.set_icon(self.get_icon())
 
 		# Set Attributes
 		xampp_path = "/opt/lampp"
 		self.xampp_bin = os.path.join(xampp_path, "lampp")
 		self.control_panel_bin = os.path.join(xampp_path, "manager-linux-x64.run")
 		if not os.path.exists(self.control_panel_bin):
 			self.control_panel_bin = os.path.join(xampp_path, "manager-linux.run")
+		self.serviceMenuItems = {}
 		self.services = {
-			"APACHE": "apache",
-			"MYSQL": "mysql",
-			"PROFTPD": "ftp"
+			"APACHE": {
+				"label": "Apache",
+				"name": "apache",
+				"status_key": "APACHE"
+			},
+			"MYSQL": {
+				"label": "MySQL",
+				"name": "mysql",
+				"status_key": "APACHE" # i used APACHE status here because MYSQL status returns Off when get status command is not executed as administrator (using pkexec or sudo)
+			}
+			,
+			"PROFTPD": {
+				"label": "FTP",
+				"name": "ftp",
+				#"enabled": True,
+				"status_key": "PROFTPD"
+			}
 		}
 
 		# Get Xampp Status
 		self.status = self.get_xampp_status()
 
+		# Set Indicator Icon
+		self.set_icon()
+
 		# Setup The Menu
 		self.menu = Gtk.Menu()
 
-		# Menu Item: Apache
-		service_name = "APACHE"
-		self.apacheItem = Gtk.CheckMenuItem("Apache")
-		if service_name in self.status and self.status[service_name] == ServiceStatus.On:
-			self.apacheItem.set_active(True)
-		self.apacheItem.connect("activate", self.toggle_service, service_name)
-		self.menu.append(self.apacheItem)
-
-		# Menu Item: MySQL
-		service_name = "MYSQL"
-		self.mySqlItem = Gtk.CheckMenuItem("MySQL")
-		if service_name in self.status and self.status[service_name] == ServiceStatus.On:
-			self.mySqlItem.set_active(True)
-		self.mySqlItem.connect("activate", self.toggle_service, service_name)
-		self.menu.append(self.mySqlItem)
-
-		# Menu Item: FTP
-		service_name = "PROFTPD"
-		self.mySqlItem = Gtk.CheckMenuItem("FTP")
-		if service_name in self.status and self.status[service_name] == ServiceStatus.On:
-			self.mySqlItem.set_active(True)
-		self.mySqlItem.connect("activate", self.toggle_service, service_name)
-		self.menu.append(self.mySqlItem)
+		# Menu Item: Start
+		status_key = "APACHE"
+		if status_key in self.status and self.status[status_key] == ServiceStatus.On:
+			label = "Stop"
+		else:
+			label = "Start"
+		startStopItem = Gtk.MenuItem(label)
+		startStopItem.connect("activate", self.start_stop_xampp)
+		self.menu.append(startStopItem)
+
+		# Menu Item: Restart
+		restartItem = Gtk.MenuItem("Restart")
+		restartItem.connect("activate", self.restart_xampp)
+		self.menu.append(restartItem)
+		self.menu.append(Gtk.SeparatorMenuItem())
+
+		# Service Menu Items
+		for service in self.services:
+			self.serviceMenuItems[service] = Gtk.CheckMenuItem(self.services[service]["label"])
+			if "enabled" not in self.services[service] or not self.services[service]["enabled"]:
+				self.serviceMenuItems[service].set_sensitive(False) # Disable service toggle due to MYSQL get status issue
+			if self.services[service]["status_key"] in self.status and self.status[self.services[service]["status_key"]] == ServiceStatus.On:
+				self.serviceMenuItems[service].set_active(True)
+			self.serviceMenuItems[service].connect("activate", self.toggle_service, service)
+			self.menu.append(self.serviceMenuItems[service])
 		self.menu.append(Gtk.SeparatorMenuItem())
 
 		# Menu Item: Control Panel
@@ -101,50 +120,103 @@ def get_xampp_status(self):
 	def launch_control_panel(self, widget):
 		subprocess.Popen(["pkexec", self.control_panel_bin])
 
-	def toggle_service(self, widget, service_name):
+	def start_stop_xampp(self, widget):
+		# Disable Widget
+		widget.set_sensitive(False)
+		# Change Widget Label
+		label = widget.get_label()
+		widget.set_label(label + "...")
+		# Start or Stop Xampp
+		status_key = "APACHE"
+		if status_key in self.status and self.status[status_key] == ServiceStatus.On:
+			self.stop_service()
+			new_label = "Start"
+		else:
+			self.start_service()
+			new_label = "Stop"
+		# Update Status after 10 seconds
+		GLib.timeout_add_seconds(10, self.update_status, widget, new_label)
+
+	def restart_xampp(self, widget):
+		# Disable Widget
+		widget.set_sensitive(False)
+		# Set Indicator Icon "Off"
+		self.set_icon("xampp-dark.svg")
+		# Change Widget Label
+		label = widget.get_label()
+		widget.set_label(label + "...")
+		# Restart Xampp
+		self.restart_service()
+		# Update Status after 10 seconds
+		GLib.timeout_add_seconds(10, self.update_status, widget, label)
+
+	def toggle_service(self, widget, service):
 		if widget.get_sensitive():
 			# Change Widget Label
 			label = widget.get_label()
 			widget.set_label(label + "...")
 			# Disable Widget
 			widget.set_sensitive(False)
 			# Toggle Service
-			if self.status[service_name] == ServiceStatus.On:
-				self.stop_service(self.services[service_name])
+			if self.status[service] == ServiceStatus.On:
+				self.stop_service(self.services[service]["name"])
 			else:
-				self.start_service(self.services[service_name])
+				self.start_service(self.services[service]["name"])
 			# Update Status after 10 seconds
-			GLib.timeout_add_seconds(10, self.update_status, widget, service_name)
+			GLib.timeout_add_seconds(10, self.update_status, widget, label, service)
 
-	def update_status(self, widget, service_name):
+	def update_status(self, widget, widget_label = None, service = None):
 		# Update Xampp Status
 		self.status = self.get_xampp_status()
-		if service_name in self.status and self.status[service_name] == ServiceStatus.On:
-			widget.set_active(True)
+		if service is not None:
+			# Update Widget
+			if self.services[service]["status_key"] in self.status and self.status[self.services[service]["status_key"]] == ServiceStatus.On:
+				widget.set_active(True)
+			else:
+				widget.set_active(False)
 		else:
-			widget.set_active(False)
+			# Update All Service Menu Items
+			for service in self.services:
+				service_menu_item = self.serviceMenuItems[service]
+				was_sensitive = service_menu_item.get_sensitive()
+				if was_sensitive:
+					service_menu_item.set_sensitive(False)
+				if self.services[service]["status_key"] in self.status and self.status[self.services[service]["status_key"]] == ServiceStatus.On:
+					service_menu_item.set_active(True)
+				else:
+					service_menu_item.set_active(False)
+				if was_sensitive:
+					service_menu_item.set_sensitive(True)
 		# Change Widget Label
-		label = widget.get_label().replace("...", "")
-		widget.set_label(label)
+		if widget_label is not None:
+			widget.set_label(widget_label)
 		# Enable Widget
 		widget.set_sensitive(True)
+		# Set Indicator Icon
+		self.set_icon()
 
 		return False # Do not loop
 
-	def start_service(self, service):
-		p = subprocess.Popen(["pkexec", self.xampp_bin, "start" + service])
+	def start_service(self, service_name = ""):
+		subprocess.Popen(["pkexec", self.xampp_bin, "start" + service_name])
+
+	def stop_service(self, service_name = ""):
+		subprocess.Popen(["pkexec", self.xampp_bin, "stop" + service_name])
 
-	def stop_service(self, service):
-		p = subprocess.Popen(["pkexec", self.xampp_bin, "stop" + service])
+	def restart_service(self, service_name = ""):
+		subprocess.Popen(["pkexec", self.xampp_bin, "reload" + service_name])
 
-	def get_icon(self):
-		# Get Icon
-		icon = os.path.dirname(os.path.realpath(__file__)) + "/xampp.svg"
+	def set_icon(self, icon_name = None):
+		if icon_name is None:
+			icon_name = "xampp-dark.svg"
+			status_key = "APACHE"
+			if status_key in self.status and self.status[status_key] == ServiceStatus.On:
+				icon_name = "xampp.svg"
+		icon = os.path.dirname(os.path.realpath(__file__)) + "/icons/" + icon_name
 		if os.path.exists(icon):
-			return icon
+			self.indicator.set_icon(icon)
 		else:
 			print("ERROR: Cannot find icon : %s" % icon)
-			sys.exit(1)
 
 	def quit(self, widget):
 		Gtk.main_quit()