From 3bcad08ee14e46878802a48c32961faac3f51eef Mon Sep 17 00:00:00 2001 From: gutosie Date: Wed, 10 Mar 2021 14:14:08 +0200 Subject: [PATCH] Add files via upload --- NeoBoot/extract.py | 9 +++++---- NeoBoot/plugin.py | 16 +++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py index e3d4132..1666218 100644 --- a/NeoBoot/extract.py +++ b/NeoBoot/extract.py @@ -631,10 +631,11 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan # cmd = 'cp -f ' + extensions_path + 'NeoBoot/bin/hdd ' + getNeoLocation() + 'ImageBoot/%s/etc/init.d/hddusb' % target # rc = os.system(cmd) - cmd = 'cp -rf /usr/lib/periodon ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/periodon' % target - rc = os.system(cmd) - cmd = 'cp -rf /usr/lib/enigma2/python/Tools/Testinout.py ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Tools/Testinout.py' % target - rc = os.system(cmd) + if os.path.exists('%s/ImageBoot/%s/usr/lib' % (media, target)): + cmd = 'cp -rf /usr/lib/periodon ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/periodon' % target + rc = os.system(cmd) + cmd = 'cp -rf /usr/lib/enigma2/python/Tools/Testinout.py ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Tools/Testinout.py' % target + rc = os.system(cmd) os.system('mkdir -p ' + media_target + '/media/hdd' + dev_null) os.system('mkdir -p ' + media_target + '/media/usb' + dev_null) os.system('mkdir -p ' + media_target + '/var/lib/opkg/info/' + dev_null) diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index 1bb4bb3..6d5ffad 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -56,8 +56,8 @@ else: from Screens.Console import Console loggscrash = time.localtime(time.time()) -PLUGINVERSION = '9.20' -UPDATEVERSION = '9.20' +PLUGINVERSION = '9.21' +UPDATEVERSION = '9.21' UPDATEDATE = '"+%Y04%d"' LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' @@ -867,7 +867,8 @@ class NeoBootImageChoose(Screen): self.session.open(MessageBox, _('The plugin not installed.\nAccess Fails with Error code 0x04.'), MessageBox.TYPE_INFO, 10) self.close() else: - session.open(MessageBox, _('Geen internet'), type=MessageBox.TYPE_ERROR) + mess = _('Geen internet') + self.session.open(MessageBox, mess, MessageBox.TYPE_INFO) else: mess = _('Upload image files in zip formats to the ImagesUpload location.' ) self.session.open(MessageBox, mess, MessageBox.TYPE_INFO) @@ -1060,7 +1061,8 @@ class NeoBootImageChoose(Screen): ybox = self.session.openWithCallback(self.chackupdate2, MessageBox, message, MessageBox.TYPE_YESNO) ybox.setTitle(_('The download neoboot update.')) else: - session.open(MessageBox, _('Geen internet'), type=MessageBox.TYPE_ERROR) + mess = _('Geen internet') + self.session.open(MessageBox, mess, MessageBox.TYPE_INFO) def chackupdate2(self, yesno): if yesno: @@ -1517,7 +1519,8 @@ class NeoBootImageChoose(Screen): mess = (_('Directory %sImagesUpload is empty\nPlease upload the image files in zip or nfi formats to install') % getNeoLocation() ) self.session.open(MessageBox, mess, MessageBox.TYPE_INFO) else: - session.open(MessageBox, _('Geen internet'), type=MessageBox.TYPE_ERROR) + mess = _('Geen internet') + self.session.open(MessageBox, mess, MessageBox.TYPE_INFO) def bootIMG(self): if not fileExists('/.multinfo'): @@ -1687,8 +1690,7 @@ def main(session, **kwargs): try: session.open(NeoBootImageChoose) except: - from Plugins.Extensions.NeoReboot.plugin import ForceReboot - session.open(ForceReboot) + session.open(MessageBox, _('Open NeoReboot Force Reboot in MENU'), type=MessageBox.TYPE_ERROR else: if float(PLUGINVERSION) != version: try: