* Remove triple dot "..." from main menu entries and main menu plugin names.

[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 0f6ee74..69bf80f
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -1,5 +1,5 @@
 from Screen import Screen
 from Screen import Screen

-
+from Components.Language import language

 from enigma import eConsoleAppContainer
 
 from Components.ActionMap import ActionMap
 from enigma import eConsoleAppContainer
 
 from Components.ActionMap import ActionMap


@@ -9,29 +9,43 @@ from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Plugins.Plugin import PluginDescriptor
 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.Directories import resolveFilename, fileExists, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE

 from Tools.LoadPixmap import LoadPixmap
 
 from Tools.LoadPixmap import LoadPixmap
 

+from time import time
+
+def languageChanged():
+       plugins.clearPluginList()
+       plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))

 
 class PluginBrowser(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
                
 
 class PluginBrowser(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
                

-               self["red"] = Label(_("Remove Plugins"))
-               self["green"] = Label(_("Download Plugins"))
+               self["red"] = Label()
+               self["green"] = Label()

                
                self.list = []
                self["list"] = PluginList(self.list)
                
                self.list = []
                self["list"] = PluginList(self.list)

-               self.updateList()

                
                

-               self["actions"] = ActionMap(["WizardActions", "ColorActions"],
+               self["actions"] = ActionMap(["WizardActions"],

                {
                        "ok": self.save,
                        "back": self.close,
                {
                        "ok": self.save,
                        "back": self.close,

+               })
+               self["PluginDownloadActions"] = ActionMap(["ColorActions"],
+               {

                        "red": self.delete,
                        "green": self.download
                })
                        "red": self.delete,
                        "green": self.download
                })

-               self.onExecBegin.append(self.checkWarnings)
+               self["SoftwareActions"] = ActionMap(["ColorActions"],
+               {
+                       "red": self.openExtensionmanager
+               })
+               self["PluginDownloadActions"].setEnabled(False)
+               self["SoftwareActions"].setEnabled(False)
+               self.onFirstExecBegin.append(self.checkWarnings)
+               self.onShown.append(self.updateList)

        
        def checkWarnings(self):
                if len(plugins.warnings):
        
        def checkWarnings(self):
                if len(plugins.warnings):


@@ -42,32 +56,51 @@ class PluginBrowser(Screen):
                        self.session.open(MessageBox, text = text, type = MessageBox.TYPE_WARNING)
 
        def save(self):
                        self.session.open(MessageBox, text = text, type = MessageBox.TYPE_WARNING)
 
        def save(self):

-               #self.close()

                self.run()
        
        def run(self):
                plugin = self["list"].l.getCurrentSelection()[0]
                self.run()
        
        def run(self):
                plugin = self["list"].l.getCurrentSelection()[0]

-               

                plugin(session=self.session)
                
        def updateList(self):
                plugin(session=self.session)
                
        def updateList(self):

-               self.list = [ ]

                self.pluginlist = plugins.getPlugins(PluginDescriptor.WHERE_PLUGINMENU)
                self.pluginlist = plugins.getPlugins(PluginDescriptor.WHERE_PLUGINMENU)

-               for plugin in self.pluginlist:
-                       self.list.append(PluginEntryComponent(plugin))
-               
+               self.list = [PluginEntryComponent(plugin) for plugin in self.pluginlist]

                self["list"].l.setList(self.list)
                self["list"].l.setList(self.list)

-
+               if fileExists(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/SoftwareManager/plugin.py")):
+                       self["red"].setText(_("Manage extensions"))
+                       self["green"].setText("")
+                       self["SoftwareActions"].setEnabled(True)
+                       self["PluginDownloadActions"].setEnabled(False)
+               else:
+                       self["red"].setText(_("Remove Plugins"))
+                       self["green"].setText(_("Download Plugins"))
+                       self["SoftwareActions"].setEnabled(False)
+                       self["PluginDownloadActions"].setEnabled(True)
+                       

        def delete(self):
        def delete(self):

-               self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)
+               self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)

        
        def download(self):
        
        def download(self):

-               self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)
+               self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)
+
+       def PluginDownloadBrowserClosed(self):
+               self.updateList()
+               self.checkWarnings()
+
+       def openExtensionmanager(self):
+               if fileExists(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/SoftwareManager/plugin.py")):
+                       try:
+                               from Plugins.SystemPlugins.SoftwareManager.plugin import PluginManager
+                       except ImportError:
+                               self.session.open(MessageBox, _("The Softwaremanagement extension is not installed!\nPlease install it."), type = MessageBox.TYPE_INFO,timeout = 10 )
+                       else:
+                               self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginManager)

 
 class PluginDownloadBrowser(Screen):
        DOWNLOAD = 0
        REMOVE = 1
 
 class PluginDownloadBrowser(Screen):
        DOWNLOAD = 0
        REMOVE = 1

