projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'dm/experimental' into test branch
[vuplus_dvbapp]
/
lib
/
python
/
Screens
/
PluginBrowser.py
diff --git
a/lib/python/Screens/PluginBrowser.py
b/lib/python/Screens/PluginBrowser.py
index
c7909ff
..
d423f46
100755
(executable)
--- a/
lib/python/Screens/PluginBrowser.py
+++ b/
lib/python/Screens/PluginBrowser.py
@@
-89,7
+89,6
@@
class PluginBrowser(Screen):
def openExtensionmanager(self):
if fileExists(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/SoftwareManager/plugin.py")):
def openExtensionmanager(self):
if fileExists(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/SoftwareManager/plugin.py")):
- print "blah"
try:
from Plugins.SystemPlugins.SoftwareManager.plugin import PluginManager
except ImportError:
try:
from Plugins.SystemPlugins.SoftwareManager.plugin import PluginManager
except ImportError:
@@
-156,9
+155,9
@@
class PluginDownloadBrowser(Screen):
def runInstall(self, val):
if val:
if self.type == self.DOWNLOAD:
def runInstall(self, val):
if val:
if self.type == self.DOWNLOAD:
- self.session.openWithCallback(self.installFinished, Console, cmdlist = ["
i
pkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
+ self.session.openWithCallback(self.installFinished, Console, cmdlist = ["
o
pkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
elif self.type == self.REMOVE:
elif self.type == self.REMOVE:
- self.session.openWithCallback(self.installFinished, Console, cmdlist = ["
i
pkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
+ self.session.openWithCallback(self.installFinished, Console, cmdlist = ["
o
pkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
def setWindowTitle(self):
if self.type == self.DOWNLOAD:
def setWindowTitle(self):
if self.type == self.DOWNLOAD:
@@
-167,17
+166,17
@@
class PluginDownloadBrowser(Screen):
self.setTitle(_("Remove plugins"))
def startIpkgListInstalled(self):
self.setTitle(_("Remove plugins"))
def startIpkgListInstalled(self):
- self.container.execute("
i
pkg list_installed enigma2-plugin-*")
+ self.container.execute("
o
pkg list_installed enigma2-plugin-*")
def startIpkgListAvailable(self):
def startIpkgListAvailable(self):
- self.container.execute("
i
pkg list enigma2-plugin-*")
+ self.container.execute("
o
pkg list enigma2-plugin-*")
def startRun(self):
self["list"].instance.hide()
if self.type == self.DOWNLOAD:
if not PluginDownloadBrowser.lastDownloadDate or (time() - PluginDownloadBrowser.lastDownloadDate) > 3600:
# Only update from internet once per hour
def startRun(self):
self["list"].instance.hide()
if self.type == self.DOWNLOAD:
if not PluginDownloadBrowser.lastDownloadDate or (time() - PluginDownloadBrowser.lastDownloadDate) > 3600:
# Only update from internet once per hour
- self.container.execute("
i
pkg update")
+ self.container.execute("
o
pkg update")
PluginDownloadBrowser.lastDownloadDate = time()
else:
self.startIpkgListAvailable()
PluginDownloadBrowser.lastDownloadDate = time()
else:
self.startIpkgListAvailable()
@@
-221,8
+220,8
@@
class PluginDownloadBrowser(Screen):
self.remainingdata = ""
for x in lines:
self.remainingdata = ""
for x in lines:
- plugin = x.split(" - "
, 2
)
- if len(plugin)
== 3
:
+ plugin = x.split(" - ")
+ if len(plugin)
>= 2
:
if self.run == 1 and self.type == self.DOWNLOAD:
if plugin[0] not in self.installedplugins:
self.installedplugins.append(plugin[0])
if self.run == 1 and self.type == self.DOWNLOAD:
if plugin[0] not in self.installedplugins:
self.installedplugins.append(plugin[0])
@@
-240,6
+239,13
@@
class PluginDownloadBrowser(Screen):
self.plugins = {}
for x in self.pluginlist:
self.plugins = {}
for x in self.pluginlist:
+ if len(x) < 4:
+ split = x[0].split('-',3)
+ if not self.plugins.has_key(split[2]):
+ self.plugins[split[2]] = []
+ self.plugins[split[2]].append((PluginDescriptor(name = x[2], description = " ", icon = verticallineIcon), split[3]))
+ continue
+
split = x[3].split('-', 1)
if len(split) < 2:
continue
split = x[3].split('-', 1)
if len(split) < 2:
continue
@@
-257,4
+263,4
@@
class PluginDownloadBrowser(Screen):
self.list = list
self["list"].l.setList(list)
self.list = list
self["list"].l.setList(list)
-language.addCallback(languageChanged)
\ No newline at end of file
+language.addCallback(languageChanged)