PluginBrowser.py: dont use "ipkg list_installed" on second run if "Download Plugins...

[enigma2.git] / lib / python / Screens / PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
old mode 100644 (file)
new mode 100755 (executable)
index e39c4b8..e3df4de
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -135,6 +135,9 @@ class PluginDownloadBrowser(Screen):
        def startIpkgListInstalled(self):
                self.container.execute("ipkg list_installed enigma2-plugin-*")
 
+       def startIpkgListAvailable(self):
+               self.container.execute("ipkg list enigma2-plugin-*")
+
        def startRun(self):
                self["list"].instance.hide()
                if self.type == self.DOWNLOAD:
@@ -143,7 +146,7 @@ class PluginDownloadBrowser(Screen):
                                self.container.execute("ipkg update")
                                PluginDownloadBrowser.lastDownloadDate = time()
                        else:
-                               self.startIpkgListInstalled()
+                               self.startIpkgListAvailable()
                elif self.type == self.REMOVE:
                        self.run = 1
                        self.startIpkgListInstalled()
@@ -162,7 +165,7 @@ class PluginDownloadBrowser(Screen):
                                self.startIpkgListInstalled()
                elif self.run == 1 and self.type == self.DOWNLOAD:
                        self.run = 2
-                       self.container.execute("ipkg list enigma2-plugin-*")
+                       self.startIpkgListAvailable()
                else:
                        if len(self.pluginlist) > 0:
                                self.updateList()
@@ -184,7 +187,7 @@ class PluginDownloadBrowser(Screen):
                        self.remainingdata = ""
 
                for x in lines:
-                       plugin = x.split(" - ")
+                       plugin = x.split(" - ", 2)
                        if len(plugin) == 3:
                                if self.run == 1 and self.type == self.DOWNLOAD:
                                        self.installedplugins.append(plugin[0])
@@ -202,7 +205,7 @@ class PluginDownloadBrowser(Screen):
                
                self.plugins = {}
                for x in self.pluginlist:
-                       split = x[3].split('-')
+                       split = x[3].split('-', 1)
                        if len(split) < 2:
                                continue
                        if not self.plugins.has_key(split[0]):