update 9.01

This commit is contained in:
gutosie
2020-05-19 20:05:22 +03:00
committed by GitHub
parent 5b6b19fe35
commit 657b1da170
6 changed files with 165 additions and 54 deletions

View File

@@ -7,7 +7,10 @@ from Tools.Directories import fileExists, pathExists, fileCheck
from Tools.CList import CList
from Components.SystemInfo import SystemInfo
from Components.Console import Console
try:
from Task import LoggingTask
except:
from Components.Task import LoggingTask
import Task
from Screens.Screen import Screen
from Components.ActionMap import ActionMap
@@ -973,6 +976,9 @@ class HarddiskSetup(Screen):
def hddConfirmed(self, confirmed):
if not confirmed:
return
try:
from Task import job_manager
except:
from Components.Task import job_manager
try:
job = self.action()

View File

@@ -89,8 +89,14 @@ class ManagerDevice(Screen):
self.onShown.append(self.setWindowTitle)
def Format_ext3(self):
try:
if fileExists('/etc/vtiversion.info') or fileExists('/etc/bhversion'):
self.session.open(MessageBox, _("This option is available only from openpli or derivatives."), MessageBox.TYPE_INFO, timeout=10)
else:
from Harddisk import HarddiskSelection
self.session.openWithCallback(self.updateList, HarddiskSelection)
except:
self.session.open(MessageBox, _("This option is available only from openpli or derivatives."), MessageBox.TYPE_INFO, timeout=10)
def Format_ext4(self):
from Screens.HarddiskSetup import HarddiskSelection

View File

@@ -0,0 +1,16 @@
#!/bin/sh
#DESCRIPTION=This script by gutosie
opkg update
opkg install --force-reinstall mtd-utils
opkg install --force-reinstall mtd-utils-ubifs
opkg install --force-reinstall mtd-utils-jffs2
opkg install --force-reinstall kernel-module-nandsim
opkg install --force-reinstall python-subprocess
opkg install --force-reinstall python-argparse
opkg install --force-reinstall curl
opkg install --force-reinstall liblzo2-2
opkg install --force-reinstall python-imaging
opkg install --force-maintainer --force-reinstall --force-overwrite kernel-image
opkg configure update-modules
cd

View File

@@ -0,0 +1,27 @@
#!/bin/sh
#script by gutosie
if `grep -q 'osd.language=pl_PL' </etc/enigma2/settings`; then
PL=1
fi
IMAGE=ImageBoot
LOCATIONBACKUP=CopyNEOBoot
NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location)
TiME=$(date +"%Y%m%d_%H%M%S")
UPDATEv=$(cat $NEOBOOTMOUNT/ImageBoot/.updateversion)
NB=_NeoBoot_
if [ ! -e $NEOBOOTMOUNT$LOCATIONBACKUP ]; then
mkdir $NEOBOOTMOUNT$LOCATIONBACKUP > /dev/null 2>&1
/bin/tar -czf $NEOBOOTMOUNT/CopyNEOBoot/Copy_$UPDATEv$NB$TiME.tar.gz /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot*/
echo " "
[ $PL ] && echo "Kopia wtyczki neoboot o nazwie Copy_$UPDATEv$NB$TiME.tar.gz utworzono w:" $NEOBOOTMOUNT$LOCATIONBACKUP" " || echo "Copy named Copy_$UPDATEv$NB$TiME.tar.gz was created at location:" $NEOBOOTMOUNT$LOCATIONBACKUP" "
echo " "
else
/bin/tar -czf $NEOBOOTMOUNT/CopyNEOBoot/Copy_$UPDATEv$NB$TiME.tar.gz /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot*/
echo " "
[ $PL ] && echo "Kopia wtyczki o nazwie Copy_$UPDATEv$NB$TiME.tar.gz utworzono w:" $NEOBOOTMOUNT$LOCATIONBACKUP" " || echo "Copy named Copy_$UPDATEv$NB$TiME.tar.gz was created at location:" $NEOBOOTMOUNT$LOCATIONBACKUP" "
echo " "
fi
exit 0

View File

