From 9015ce354743d7a3a73400c8b91cd85a6ceaeb96 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 13 Feb 2009 08:13:40 +0100 Subject: remove IPKGInstaller and ConfigurationBackup start working on Softwaremanager --- .../Plugins/Extensions/IpkgInstaller/.cvsignore | 4 -- .../Plugins/Extensions/IpkgInstaller/Makefile.am | 5 -- .../Plugins/Extensions/IpkgInstaller/__init__.py | 0 .../Plugins/Extensions/IpkgInstaller/plugin.py | 67 ---------------------- lib/python/Plugins/Extensions/Makefile.am | 2 +- 5 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 lib/python/Plugins/Extensions/IpkgInstaller/.cvsignore delete mode 100644 lib/python/Plugins/Extensions/IpkgInstaller/Makefile.am delete mode 100644 lib/python/Plugins/Extensions/IpkgInstaller/__init__.py delete mode 100644 lib/python/Plugins/Extensions/IpkgInstaller/plugin.py mode change 100644 => 100755 lib/python/Plugins/Extensions/Makefile.am (limited to 'lib/python/Plugins/Extensions') diff --git a/lib/python/Plugins/Extensions/IpkgInstaller/.cvsignore b/lib/python/Plugins/Extensions/IpkgInstaller/.cvsignore deleted file mode 100644 index 138b9cc2..00000000 --- a/lib/python/Plugins/Extensions/IpkgInstaller/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*.pyc -*.pyo -Makefile -Makefile.in diff --git a/lib/python/Plugins/Extensions/IpkgInstaller/Makefile.am b/lib/python/Plugins/Extensions/IpkgInstaller/Makefile.am deleted file mode 100644 index ece0698f..00000000 --- a/lib/python/Plugins/Extensions/IpkgInstaller/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/IpkgInstaller - -install_PYTHON = \ - __init__.py \ - plugin.py diff --git a/lib/python/Plugins/Extensions/IpkgInstaller/__init__.py b/lib/python/Plugins/Extensions/IpkgInstaller/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py b/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py deleted file mode 100644 index 4893dc47..00000000 --- a/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py +++ /dev/null @@ -1,67 +0,0 @@ -from Components.ActionMap import ActionMap -from Components.Ipkg import IpkgComponent -from Components.Label import Label -from Components.SelectionList import SelectionList -from Plugins.Plugin import PluginDescriptor -from Screens.Ipkg import Ipkg -from Screens.Screen import Screen - -class IpkgInstaller(Screen): - skin = """ - - - - - - - - """ - - def __init__(self, session, list): - self.skin = IpkgInstaller.skin - Screen.__init__(self, session) - - self.list = SelectionList() - self["list"] = self.list - for listindex in range(len(list)): - self.list.addSelection(list[listindex], list[listindex], listindex, True) - - self["red"] = Label() - self["green"] = Label() - self["yellow"] = Label() - self["blue"] = Label() - - self["actions"] = ActionMap(["OkCancelActions", "ColorActions"], - { - "ok": self.list.toggleSelection, - "cancel": self.close, - "green": self.install - }, -1) - - def install(self): - list = self.list.getSelectionsList() - cmdList = [] - for item in list: - cmdList.append((IpkgComponent.CMD_INSTALL, { "package": item[1] })) - print cmdList - self.session.open(Ipkg, cmdList = cmdList) - -def filescan_open(list, session, **kwargs): - filelist = [x.path for x in list] - session.open(IpkgInstaller, filelist) # list - -def filescan(**kwargs): - from Components.Scanner import Scanner, ScanPath - return \ - Scanner(mimetypes = ["application/x-debian-package"], - paths_to_scan = - [ - ScanPath(path = "ipk", with_subdirs = True), - ScanPath(path = "", with_subdirs = False), - ], - name = "Ipkg", - description = "Install software updates...", - openfnc = filescan_open, ) - -def Plugins(**kwargs): - return [ PluginDescriptor(name="Ipkg", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan) ] diff --git a/lib/python/Plugins/Extensions/Makefile.am b/lib/python/Plugins/Extensions/Makefile.am old mode 100644 new mode 100755 index 9f3737aa..edbd2084 --- a/lib/python/Plugins/Extensions/Makefile.am +++ b/lib/python/Plugins/Extensions/Makefile.am @@ -1 +1 @@ -SUBDIRS = TuxboxPlugins FileManager CutListEditor PicturePlayer MediaScanner MediaPlayer IpkgInstaller GraphMultiEPG SocketMMI DVDPlayer DVDBurn +SUBDIRS = TuxboxPlugins FileManager CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDPlayer DVDBurn -- cgit v1.2.3 From 60881a22938560d1b583797ddf74b62d24926517 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 13 Feb 2009 08:17:55 +0100 Subject: do not show inaccessible devices in deviceselection --- lib/python/Plugins/Extensions/MediaScanner/plugin.py | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 lib/python/Plugins/Extensions/MediaScanner/plugin.py (limited to 'lib/python/Plugins/Extensions') diff --git a/lib/python/Plugins/Extensions/MediaScanner/plugin.py b/lib/python/Plugins/Extensions/MediaScanner/plugin.py old mode 100644 new mode 100755 index 88b917ee..2c31197d --- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py +++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py @@ -42,6 +42,9 @@ def scan(session): parts = [ (r.description, r.mountpoint, session) for r in harddiskmanager.getMountedPartitions(onlyhotplug = False)] if len(parts): + for x in parts: + if not access(x[1], F_OK|R_OK): + parts.remove(x) session.openWithCallback(mountpoint_choosen, ChoiceBox, title = _("Please Select Medium to be Scanned"), list = parts) def main(session, **kwargs): -- cgit v1.2.3 From 8530482b1d58468eade8ae2cfd618c694bef75d2 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 13 Feb 2009 10:51:23 +0100 Subject: really only show accessible devices --- lib/python/Plugins/Extensions/MediaScanner/plugin.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/python/Plugins/Extensions') diff --git a/lib/python/Plugins/Extensions/MediaScanner/plugin.py b/lib/python/Plugins/Extensions/MediaScanner/plugin.py index 2c31197d..b43662ef 100755 --- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py +++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py @@ -45,6 +45,9 @@ def scan(session): for x in parts: if not access(x[1], F_OK|R_OK): parts.remove(x) + for x in parts: # first run sometimes skips an entry + if not access(x[1], F_OK|R_OK): + parts.remove(x) session.openWithCallback(mountpoint_choosen, ChoiceBox, title = _("Please Select Medium to be Scanned"), list = parts) def main(session, **kwargs): -- cgit v1.2.3 From 954ca139746278ae94ba5a5b0aaccbf5a2dcd13b Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 13 Feb 2009 10:55:43 +0100 Subject: Revert "really only show accessible devices" This reverts commit 8530482b1d58468eade8ae2cfd618c694bef75d2. --- lib/python/Plugins/Extensions/MediaScanner/plugin.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib/python/Plugins/Extensions') diff --git a/lib/python/Plugins/Extensions/MediaScanner/plugin.py b/lib/python/Plugins/Extensions/MediaScanner/plugin.py index b43662ef..2c31197d 100755 --- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py +++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py @@ -45,9 +45,6 @@ def scan(session): for x in parts: if not access(x[1], F_OK|R_OK): parts.remove(x) - for x in parts: # first run sometimes skips an entry - if not access(x[1], F_OK|R_OK): - parts.remove(x) session.openWithCallback(mountpoint_choosen, ChoiceBox, title = _("Please Select Medium to be Scanned"), list = parts) def main(session, **kwargs): -- cgit v1.2.3