-       
+       lastDownloadDate = None
+

        def __init__(self, session, type):
                Screen.__init__(self, session)
                
        def __init__(self, session, type):
                Screen.__init__(self, session)
                


@@ -132,14 +165,25 @@ class PluginDownloadBrowser(Screen):
                elif self.type == self.REMOVE:
                        self.setTitle(_("Remove plugins"))
 
                elif self.type == self.REMOVE:
                        self.setTitle(_("Remove plugins"))
 

+       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:
        def startRun(self):
                self["list"].instance.hide()
                if self.type == self.DOWNLOAD:

-                       self.container.execute("ipkg update")
+                       if not PluginDownloadBrowser.lastDownloadDate or (time() - PluginDownloadBrowser.lastDownloadDate) > 3600:
+                               # Only update from internet once per hour
+                               self.container.execute("ipkg update")
+                               PluginDownloadBrowser.lastDownloadDate = time()
+                       else:
+                               self.startIpkgListAvailable()

                elif self.type == self.REMOVE:
                        self.run = 1
                elif self.type == self.REMOVE:
                        self.run = 1

-                       self.container.execute("ipkg list_installed enigma2-plugin-*")
-               
+                       self.startIpkgListInstalled()
+

        def installFinished(self):
                plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
                self.container.appClosed.remove(self.runFinished)
        def installFinished(self):
                plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
                self.container.appClosed.remove(self.runFinished)


@@ -151,10 +195,10 @@ class PluginDownloadBrowser(Screen):
                if self.run == 0:
                        self.run = 1
                        if self.type == self.DOWNLOAD:
                if self.run == 0:
                        self.run = 1
                        if self.type == self.DOWNLOAD:

-                               self.container.execute("ipkg list_installed enigma2-plugin-*")
+                               self.startIpkgListInstalled()

                elif self.run == 1 and self.type == self.DOWNLOAD:
                        self.run = 2
                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()
                else:
                        if len(self.pluginlist) > 0:
                                self.updateList()


@@ -176,10 +220,11 @@ class PluginDownloadBrowser(Screen):
                        self.remainingdata = ""
 
                for x in lines:
                        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:
                        if len(plugin) == 3:
                                if self.run == 1 and self.type == self.DOWNLOAD:

-                                       self.installedplugins.append(plugin[0])
+                                       if plugin[0] not in self.installedplugins:
+                                               self.installedplugins.append(plugin[0])

                                else:
                                        if plugin[0] not in self.installedplugins:
                                                plugin.append(plugin[0][15:])
                                else:
                                        if plugin[0] not in self.installedplugins:
                                                plugin.append(plugin[0][15:])


@@ -187,14 +232,14 @@ class PluginDownloadBrowser(Screen):
                                                self.pluginlist.append(plugin)
        
        def updateList(self):
                                                self.pluginlist.append(plugin)
        
        def updateList(self):

-               self.list = []
+               list = []

                expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expandable-plugins.png"))
                expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expanded-plugins.png"))
                verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/verticalline-plugins.png"))
                
                self.plugins = {}
                for x in self.pluginlist:
                expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expandable-plugins.png"))
                expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expanded-plugins.png"))
                verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/verticalline-plugins.png"))
                
                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]):
                        if len(split) < 2:
                                continue
                        if not self.plugins.has_key(split[0]):


@@ -204,10 +249,11 @@ class PluginDownloadBrowser(Screen):
                        
                for x in self.plugins.keys():
                        if x in self.expanded:
                        
                for x in self.plugins.keys():
                        if x in self.expanded:

-                               self.list.append(PluginCategoryComponent(x, expandedIcon))
-                               for plugin in self.plugins[x]:
-                                       self.list.append(PluginDownloadComponent(plugin[0], plugin[1]))
+                               list.append(PluginCategoryComponent(x, expandedIcon))
+                               list.extend([PluginDownloadComponent(plugin[0], plugin[1]) for plugin in self.plugins[x]])

                        else:
                        else:

-                               self.list.append(PluginCategoryComponent(x, expandableIcon))
-               self["list"].l.setList(self.list)
+                               list.append(PluginCategoryComponent(x, expandableIcon))
+               self.list = list
+               self["list"].l.setList(list)

 
 

+language.addCallback(languageChanged)
\ No newline at end of file