X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/061f02110eeeb6f8b44b2d3229a098c3c270f10c..f37aa673fead3c929789ef19af3f992f0f4be7a2:/lib/python/Plugins/update/plugin.py

diff --git a/lib/python/Plugins/update/plugin.py b/lib/python/Plugins/update/plugin.py
index 79f67490..070c199c 100644
--- a/lib/python/Plugins/update/plugin.py
+++ b/lib/python/Plugins/update/plugin.py
@@ -2,26 +2,30 @@ from enigma import *
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Components.ActionMap import ActionMap
-from Components.Label import Label
+from Components.ScrollLabel import ScrollLabel
+from Components.GUIComponent import *
+from Plugins.Plugin import PluginDescriptor
 
 import os
 
-class Example(Screen):
+class Upgrade(Screen):
 	skin = """
 		<screen position="100,100" size="550,400" title="IPKG upgrade..." >
 			<widget name="text" position="0,0" size="550,400" font="Regular;15" />
 		</screen>"""
 		
-	def __init__(self, session):
-		self.skin = Example.skin
+	def __init__(self, session, args = None):
+		self.skin = Upgrade.skin
 		Screen.__init__(self, session)
 
-		self["text"] = Label(_("Please press OK!"))
+		self["text"] = ScrollLabel(_("Please press OK!"))
 				
-		self["actions"] = ActionMap(["WizardActions"], 
+		self["actions"] = ActionMap(["WizardActions", "DirectionActions"], 
 		{
 			"ok": self.go,
-			"back": self.close
+			"back": self.close,
+			"up": self["text"].pageUp,
+			"down": self["text"].pageDown
 		}, -1)
 		
 		self.update = True
@@ -35,7 +39,7 @@ class Example(Screen):
 			self.close()
 	
 	def doUpdateDelay(self):
-		lines = os.popen("ipkg update && ipkg upgrade", "r").readlines()
+		lines = os.popen("ipkg update && ipkg upgrade -force-defaults -force-overwrite", "r").readlines()
 		string = ""
 		for x in lines:
 			string += x
@@ -48,21 +52,118 @@ class Example(Screen):
 			self["text"].setText(_("Updating... Please wait... This can take some minutes..."))
 			self.delayTimer.start(0, 1)
 		else:
-			self.close()		
+			self.close()
+
+RT_HALIGN_LEFT = 0
+RT_HALIGN_RIGHT = 1
+RT_HALIGN_CENTER = 2
+RT_HALIGN_BLOCK = 4
+
+RT_VALIGN_TOP = 0
+RT_VALIGN_CENTER = 8
+RT_VALIGN_BOTTOM = 16
+
+def PacketEntryComponent(packet):
+	res = [ packet ]
+	
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0,250, 30, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, packet[0]))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 250, 0, 200, 30, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, packet[1]))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 450, 0, 100, 30, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, packet[2]))
+	return res
+
+class PacketList(GUIComponent):
+	def __init__(self, list):
+		GUIComponent.__init__(self)
+		self.l = eListboxPythonMultiContent()
+		self.l.setList(list)
+		self.l.setFont(0, gFont("Regular", 20))
+		self.l.setFont(1, gFont("Regular", 18))
+	
+	def getCurrent(self):
+		return self.l.getCurrentSelection()
+	
+	def GUIcreate(self, parent):
+		self.instance = eListbox(parent)
+		self.instance.setContent(self.l)
+		self.instance.setItemHeight(30)
+	
+	def GUIdelete(self):
+		self.instance.setContent(None)
+		self.instance = None
+
+	def invalidate(self):
+		self.l.invalidate()
+
+class Ipkg(Screen):
+	skin = """
+		<screen position="100,100" size="550,400" title="IPKG upgrade..." >
+			<widget name="list" position="0,0" size="550,400" scrollbarMode="showOnDemand" />
+		</screen>"""
 		
-#def autostart():
-	#print "**************************** AUTOSTART"
-#
-#def autoend():
-	#print "**************************** AUTOEND"
+	def __init__(self, session, args = None):
+		self.skin = Ipkg.skin
+		Screen.__init__(self, session)
+	
+		list = []
+		self.list = list
+		self.fillPacketList()
 
-def getPicturePaths():
-	return ["update.png"]
+		self["list"] = PacketList(self.list)
+				
+		self["actions"] = ActionMap(["WizardActions"], 
+		{
+			"ok": self.close,
+			"back": self.close
+		}, -1)
+		
 
-def getPlugins():
-	return [("Softwareupdate", "screen", "Example")]
+	def fillPacketList(self):
+		lines = os.popen("ipkg list", "r").readlines()
+		packetlist = []
+		for x in lines:
+			split = x.split(' - ')
+			packetlist.append([split[0].strip(), split[1].strip()])
+		
+		lines = os.popen("ipkg list_installed", "r").readlines()
+		
+		installedlist = {}
+		for x in lines:
+			split = x.split(' - ')
+			installedlist[split[0].strip()] = split[1].strip()
+		
+		for x in packetlist:
+			status = ""
+			if installedlist.has_key(x[0]):
+				if installedlist[x[0]] == x[1]:
+					status = "installed"
+				else:
+					status = "upgradable"
+			self.list.append(PacketEntryComponent([x[0], x[1], status]))
+		
+	def go(self):
+		if self.update:
+			self.session.openWithCallback(self.doUpdate, MessageBox, _("Do you want to update your Dreambox?\nAfter pressing OK, please wait!"))		
+		else:
+			self.close()
+	
+	def doUpdateDelay(self):
+		lines = os.popen("ipkg update && ipkg upgrade", "r").readlines()
+		string = ""
+		for x in lines:
+			string += x
+		self["text"].setText(_("Updating finished. Here is the result:") + "\n\n" + string)
+		self.update = False
+			
 	
-def getMenuRegistrationList():
-	list = []
-	list.append(("setup", 2, "Softwareupdate", "Example"))
-	return list
\ No newline at end of file
+	def doUpdate(self, val = False):
+		if val == True:
+			self["text"].setText(_("Updating... Please wait... This can take some minutes..."))
+			self.delayTimer.start(0, 1)
+		else:
+			self.close()
+
+def main(session):
+	session.open(Upgrade)
+
+def Plugins():
+	return PluginDescriptor(name="Softwareupdate", description="Updates your receiver's software", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)