re-commit new NFIFlash plugin (bug #480)

[enigma2.git] / lib / python / Plugins / SystemPlugins / NFIFlash / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py b/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py
index 28b3330582afa44ccc554246018dc33372110d53..1eba1dd4004fbd337b4dce14fdaa4dc6b206e2ae 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py
@@ -2,6 +2,7 @@ from Plugins.Plugin import PluginDescriptor
 from Tools.HardwareInfo import HardwareInfo
 from Tools.Directories import fileExists
 from downloader import NFIDownload, filescan
+from flasher import NFIFlash
 
 def NFIFlasherMain(session, tmp = None, **kwargs):
        session.open(NFIDownload, "/home/root" )
@@ -13,16 +14,12 @@ def Plugins(**kwargs):
        # currently only available for DM8000
        if HardwareInfo().get_device_name() != "dm8000":
                return [PluginDescriptor()]
-       if fileExists("/usr/share/bootlogo-flasher.mvi"):
-               import flasher
-               # started from usb stick # don't try to be intelligent and trick this - it's not possible to rewrite the flash memory with a system currently booted from it
-               return [PluginDescriptor(where = PluginDescriptor.WHERE_WIZARD, fnc = (9,flasher.NFIFlash))]
-       else:
-               # started on real enigma2
-               return [PluginDescriptor(name=_("NFI Image Flashing"),
-                       description=_("Download .NFI-Files for USB-Flasher"),
-                       icon = "flash.png",
-                       where = PluginDescriptor.WHERE_SOFTWAREMANAGER,
-                       fnc={"SoftwareSupported": NFICallFnc, "menuEntryName": lambda x: _("NFI Image Flashing"),
-                            "menuEntryDescription": lambda x: _("Download .NFI-Files for USB-Flasher")}),
-                       PluginDescriptor(name="nfi", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)]
+       #return [PluginDescriptor(where = PluginDescriptor.WHERE_WIZARD, fnc = (9,NFIFlash))]
+               # it's not possible to rewrite the flash memory with a system currently booted from it
+       return [PluginDescriptor(name=_("NFI Image Flashing"),
+               description=_("Download .NFI-Files for USB-Flasher"),
+               icon = "flash.png",
+               where = PluginDescriptor.WHERE_SOFTWAREMANAGER,
+               fnc={"SoftwareSupported": NFICallFnc, "menuEntryName": lambda x: _("NFI Image Flashing"),
+                       "menuEntryDescription": lambda x: _("Download .NFI-Files for USB-Flasher")}),
+               PluginDescriptor(name="nfi", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)]