@@ -95,14 +95,13 @@ class BoundFunction:
self.fnc(*self.args)
# <ePixmap position="587,631" zPosition="-2" size="545,340" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/matrix.png" />
class MBTools(Screen):
if isFHD():
skin = """<screen name="MBTools" position="70,93" size="910,938" title="NeoBoot tools">
<eLabel position="20,68" size="890,2" backgroundColor="blue" foregroundColor="blue" name="linia" />
<eLabel position="20,935" size="890,2" backgroundColor="blue" foregroundColor="blue" name="linia" />
<ePixmap position="25,-1" size="45,65" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/updown.png" alphatest="on" />
<eLabel backgroundColor="background" font="Regular; 30" foregroundColor="#00ff2525" position="293,2" size="275,57" text="Menu list NEOBoot" />
<eLabel backgroundColor="background" font="baslk; 30" foregroundColor="yellow" position="293,2" size="275,57" text="Menu list NEOBoot" />
<widget source="list" render="Listbox" position="20,75" size="885,847" scrollbarMode="showOnDemand">
<convert type="TemplatedMultiContent">\n \t\t{"template": [\n \t\t\tMultiContentEntryText(pos = (50, 1), size = (920, 56), flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0),\n \t\t\tMultiContentEntryPixmapAlphaTest(pos = (6, 4), size = (66, 66), png = 1),\n \t\t\t],\n \t\t\t"fonts": [gFont("Regular", 35)],\n \t\t\t"itemHeight": 60\n \t\t}\n \t\t</convert>
</widget>
@@ -242,7 +241,7 @@ class MBTools(Screen):
class MBBackup(Screen):
if isFHD():
skin = """ <screen name="MBBackup" title="Backup image from NeoBoot" position="center,center" size="850,750">
skin = """ <screen name="MBBackupFHD" title="Backup image from NeoBoot" position="center,center" size="850,750">
<widget name="lab1" position="17,5" size="819, 62" font="baslk;35" halign="center" valign="center" transparent="1" foregroundColor="#99FFFF" />
<widget name="lab2" position="17,75" size="819,68" font="baslk;35" halign="center" valign="center" transparent="1" foregroundColor="#99FFFF" />
<widget name="lab3" position="17,150" size="819,85" font="baslk;35" halign="center" valign="center" transparent="1" foregroundColor="#99FFFF" />
@@ -250,10 +249,18 @@ class MBBackup(Screen):
<convert type="StringList" font="Regular;35" />
</widget>
<ePixmap position="270,705" size="34, 34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="325,705" zPosition="2" size="280,35" font="baslk;30" halign="left" valign="center" backgroundColor="#f23d21" transparent="1" foregroundColor="#f23d21" />
<widget name="key_red" position="325,705" zPosition="2" size="520,35" font="baslk;30" halign="left" valign="center" backgroundColor="#f23d21" transparent="1" foregroundColor="#f23d21" />
</screen>"""
else:
skin = ' <screen position="center,center" size="700,550" title="Backup the image from NeoBoot">\n\t\t\n <widget name="lab1" position="20,20" size="660,30" font="Regular;24" halign="center" valign="center" transparent="1"/>\n\n <widget name="lab2" position="20,50" size="660,30" font="Regular;24" halign="center" valign="center" transparent="1"/>\n\n <widget name="lab3" position="20,100" size="660,30" font="Regular;22" halign="center" valign="center" transparent="1"/>\n \n <widget source="list" render="Listbox" position="40,130" zPosition="1" size="620,360" scrollbarMode="showOnDemand" transparent="1" >\n\t\t\t\n <convert type="StringList" />\n</widget>\n<ePixmap position="280,500" size="140,40" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/redcor.png" alphatest="on" zPosition="1" />\n\n <widget name="key_red" position="280,500" zPosition="2" size="140,40" font="Regular;20" halign="left" valign="center" backgroundColor="red" transparent="1" />\n\n </screen>'
skin = """ <screen name="MBBackupHD" position="center,center" size="700,550" title="Backup the image from NeoBoot">
<widget name="lab1" position="20,20" size="660,30" font="Regular;24" halign="center" valign="center" transparent="1" />
<widget name="lab2" position="20,50" size="660,30" font="Regular;24" halign="center" valign="center" transparent="1" />
<widget name="lab3" position="20,100" size="660,30" font="Regular;22" halign="center" valign="center" transparent="1" />
<widget source="list" render="Listbox" position="40,141" zPosition="1" size="620,349" scrollbarMode="showOnDemand" transparent="1">\
<convert type="StringList" />
</widget>\n<ePixmap position="272,498" size="140,40" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/redcor.png" alphatest="on" zPosition="1" />
<widget name="key_red" position="270,500" zPosition="2" size="390,40" font="Regular;20" halign="left" valign="center" backgroundColor="red" transparent="1" />
</screen>"""
def __init__(self, session):
Screen.__init__(self, session)
@@ -375,15 +382,15 @@ class MBBackup(Screen):
class MBRestore(Screen):
__module__ = __name__
skin = """ <screen name="ReinstllNeoBoot2" title="Reinstll NeoBoot" position="center,center" size="850,750">
skin = """ <screen name="ReinstllNeoBoot2" title="Reinstll NeoBoot" position="center,center" size="850,626">
<widget name="lab1" position="20,15" size="820,50" font="baslk;30" halign="center" valign="center" transparent="1" foregroundColor="#00ffa500" />
<widget source="list" render="Listbox" itemHeight="40" font="Regular;21" position="25,85" zPosition="1" size="815,600" scrollbarMode="showOnDemand" transparent="1">
<widget source="list" render="Listbox" itemHeight="40" font="Regular;21" position="25,80" zPosition="1" size="815,464" scrollbarMode="showOnDemand" transparent="1">
<convert type="StringList" font="Regular;35" />
</widget>
<ePixmap position="40,695" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<ePixmap position="530,695" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/green.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="85,695" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" />
<widget name="key_green" position="575,695" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="green" transparent="1" />
<ePixmap position="40,570" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<ePixmap position="525,570" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/green.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="83,570" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" />
<widget name="key_green" position="579,570" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="green" transparent="1" />
</screen>"""
def __init__(self, session):
@@ -703,15 +710,15 @@ class ReinstllNeoBoot(Screen):
class ReinstllNeoBoot2(Screen):
__module__ = __name__
skin = """ <screen name="ReinstllNeoBoot2" title="Reinstll NeoBoot" position="center,center" size="850,750">
skin = """ <screen name="ReinstllNeoBoot2" title="Reinstll NeoBoot" position="center,center" size="850,654">
<widget name="lab1" position="20,15" size="820,50" font="baslk;30" halign="center" valign="center" transparent="1" foregroundColor="#00ffa500" />
<widget source="list" render="Listbox" itemHeight="40" font="Regular;21" position="25,85" zPosition="1" size="815,600" scrollbarMode="showOnDemand" transparent="1">
<widget source="list" render="Listbox" itemHeight="40" font="Regular;21" position="25,94" zPosition="1" size="815,494" scrollbarMode="showOnDemand" transparent="1">
<convert type="StringList" font="Regular;35" />
</widget>
<ePixmap position="40,695" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<ePixmap position="530,695" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/green.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="85,695" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" />
<widget name="key_green" position="575,695" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="green" transparent="1" />
<ePixmap position="40,600" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<ePixmap position="527,600" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/green.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="85,600" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" />
<widget name="key_green" position="575,600" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="green" transparent="1" />
</screen>"""
def __init__(self, session):
@@ -1160,6 +1167,10 @@ class SkinChange(Screen):
system('cp -r ' + LinkNeoBoot + '/images/zero4kse.png ' + LinkNeoBoot + '/images/box.png')
elif getBoxHostName() == 'sf4008':
system('cp -r ' + LinkNeoBoot + '/images/sf4008.png ' + LinkNeoBoot + '/images/box.png')
elif getBoxHostName() == 'ustym4kpro':
system('cp -r ' + LinkNeoBoot + '/images/ustym4kpro.png ' + LinkNeoBoot + '/images/box.png')
elif getBoxHostName() == 'h7' or getBoxHostName() == 'zgemmah7' :
system('cp -r ' + LinkNeoBoot + '/images/zgmmah7.png ' + LinkNeoBoot + '/images/box.png')
cmd = "echo -e '\n\n%s '" % _('Please wait, NeoBot is working, skin change is progress...')
cmd1 = 'rm -f ' +LinkNeoBoot+ '/usedskin.p*; sleep 2'
@@ -1180,15 +1191,6 @@ class SkinChange(Screen):
# temp_file2 = open(localfile2, 'w')
# temp_file2.write(content.replace('selektor.png', 'slekvti.png'))
# temp_file2.close()
fail = '/usr/share/enigma2/CobaltFHD/skin.xml'
f = open(fail, 'r')
content = f.read()
f.close()
localfile2 = '/usr/share/enigma2/CobaltFHD/skin.xml'
temp_file2 = open(localfile2, 'w')
temp_file2.write(content.replace('NeoBootImageChoose', '#NeoBootImageChoose'))
temp_file2.close()
self.restareE2()
else:
self.restareE2()
@@ -1206,13 +1208,13 @@ class SkinChange(Screen):
class BlocUnblockImageSkin(Screen):
__module__ = __name__
skin = """<screen name="Skin tool" title="Skin tool" position="529,158" size="856,779">
skin = """<screen name="Skin tool" title="Skin tool" position="center,center" size="856,657">
<widget name="lab1" position="20,5" size="820,130" font="baslk;30" halign="center" valign="center" transparent="1" foregroundColor="#00ffa500" />
<widget source="list" render="Listbox" itemHeight="43" font="Regular;21" position="25,155" zPosition="1" size="815,484" scrollbarMode="showOnDemand" transparent="1">
<widget source="list" render="Listbox" itemHeight="43" font="Regular;21" position="25,155" zPosition="1" size="815,430" scrollbarMode="showOnDemand" transparent="1">
<convert type="StringList" font="Regular;43" />
</widget>
<ePixmap position="180,714" size="37,38" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="228,716" zPosition="2" size="611,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" />
<ePixmap position="172,609" size="37,38" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="224,611" zPosition="2" size="611,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" />
</screen>"""
def __init__(self, session):
@@ -1237,6 +1239,14 @@ class BlocUnblockImageSkin(Screen):
self['list'].list = imageslist
def deleteback(self):
image = self['list'].getCurrent()
self.delimage = image.strip()
if fileExists(self.backupdir + '/' + self.delimage + '/skin.xml'):
self.deleteback2()
else:
self.myClose(_('Sorry, not find skin neoboot.'))
def deleteback2(self):
image = self['list'].getCurrent()
if image:
self.delimage = image.strip()
@@ -1275,17 +1285,9 @@ class BlocUnblockImageSkin(Screen):
else:
self.close()
# else:
# self.myClose(_('Sorry, There is no skin for a neoboot'))
# def myClose(self, message):
# self.session.open(MessageBox, message, MessageBox.TYPE_INFO)
# self.close()
def myClose(self, message):
self.session.open(MessageBox, message, MessageBox.TYPE_INFO)
self.close()
class InternalFlash(Screen):
@@ -1364,6 +1366,9 @@ class InternalFlash(Screen):
#if getBoxHostName == 'osmio4k':
#os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p5 /media/InternalFlash')
else:
self.myClose(_('Your image flash cannot be mounted.'))
if fileExists('/media/InternalFlash/etc/init.d/neobootmount.sh'):
os.system('rm -f /media/InternalFlash/etc/init.d/neobootmount.sh;')
@@ -1377,13 +1382,13 @@ class InternalFlash(Screen):
class DeletingLanguages(Screen):
__module__ = __name__
skin = """ <screen name="ReinstllNeoBoot2" title="Deleting Languages" position="center,center" size="850,750">
<widget name="lab1" position="20,15" size="820,50" font="baslk;30" halign="center" valign="center" transparent="1" foregroundColor="#00ffa500" />
<widget source="list" render="Listbox" itemHeight="40" font="Regular;21" position="25,85" zPosition="1" size="815,600" scrollbarMode="showOnDemand" transparent="1">
skin = """ <screen name="DeletingLanguages" title="Deleting Languages" position="center,center" size="850,647">
<widget name="lab1" position="20,73" size="820,50" font="baslk;30" halign="center" valign="center" transparent="1" foregroundColor="#00ffa500" />
<widget source="list" render="Listbox" itemHeight="40" font="Regular;21" position="25,142" zPosition="1" size="815,416" scrollbarMode="showOnDemand" transparent="1">
<convert type="StringList" font="Regular;35" />
</widget>
<ePixmap position="40,695" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="85,695" zPosition="2" size="250,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" />
<ePixmap position="107,588" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
<widget name="key_red" position="153,588" zPosition="2" size="368,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" />
</screen>"""
def __init__(self, session):
@@ -1489,8 +1494,6 @@ class MultiBootMyHelp(Screen):
self['lab1'].setText(message)
###______\\\\\\----for plugin----////_____###
class MyHelpNeo(Screen):

View File

@@ -0,0 +1,53 @@
#!/bin/sh
# script gutosie
# here you can add your own command to perform
# line - Checking internet connection by @j00zek thank you
if [ ! -e /usr/bin/enigma2_pre_start.sh ] ; then
/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh
fi
echo "_(Checking internet connection)..."
ping -c 1 github.com 1>/dev/null 2>%1
if [ $? -gt 0 ]; then
echo -n "_(github server unavailable, update impossible)!!! \nnetwork restart... "
/etc/init.d/networking stop;
echo "stopping network connection"
sleep 1;
/etc/init.d/networking start;
echo "start network connection"
sleep 5
if [ $? -gt 0 ]; then
if [ -e /usr/bin/curl ]; then
cd /tmp; curl -O --ftp-ssl https://raw.githubusercontent.com/gutosie/NeoBoot8/master/ver.txt;
cd /
elif [ -e /usr/bin/wget ]; then
wget https://raw.githubusercontent.com/gutosie/NeoBoot8/master/ver.txt -O /tmp/ver.txt
cd /
fi
if [ ! -f /tmp/ver.txt ] ; then
/etc/init.d/networking stop;
echo "stopping network connection"
sleep 2;
/etc/init.d/networking start;
echo "start network connection"
fi
fi
if [ -e ./%1 ] ; then
rm -f ./%1
fi
# echo " dns-nameservers 1.1.1.1 " >> /etc/network/interfaces
else
echo "_(github server available)!!!"
fi
echo "file used userscript "
echo ok
exit 0