git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f99c094
)
patch by Pieter Grimmerink: fix partial lines returned from ipkg
author
Felix Domke
<tmbinc@elitedvb.net>
Sun, 16 Dec 2007 20:40:32 +0000
(20:40 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Sun, 16 Dec 2007 20:40:32 +0000
(20:40 +0000)
lib/python/Screens/PluginBrowser.py
patch
|
blob
|
history
diff --git
a/lib/python/Screens/PluginBrowser.py
b/lib/python/Screens/PluginBrowser.py
index fbb809d735f3684f3f85be75cb53c4ccb9b52613..fbbc128dd42dd89b0131e7432cf1a26a1c67ec6c 100644
(file)
--- a/
lib/python/Screens/PluginBrowser.py
+++ b/
lib/python/Screens/PluginBrowser.py
@@
-91,7
+91,9
@@
class PluginDownloadBrowser(Screen):
self["text"] = Label(_("Getting plugin information. Please wait..."))
self.run = 0
self["text"] = Label(_("Getting plugin information. Please wait..."))
self.run = 0
-
+
+ self.remainingdata = ""
+
self["actions"] = ActionMap(["WizardActions"],
{
"ok": self.go,
self["actions"] = ActionMap(["WizardActions"],
{
"ok": self.go,
@@
-142,6
+144,7
@@
class PluginDownloadBrowser(Screen):
self.close()
def runFinished(self, retval):
self.close()
def runFinished(self, retval):
+ self.remainingdata = ""
if self.run == 0:
self.run = 1
if self.type == self.DOWNLOAD:
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):
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:
plugin = x.split(" - ")
if len(plugin) == 3:
if self.run == 1 and self.type == self.DOWNLOAD: