X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c142c89f08cefdb0984de7d004d4c3b2fa9f1ce2..5274c69abf4cb2b99ab9d92ac0081c0ec49bd2e4:/lib/python/Screens/PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index b3360b61..fbbc128d 100644
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -1,17 +1,17 @@
 from Screen import Screen
 
-from enigma import eConsoleAppContainer, loadPNG
+from enigma import eConsoleAppContainer
 
-from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.PluginComponent import plugins
 from Components.PluginList import *
-from Components.config import config
 from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Plugins.Plugin import PluginDescriptor
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
+from Tools.LoadPixmap import LoadPixmap
+
 
 class PluginBrowser(Screen):
 	def __init__(self, session):
@@ -91,7 +91,9 @@ class PluginDownloadBrowser(Screen):
 			self["text"] = Label(_("Getting plugin information. Please wait..."))
 		
 		self.run = 0
-				
+
+		self.remainingdata = ""
+
 		self["actions"] = ActionMap(["WizardActions"], 
 		{
 			"ok": self.go,
@@ -142,6 +144,7 @@ class PluginDownloadBrowser(Screen):
 		self.close()
 		
 	def runFinished(self, retval):
+		self.remainingdata = ""
 		if self.run == 0:
 			self.run = 1
 			if self.type == self.DOWNLOAD:
@@ -157,7 +160,19 @@ class PluginDownloadBrowser(Screen):
 				self["text"].setText("No new plugins found")
 
 	def dataAvail(self, str):
-		for x in str.split('\n'):
+		#prepend any remaining data from the previous call
+		str = self.remainingdata + str
+		#split in lines
+		lines = str.split('\n')
+		#'str' should end with '\n', so when splitting, the last line should be empty. If this is not the case, we received an incomplete line
+		if len(lines[-1]):
+			#remember this data for next time
+			self.remainingdata = lines[-1]
+			lines = lines[0:-1]
+		else:
+			self.remainingdata = ""
+
+		for x in lines:
 			plugin = x.split(" - ")
 			if len(plugin) == 3:
 				if self.run == 1 and self.type == self.DOWNLOAD:
@@ -170,9 +185,9 @@ class PluginDownloadBrowser(Screen):
 	
 	def updateList(self):
 		self.list = []
-		expandableIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "expandable-plugins.png"))
-		expandedIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "expanded-plugins.png"))
-		verticallineIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "verticalline-plugins.png"))
+		expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "expandable-plugins.png"))
+		expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "expanded-plugins.png"))
+		verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "verticalline-plugins.png"))
 		
 		self.plugins = {}
 		for x in self.pluginlist: