diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py index 404b30b..f57fcea 100644 --- a/NeoBoot/extract.py +++ b/NeoBoot/extract.py @@ -30,7 +30,7 @@ def getBoxHostName(): return myboxname def getCPUSoC(): - chipset='UNKNOWN' + chipset = 'UNKNOWN' if os.path.exists('/proc/stb/info/chipset'): with open('/proc/stb/info/chipset', 'r') as f: chipset = f.readline().strip() @@ -41,7 +41,7 @@ def getCPUSoC(): return chipset def getBoxVuModel(): - vumodel='UNKNOWN' + vumodel = 'UNKNOWN' if os.path.exists("/proc/stb/info/vumodel") and not os.path.exists("/proc/stb/info/boxtype"): with open('/proc/stb/info/vumodel', 'r') as f: vumodel = f.readline().strip() @@ -49,15 +49,15 @@ def getBoxVuModel(): return vumodel def getCPUtype(): - cpu='UNKNOWN' + cpu = 'UNKNOWN' if os.path.exists('/proc/cpuinfo'): with open('/proc/cpuinfo', 'r') as f: lines = f.read() f.close() if lines.find('ARMv7') != -1: - cpu='ARMv7' + cpu = 'ARMv7' elif lines.find('mips') != -1: - cpu='MIPS' + cpu = 'MIPS' return cpu def getKernelVersion(): @@ -67,7 +67,7 @@ def getKernelVersion(): return _('unknown') def getNeoLocation(): - locatino='UNKNOWN' + locatino = 'UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location', 'r') as f: locatino = f.readline().strip() @@ -79,7 +79,7 @@ media = getNeoLocation() mediahome = media + '/ImageBoot/' extensions_path = '/usr/lib/enigma2/python/Plugins/Extensions/' dev_null = ' > /dev/null 2>&1' -supportedTuners='vuplus' +supportedTuners = 'vuplus' def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, LanWlan, Sterowniki, InstallSettings, ZipDelete, RepairFTP, SoftCam, MediaPortal, PiconR, Kodi, BlackHole): @@ -144,7 +144,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan cmd = 'cp -af /lib/firmware %s/ImageBoot/%s/lib > /dev/null 2>&1' % (media, target) rc = os.system(cmd) os.system('echo "Copied system drivers. Not recommended copied kernel.bin for Ultimo HD."') - elif getCPUtype() == "MIPS" and getBoxHostName() == 'vuultimo' or getBoxHostName() == 'bm750' or getBoxHostName() == 'vuduo' or getBoxHostName() == 'vuuno' or getBoxHostName() == 'vusolo' or getBoxHostName() == 'vuduo' or getBoxHostName() == 'vusolo2' or getBoxHostName() == 'vusolose' or getBoxHostName() == 'vuduo2' or getBoxHostName() == 'vuzero' or getBoxHostName() == 'mbultra': + elif getCPUtype() == "MIPS" and getBoxHostName() == 'vuultimo' or getBoxHostName() == 'bm750' or getBoxHostName() == 'vuduo' or getBoxHostName() == 'vuuno' or getBoxHostName() == 'vusolo' or getBoxHostName() == 'vuduo' or getBoxHostName() == 'vusolo2' or getBoxHostName() == 'vusolose' or getBoxHostName() == 'vuduo2' or getBoxHostName() == 'vuzero' or getBoxHostName() == 'mbultra': os.system('mv ' + getNeoLocation() + 'ImagesUpload/vuplus/' + getBoxVuModel() + '/kernel_cfe_auto.bin ' + media_target + '/boot/' + getBoxHostName() + '.vmlinux.gz' + dev_null) os.system('echo "Copied kernel.bin STB-MIPS"') #arm vuplus arms @@ -366,7 +366,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan rc = os.system(cmd) cmd = 'cp -f ' + extensions_path + 'NeoBoot/bin/version ' + getNeoLocation() + 'ImageBoot/%s/boot/blackhole' % target rc = os.system(cmd) - cmd = 'mv ' + getNeoLocation() + 'ImageBoot/' +target+ '/usr/lib/enigma2/python/Blackhole/BhUtils.pyo ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Blackhole/BhUtils.pyo.org' % target + cmd = 'mv ' + getNeoLocation() + 'ImageBoot/' + target + '/usr/lib/enigma2/python/Blackhole/BhUtils.pyo ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Blackhole/BhUtils.pyo.org' % target rc = os.system(cmd) cmd = 'cp -af ' + extensions_path + 'NeoBoot/bin/utilsbh ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Blackhole/BhUtils.py' % target rc = os.system(cmd) @@ -374,7 +374,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan temp_file = open(localfile, 'w') temp_file.write(text) temp_file.close() - cmd = 'mv ' + getNeoLocation() + 'ImageBoot/' +target+ '/usr/bin/enigma2 ' + getNeoLocation() + 'ImageBoot/%s/usr/bin/enigma2-or' % target + cmd = 'mv ' + getNeoLocation() + 'ImageBoot/' + target + '/usr/bin/enigma2 ' + getNeoLocation() + 'ImageBoot/%s/usr/bin/enigma2-or' % target rc = os.system(cmd) fail = '' + getNeoLocation() + 'ImageBoot/%s/usr/bin/enigma2-or' % target f = open(fail, 'r') @@ -653,7 +653,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan out = open(mediahome + '.neonextboot', 'w') out.write('Flash') out.close() - if '.tar.xz' not in source and not os.path.exists('' + getNeoLocation() + '/ImageBoot/%s/etc/issue' % target): + if '.tar.xz' not in source and not os.path.exists('' + getNeoLocation() + '/ImageBoot/%s/etc/issue' % target): os.system('echo ""; echo "No system installed! The reason for the installation error may be badly packed image files or it is not a system for your model."') os.system('echo "The installed system may not start. Check the correctness of the installed image directory!!!"') os.system('rm -r ' + getNeoLocation() + '/ImageBoot/%s' % target) @@ -840,7 +840,7 @@ def NEOBootExtract(source, target, ZipDelete): if os.path.exists(sourcefile3) is True: if sourcefile3.endswith('.rar'): os.system('echo "Installing iamge x.rar..."') - cmd = 'unrar e ' + sourcefile3+ ' ' + getNeoLocation() + 'ImagesUpload/ > /dev/null 2>&1' + cmd = 'unrar e ' + sourcefile3 + ' ' + getNeoLocation() + 'ImagesUpload/ > /dev/null 2>&1' rc = os.system(cmd) if ZipDelete == 'True': rc = os.system('rm -rf ' + sourcefile3) diff --git a/NeoBoot/files/devices.py b/NeoBoot/files/devices.py index 4f27295..5c4a5df 100644 --- a/NeoBoot/files/devices.py +++ b/NeoBoot/files/devices.py @@ -506,7 +506,7 @@ class DevicesConf(Screen, ConfigListScreen): class SetDiskLabel(Screen): screenwidth = getDesktop(0).size().width() if screenwidth and screenwidth == 1920: - skin =""" + skin = """ diff --git a/NeoBoot/files/stbbranding.py b/NeoBoot/files/stbbranding.py index 4a1fd71..02f0532 100644 --- a/NeoBoot/files/stbbranding.py +++ b/NeoBoot/files/stbbranding.py @@ -72,13 +72,13 @@ def mountp(): return pathmp def getSupportedTuners(): - supportedT='' + supportedT = '' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/stbinfo.cfg'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/stbinfo.cfg', 'r') as f: lines = f.read() f.close() if lines.find("%s" % getBoxHostName()) != -1: - supportedT='%s' % getBoxHostName() + supportedT = '%s' % getBoxHostName() return supportedT def getFreespace(dev): @@ -89,50 +89,50 @@ def getFreespace(dev): #check install def getCheckInstal1(): - neocheckinstal='UNKNOWN' + neocheckinstal = 'UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install', 'r') as f: lines1 = f.read() f.close() if not lines1.find('/dev/') != -1: - neocheckinstal='1' + neocheckinstal = '1' return neocheckinstal def getCheckInstal2(): - neocheckinstal='UNKNOWN' + neocheckinstal = 'UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location', 'r') as f: lines2 = f.read() f.close() if not lines2.find('/media/') != -1: - neocheckinstal='2' + neocheckinstal = '2' return neocheckinstal def getCheckInstal3(): - neocheckinstal='UNKNOWN' + neocheckinstal = 'UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh', 'r') as f: lines3 = f.read() f.close() if not lines3.find('/bin/mount') != -1: - neocheckinstal='3' + neocheckinstal = '3' return neocheckinstal #check imageATV def getImageATv(): - atvimage='UNKNOWN' + atvimage = 'UNKNOWN' if os.path.exists('/etc/issue.net'): with open('/etc/issue.net', 'r') as f: lines = f.read() f.close() if lines.find('openatv') != -1: - atvimage='okfeedCAMatv' + atvimage = 'okfeedCAMatv' return atvimage #check install def getNeoLocation(): - locatino='UNKNOWN' + locatino = 'UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location', 'r') as f: locatino = f.readline().strip() @@ -142,238 +142,238 @@ def getNeoLocation(): #check ext def getFormat(): - neoformat='UNKNOWN' + neoformat = 'UNKNOWN' if os.path.exists('/proc/mounts'): with open('/proc/mounts', 'r') as f: lines = f.read() f.close() if lines.find('ext2') != -1: - neoformat='ext2' + neoformat = 'ext2' elif lines.find('ext3') != -1: - neoformat='ext3' + neoformat = 'ext3' elif lines.find('ext4') != -1: - neoformat='ext4' + neoformat = 'ext4' elif lines.find('nfs') != -1: - neoformat='nfs' + neoformat = 'nfs' return neoformat def getNEO_filesystems(): - neo_filesystems='UNKNOWN' + neo_filesystems = 'UNKNOWN' if os.path.exists('/tmp/.neo_format'): with open('/tmp/.neo_format', 'r') as f: lines = f.read() f.close() if lines.find('ext2') != -1: - neo_filesystems='1' + neo_filesystems = '1' elif lines.find('ext3') != -1: - neo_filesystems='1' + neo_filesystems = '1' elif lines.find('ext4') != -1: - neo_filesystems='1' + neo_filesystems = '1' elif lines.find('nfs') != -1: - neo_filesystems='1' + neo_filesystems = '1' return neo_filesystems #typ procesora arm lub mips def getCPUtype(): - cpu='UNKNOWN' + cpu = 'UNKNOWN' if os.path.exists('/proc/cpuinfo'): with open('/proc/cpuinfo', 'r') as f: lines = f.read() f.close() if lines.find('ARMv7') != -1: - cpu='ARMv7' + cpu = 'ARMv7' elif lines.find('mips') != -1: - cpu='MIPS' + cpu = 'MIPS' return cpu #check install def getFSTAB(): - install='UNKNOWN' + install = 'UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid', 'r') as f: lines = f.read() f.close() if lines.find('UUID') != -1: - install='UUID' + install = 'UUID' elif not lines.find('UUID') != -1: - install='NOUUID' + install = 'NOUUID' return install def getFSTAB2(): - install='UNKNOWN' + install = 'UNKNOWN' if os.path.exists('/etc/fstab'): with open('/etc/fstab', 'r') as f: lines = f.read() f.close() if lines.find('UUID') != -1: - install='OKinstall' + install = 'OKinstall' elif not lines.find('UUID') != -1: - install='NOUUID' + install = 'NOUUID' return install def getINSTALLNeo(): - neoinstall='UNKNOWN' + neoinstall = 'UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installNeo'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installNeo', 'r') as f: lines = f.read() f.close() if lines.find('/dev/sda1') != -1: - neoinstall='/dev/sda1' + neoinstall = '/dev/sda1' elif lines.find('/dev/sda2') != -1: - neoinstall='/dev/sda2' + neoinstall = '/dev/sda2' elif lines.find('/dev/sdb1') != -1: - neoinstall='/dev/sdb1' + neoinstall = '/dev/sdb1' elif lines.find('/dev/sdb2') != -1: - neoinstall='/dev/sdb2' + neoinstall = '/dev/sdb2' elif lines.find('/dev/sdc1') != -1: - neoinstall='/dev/sdc1' + neoinstall = '/dev/sdc1' elif lines.find('/dev/sdd1') != -1: - neoinstall='/dev/sdd1' + neoinstall = '/dev/sdd1' elif lines.find('/dev/sde1') != -1: - neoinstall='/dev/sde1' + neoinstall = '/dev/sde1' elif lines.find('/dev/sdf1') != -1: - neoinstall='/dev/sdf1' + neoinstall = '/dev/sdf1' return neoinstall def getLocationMultiboot(): - LocationMultiboot='UNKNOWN' + LocationMultiboot = 'UNKNOWN' if os.path.exists('/media/sda1/ImageBoot'): - LocationMultiboot='/dev/sda1' + LocationMultiboot = '/dev/sda1' if os.path.exists('/media/sda2/ImageBoot'): - LocationMultiboot='/dev/sda2' + LocationMultiboot = '/dev/sda2' if os.path.exists('/media/sdb1/ImageBoot'): - LocationMultiboot='/dev/sdb1' + LocationMultiboot = '/dev/sdb1' if os.path.exists('/media/sdb2/ImageBoot'): - LocationMultiboot='/dev/sdb2' + LocationMultiboot = '/dev/sdb2' if os.path.exists('/media/sdc1/ImageBoot'): - LocationMultiboot='/dev/sdc1' + LocationMultiboot = '/dev/sdc1' if os.path.exists('/media/sdd1/ImageBoot'): - LocationMultiboot='/dev/sdd1' + LocationMultiboot = '/dev/sdd1' if os.path.exists('/media/sde1/ImageBoot'): - LocationMultiboot='/dev/sde1' + LocationMultiboot = '/dev/sde1' if os.path.exists('/media/sdf1/ImageBoot'): - LocationMultiboot='/dev/sdf1' + LocationMultiboot = '/dev/sdf1' return LocationMultiboot def getLabelDisck(): - label='UNKNOWN' + label = 'UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid', 'r') as f: lines = f.read() f.close() if lines.find('LABEL=') != -1: - label='LABEL=' + label = 'LABEL=' return label #checking device neo def getNeoMount(): - neo='UNKNOWN' + neo = 'UNKNOWN' if os.path.exists('/proc/mounts'): with open('/proc/mounts', 'r') as f: lines = f.read() f.close() if lines.find('/dev/sda1 /media/hdd') != -1: - neo='hdd_install_/dev/sda1' + neo = 'hdd_install_/dev/sda1' elif lines.find('/dev/sdb1 /media/hdd') != -1: - neo='hdd_install_/dev/sdb1' + neo = 'hdd_install_/dev/sdb1' elif lines.find('/dev/sda2 /media/hdd') != -1: - neo='hdd_install_/dev/sda2' + neo = 'hdd_install_/dev/sda2' elif lines.find('/dev/sdb2 /media/hdd') != -1: - neo='hdd_install_/dev/sdb2' + neo = 'hdd_install_/dev/sdb2' elif lines.find('/dev/sdc1 /media/hdd') != -1: - neo='hdd_install_/dev/sdc1' + neo = 'hdd_install_/dev/sdc1' elif lines.find('/dev/sdd1 /media/hdd') != -1: - neo='hdd_install_/dev/sdd1' + neo = 'hdd_install_/dev/sdd1' elif lines.find('/dev/sde1 /media/hdd') != -1: - neo='hdd_install_/dev/sde1' + neo = 'hdd_install_/dev/sde1' elif lines.find('/dev/sdf1 /media/hdd') != -1: - neo='hdd_install_/dev/sdf1' + neo = 'hdd_install_/dev/sdf1' return neo def getNeoMount2(): - neo='UNKNOWN' + neo = 'UNKNOWN' if os.path.exists('/proc/mounts'): with open('/proc/mounts', 'r') as f: lines = f.read() f.close() if lines.find('/dev/sda1 /media/usb') != -1: - neo='usb_install_/dev/sda1' + neo = 'usb_install_/dev/sda1' elif lines.find('/dev/sdb1 /media/usb') != -1: - neo='usb_install_/dev/sdb1' + neo = 'usb_install_/dev/sdb1' elif lines.find('/dev/sdb2 /media/usb') != -1: - neo='usb_install_/dev/sdb2' + neo = 'usb_install_/dev/sdb2' elif lines.find('/dev/sdc1 /media/usb') != -1: - neo='usb_install_/dev/sdc1' + neo = 'usb_install_/dev/sdc1' elif lines.find('/dev/sdd1 /media/usb') != -1: - neo='usb_install_/dev/sdd1' + neo = 'usb_install_/dev/sdd1' elif lines.find('/dev/sde1 /media/usb') != -1: - neo='usb_install_/dev/sde1' + neo = 'usb_install_/dev/sde1' elif lines.find('/dev/sdf1 /media/usb') != -1: - neo='usb_install_/dev/sdf1' + neo = 'usb_install_/dev/sdf1' elif lines.find('/dev/sda1 /media/usb2') != -1: - neo='usb_install_/dev/sda1' + neo = 'usb_install_/dev/sda1' elif lines.find('/dev/sdb1 /media/usb2') != -1: - neo='usb_install_/dev/sdb1' + neo = 'usb_install_/dev/sdb1' elif lines.find('/dev/sdb2 /media/usb2') != -1: - neo='usb_install_/dev/sdb2' + neo = 'usb_install_/dev/sdb2' elif lines.find('/dev/sdc1 /media/usb2') != -1: - neo='usb_install_/dev/sdc1' + neo = 'usb_install_/dev/sdc1' elif lines.find('/dev/sdd1 /media/usb2') != -1: - neo='usb_install_/dev/sdd1' + neo = 'usb_install_/dev/sdd1' elif lines.find('/dev/sde1 /media/usb2') != -1: - neo='usb_install_/dev/sde1' + neo = 'usb_install_/dev/sde1' elif lines.find('/dev/sdf1 /media/usb2') != -1: - neo='usb_install_/dev/sdf1' + neo = 'usb_install_/dev/sdf1' return neo def getNeoMount3(): - neo='UNKNOWN' + neo = 'UNKNOWN' if os.path.exists('/proc/mounts'): with open('/proc/mounts', 'r') as f: lines = f.read() f.close() if lines.find('/dev/sda1 /media/cf') != -1: - neo='cf_install_/dev/sda1' + neo = 'cf_install_/dev/sda1' elif lines.find('/dev/sdb1 /media/cf') != -1: - neo='cf_install_/dev/sdb1' + neo = 'cf_install_/dev/sdb1' return neo def getNeoMount4(): - neo='UNKNOWN' + neo = 'UNKNOWN' if os.path.exists('/proc/mounts'): with open('/proc/mounts', 'r') as f: lines = f.read() f.close() if lines.find('/dev/sda1 /media/card') != -1: - neo='card_install_/dev/sda1' + neo = 'card_install_/dev/sda1' elif lines.find('/dev/sdb1 /media/card') != -1: - neo='card_install_/dev/sdb1' + neo = 'card_install_/dev/sdb1' return neo def getNeoMount5(): - neo='UNKNOWN' + neo = 'UNKNOWN' if os.path.exists('/proc/mounts'): with open('/proc/mounts', 'r') as f: lines = f.read() f.close() if lines.find('/dev/sda1 /media/mmc') != -1: - neo='mmc_install_/dev/sda1' + neo = 'mmc_install_/dev/sda1' elif lines.find('/dev/sdb1 /media/mmc') != -1: - neo='mmc_install_/dev/sdb1' + neo = 'mmc_install_/dev/sdb1' return neo #zwraca typ chipa prcesora def getCPUSoC(): - chipset='UNKNOWN' + chipset = 'UNKNOWN' if os.path.exists('/proc/stb/info/chipset'): with open('/proc/stb/info/chipset', 'r') as f: chipset = f.readline().strip() @@ -383,7 +383,7 @@ def getCPUSoC(): return chipset def getCPUSoCModel(): - devicetree='UNKNOWN' + devicetree = 'UNKNOWN' if os.path.exists('/proc/device-tree/model'): with open('/proc/device-tree/model', 'r') as f: devicetree = f.readline().strip() @@ -392,7 +392,7 @@ def getCPUSoCModel(): #zwraca wybrane image w neoboot do uruchomienia def getImageNeoBoot(): - imagefile='UNKNOWN' + imagefile = 'UNKNOWN' if os.path.exists('%sImageBoot/.neonextboot' % getNeoLocation()): with open('%sImageBoot/.neonextboot' % getNeoLocation(), 'r') as f: imagefile = f.readline().strip() @@ -401,7 +401,7 @@ def getImageNeoBoot(): #zwraca model vuplus def getBoxVuModel(): - vumodel='UNKNOWN' + vumodel = 'UNKNOWN' if fileExists("/proc/stb/info/vumodel") and not fileExists("/proc/stb/info/boxtype"): with open('/proc/stb/info/vumodel', 'r') as f: vumodel = f.readline().strip() @@ -465,7 +465,7 @@ def runCMDS(cmdsList): def getImageDistroN(): - image='Internal storage' + image = 'Internal storage' if fileExists('/.multinfo') and fileExists('%sImageBoot/.imagedistro' % getNeoLocation()): with open('%sImageBoot/.imagedistro' % getNeoLocation(), 'r') as f: diff --git a/NeoBoot/files/testinout b/NeoBoot/files/testinout index 0c193ca..90437b2 100644 --- a/NeoBoot/files/testinout +++ b/NeoBoot/files/testinout @@ -9,21 +9,21 @@ from Tools.Directories import fileExists, SCOPE_PLUGINS def getAccesDate(): - timego='' + timego = '' dana = getTestOutTime() # etc Nie! Szukana liczba jest wieksza! strzal = getTestInTime() # tmp Nie! Szukana liczba jest mniejsza! if strzal == dana: - timego='access' + timego = 'access' elif strzal < dana: - timego='isaccess' + timego = 'isaccess' else: - timego='timeoff' + timego = 'timeoff' os.system('echo "19700101" > /usr/lib/periodon/.kodn') return timego def getTestCzas(): - mytestnC='' + mytestnC = '' if os.path.exists('/usr/lib/periodon/.accessdate'): with open('/usr/lib/periodon/.accessdate', 'r') as f: mytestnC = f.readline().strip() @@ -32,7 +32,7 @@ def getTestCzas(): def getTestToTest(): - mytestnb='' + mytestnb = '' if os.path.exists('/tmp/.nkod'): with open('/tmp/.nkod', 'r') as f: mytestnb = f.readline().strip() @@ -41,42 +41,42 @@ def getTestToTest(): def getTestIn(): - neopluspro='UNKNOWN' + neopluspro = 'UNKNOWN' if os.path.exists('/usr/lib/periodon/.kodn'): with open('/usr/lib/periodon/.kodn', 'r') as f: lines = f.read() f.close() if lines.find('1234' + getTestToTest() + '') != -1: - neopluspro='1234%s' % getTestToTest() + neopluspro = '1234%s' % getTestToTest() return neopluspro def getTestOut(): - neoplus='UNKNOWN' + neoplus = 'UNKNOWN' if os.path.exists('/tmp/.nkod'): with open('/tmp/.nkod', 'r') as f: lines2 = f.read() f.close() - if lines2.find("%s" %getTestToTest()) != -1: - neoplus='1234%s' % getTestToTest() + if lines2.find("%s" % getTestToTest()) != -1: + neoplus = '1234%s' % getTestToTest() return neoplus def getAccessN(): - neopro='UNKNOWN' + neopro = 'UNKNOWN' if os.path.exists('/usr/lib/periodon/.kodn'): with open('/usr/lib/periodon/.kodn', 'r') as f: lines3 = f.read() f.close() if lines3.find('1234') != -1: - neopro='1234' + neopro = '1234' elif not lines3.find('1234') != -1: - neopro='1235' + neopro = '1235' return neopro def getTestInTime(): - mydatein='UNKNOWN' + mydatein = 'UNKNOWN' if os.path.exists('/tmp/.finishdate'): with open('/tmp/.finishdate', 'r') as f: mydatein = f.readline().strip() @@ -85,7 +85,7 @@ def getTestInTime(): def getTestOutTime(): - mydateout='UNKNOWN' + mydateout = 'UNKNOWN' if os.path.exists('/usr/lib/periodon/.accessdate'): with open('/usr/lib/periodon/.accessdate', 'r') as f: mydateout = f.readline().strip() @@ -94,12 +94,12 @@ def getTestOutTime(): def getButtonPin(): - mypin='UNKNOWN' + mypin = 'UNKNOWN' if os.path.exists('/usr/lib/periodon'): out = open('/usr/lib/periodon/.kodn', 'w') out.write('1234%s' % getTestToTest()) out.close() - mypin='pinok' + mypin = 'pinok' return mypin diff --git a/NeoBoot/files/tools.py b/NeoBoot/files/tools.py index 814f8fe..cd2453a 100644 --- a/NeoBoot/files/tools.py +++ b/NeoBoot/files/tools.py @@ -75,15 +75,15 @@ def getKernelVersion(): return _('unknown') def getCPUtype(): - cpu='UNKNOWN' + cpu = 'UNKNOWN' if os.path.exists('/proc/cpuinfo'): with open('/proc/cpuinfo', 'r') as f: lines = f.read() f.close() if lines.find('ARMv7') != -1: - cpu='ARMv7' + cpu = 'ARMv7' elif lines.find('mips') != -1: - cpu='MIPS' + cpu = 'MIPS' return cpu if os.path.exists('/etc/hostname'): @@ -137,9 +137,9 @@ class MBTools(Screen): def updateList(self): self.list = [] - mypath = '' +LinkNeoBoot+ '' + mypath = '' + LinkNeoBoot + '' if not fileExists(mypath + 'icons'): - mypixmap = '' +LinkNeoBoot+ '/images/ok.png' + mypixmap = '' + LinkNeoBoot + '/images/ok.png' png = LoadPixmap(mypixmap) res = (_('Make a copy of the image from NeoBoot'), png, 0) @@ -452,7 +452,7 @@ class MBRestore(Screen): self.onShow.append(self.updateInfo) def updateInfo(self): - linesdevice = open('' +LinkNeoBoot+ '/.location', 'r').readlines() + linesdevice = open('' + LinkNeoBoot + '/.location', 'r').readlines() deviceneo = linesdevice[0][0:-1] device = deviceneo usfree = '0' @@ -652,7 +652,7 @@ class BackupMultiboot(Screen): 'red': self.gobackupneobootplugin}) def gobackupneobootplugin(self): - cmd = 'sh ' +LinkNeoBoot+ '/files/neobackup.sh -i' + cmd = 'sh ' + LinkNeoBoot + '/files/neobackup.sh -i' self.session.open(Console, _('The backup will be saved to /media/neoboot. Performing ...'), [cmd]) self.close() @@ -697,8 +697,8 @@ class UnistallMultiboot(Screen): cmd3 = 'ln -sfn /sbin/init.sysvinit /sbin/init' cmd4 = 'chmod 777 /sbin/init; sleep 2' cmd4a = "echo -e 'NeoBoot restoring media mounts...\n'" - cmd6 = 'rm -f ' + getNeoLocation() + 'ImageBoot/initneo.log ' + getNeoLocation() + 'ImageBoot/.imagedistro ' + getNeoLocation() + 'ImageBoot/.neonextboot '+ getNeoLocation() + 'ImageBoot/.updateversion '+ getNeoLocation() + 'ImageBoot/.Flash ' + getNeoLocation() + 'ImageBoot/.version ' + getNeoLocation() + 'ImageBoot/NeoInit.log ; sleep 2' - cmd7 = 'rm -f '+LinkNeoBoot+ '/.location '+LinkNeoBoot+ '/bin/install '+LinkNeoBoot+ '/bin/reading_blkid '+LinkNeoBoot+ '/files/mountpoint.sh '+LinkNeoBoot+ '/files/neo.sh '+LinkNeoBoot+ '/files/neom '+LinkNeoBoot+ '/.neo_info ' + cmd6 = 'rm -f ' + getNeoLocation() + 'ImageBoot/initneo.log ' + getNeoLocation() + 'ImageBoot/.imagedistro ' + getNeoLocation() + 'ImageBoot/.neonextboot ' + getNeoLocation() + 'ImageBoot/.updateversion ' + getNeoLocation() + 'ImageBoot/.Flash ' + getNeoLocation() + 'ImageBoot/.version ' + getNeoLocation() + 'ImageBoot/NeoInit.log ; sleep 2' + cmd7 = 'rm -f ' + LinkNeoBoot + '/.location ' + LinkNeoBoot + '/bin/install ' + LinkNeoBoot + '/bin/reading_blkid ' + LinkNeoBoot + '/files/mountpoint.sh ' + LinkNeoBoot + '/files/neo.sh ' + LinkNeoBoot + '/files/neom ' + LinkNeoBoot + '/.neo_info ' cmd7a = "echo -e '\n\nUninstalling neoboot...\n'" cmd8 = "echo -e '\n\nRestore mount.'" cmd9 = "echo -e '\n\nNeoBoot uninstalled, you can do reinstallation.'" @@ -725,7 +725,7 @@ class UnistallMultiboot(Screen): self.close() def checkNeo(self): - if not fileCheck(''+LinkNeoBoot+ '/.location') and not fileCheck(' ' + getNeoLocation() + 'ImageBoot/.neonextboot'): + if not fileCheck('' + LinkNeoBoot + '/.location') and not fileCheck(' ' + getNeoLocation() + 'ImageBoot/.neonextboot'): self.restareE2() else: self.close() @@ -887,22 +887,22 @@ class MyUpgrade2(Screen): self.myClose(_('Sorry, NeoBoot can installed or upgraded only when booted from Flash STB')) self.close() else: - for fn in listdir('%sImageBoot' % getNeoLocation()): - dirfile = '%sImageBoot/' % getNeoLocation() + fn + for fn in listdir('%sImageBoot' % getNeoLocation()): + dirfile = '%sImageBoot/' % getNeoLocation() + fn if isdir(dirfile): - target = dirfile + '' +LinkNeoBoot+ '' + target = dirfile + '' + LinkNeoBoot + '' target1 = dirfile + '/usr/lib/' target2 = dirfile + '/usr/lib/enigma2/python/Tools/' cmd = 'rm -r ' + target + ' > /dev/null 2>&1' system(cmd) - cmd = 'cp -r ' +LinkNeoBoot+ ' ' + target + cmd = 'cp -r ' + LinkNeoBoot + ' ' + target system(cmd) - cmd1 = 'cp -rf ' +periodo+ ' ' + target1 + cmd1 = 'cp -rf ' + periodo + ' ' + target1 system(cmd1) - cmd2 = 'cp -rf ' +testinout+ ' ' + target2 + cmd2 = 'cp -rf ' + testinout + ' ' + target2 system(cmd2) - out = open('%sImageBoot/.version' % getNeoLocation(), 'w') + out = open('%sImageBoot/.version' % getNeoLocation(), 'w') out.write(PLUGINVERSION) out.close() self.myClose(_('NeoBoot successfully updated. You can restart the plugin now.\nHave fun !!')) @@ -1198,47 +1198,47 @@ class CheckInstall(Screen): self.myClose(_('Sorry, Neoboot can be installed or upgraded only when booted from Flash')) def neocheck2(self): - os.system(_('rm -f ' + LinkNeoBoot + '/files/modulecheck; echo %s - %s > ' +LinkNeoBoot+ '/files/modulecheck') % (getBoxModelVU(), getCPUSoC())) + os.system(_('rm -f ' + LinkNeoBoot + '/files/modulecheck; echo %s - %s > ' + LinkNeoBoot + '/files/modulecheck') % (getBoxModelVU(), getCPUSoC())) os.system('echo "\n====================================================>\nCheck result:" >> ' + LinkNeoBoot + '/files/modulecheck') - os.system('echo "* neoboot location:" >> ' +LinkNeoBoot+ '/files/modulecheck; cat "/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location" >> ' +LinkNeoBoot+ '/files/modulecheck') - os.system('echo "\n* neoboot location install:" >> ' +LinkNeoBoot+ '/files/modulecheck; cat "/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install" >> ' +LinkNeoBoot+ '/files/modulecheck') - os.system('echo "\n* neoboot location mount:" >> ' +LinkNeoBoot+ '/files/modulecheck; cat "/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* neoboot location:" >> ' + LinkNeoBoot + '/files/modulecheck; cat "/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location" >> ' + LinkNeoBoot + '/files/modulecheck') + os.system('echo "\n* neoboot location install:" >> ' + LinkNeoBoot + '/files/modulecheck; cat "/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install" >> ' + LinkNeoBoot + '/files/modulecheck') + os.system('echo "\n* neoboot location mount:" >> ' + LinkNeoBoot + '/files/modulecheck; cat "/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh" >> ' + LinkNeoBoot + '/files/modulecheck') if getCPUtype() == 'ARMv7' and getCPUtype() != 'MIPS': if os.system('opkg update; opkg list-installed | grep python-subprocess') != 0: - os.system('echo "\n* python-subprocess not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "\n* python-subprocess not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep python-argparse') != 0: - os.system('echo "* python-argparse not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* python-argparse not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep curl') != 0: - os.system('echo "* curl not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* curl not installed" >> ' + LinkNeoBoot + '/files/modulecheck') else: - os.system('echo "\n* opkg packed everything is OK !" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "\n* opkg packed everything is OK !" >> ' + LinkNeoBoot + '/files/modulecheck') elif getCPUtype() != 'ARMv7' and getCPUtype() == 'MIPS': if os.system('opkg list-installed | grep kernel-module-nandsim') != 0: - os.system('echo "\n* kernel-module-nandsim not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "\n* kernel-module-nandsim not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep mtd-utils-jffs2') != 0: - os.system('echo "* mtd-utils-jffs2 not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* mtd-utils-jffs2 not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep lzo') != 0: - os.system('echo "* lzo not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* lzo not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep python-setuptools') != 0: - os.system('echo "* python-setuptools not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* python-setuptools not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep util-linux-sfdisk') != 0: - os.system('echo "* util-linux-sfdisk not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* util-linux-sfdisk not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep packagegroup-base-nfs') != 0: - os.system('echo "* packagegroup-base-nfs not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* packagegroup-base-nfs not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep ofgwrite') != 0: - os.system('echo "* ofgwrite not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* ofgwrite not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep bzip2') != 0: - os.system('echo "* bzip2 not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* bzip2 not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep mtd-utils') != 0: - os.system('echo "* mtd-utils not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* mtd-utils not installed" >> ' + LinkNeoBoot + '/files/modulecheck') if os.system('opkg list-installed | grep mtd-utils-ubifs') != 0: - os.system('echo "* mtd-utils-ubifs not installed" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "* mtd-utils-ubifs not installed" >> ' + LinkNeoBoot + '/files/modulecheck') else: - os.system('echo "\n* opkg packed everything is OK !" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "\n* opkg packed everything is OK !" >> ' + LinkNeoBoot + '/files/modulecheck') else: - os.system('echo "\n* STB is not ARMv7 or MIPS" >> ' +LinkNeoBoot+ '/files/modulecheck') + os.system('echo "\n* STB is not ARMv7 or MIPS" >> ' + LinkNeoBoot + '/files/modulecheck') - cmd = 'echo "\n<====================================================" >> ' + LinkNeoBoot + '/files/modulecheck; cat ' +LinkNeoBoot+ '/files/modulecheck' + cmd = 'echo "\n<====================================================" >> ' + LinkNeoBoot + '/files/modulecheck; cat ' + LinkNeoBoot + '/files/modulecheck' cmd1 = '' self.session.openWithCallback(self.close, Console, _('NeoBoot....'), [cmd, cmd1]) @@ -1279,14 +1279,14 @@ class SkinChange(Screen): self.onShow.append(self.updateInfo) def updateInfo(self): - self.skindir = '' +LinkNeoBoot+ '/neoskins/' + self.skindir = '' + LinkNeoBoot + '/neoskins/' if pathExists(self.skindir) == 0 and createDir(self.skindir): pass skinlist = ['default'] - for fn in listdir('' +LinkNeoBoot+ '/neoskins'): - dirfile = '' +LinkNeoBoot+ '/neoskins/' + fn + for fn in listdir('' + LinkNeoBoot + '/neoskins'): + dirfile = '' + LinkNeoBoot + '/neoskins/' + fn if os_isdir(dirfile) and skinlist.append(fn): pass @@ -1312,8 +1312,8 @@ class SkinChange(Screen): cmd = "echo -e '\n\n%s '" % _('Please wait, NeoBot is working, skin change is progress...') cmd1 = "echo -e '\n\n%s '" % _('NeoBoot: Complete Skin Change!') # cmd2 = 'cp -r ' +LinkNeoBoot+ '/neoskins/default.py ' +LinkNeoBoot+ '/skin.py' - cmd2 = 'rm -f ' +LinkNeoBoot+ '/usedskin.p*; sleep 2' - cmd3 = 'ln -sf "neoskins/default.py" "' +LinkNeoBoot+ '/usedskin.py"' + cmd2 = 'rm -f ' + LinkNeoBoot + '/usedskin.p*; sleep 2' + cmd3 = 'ln -sf "neoskins/default.py" "' + LinkNeoBoot + '/usedskin.py"' self.session.open(Console, _('NeoBoot Skin Change'), [cmd, cmd1, cmd2, cmd3]) def doSkinChange(self, answer): @@ -1343,15 +1343,15 @@ class SkinChange(Screen): system('cp -r ' + LinkNeoBoot + '/images/solo2.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' - cmd2 = 'sleep 2; cp -r ' + self.skindir + '/' + self.selectedskin + '/*.py ' +LinkNeoBoot+ '/usedskin.py' + cmd1 = 'rm -f ' + LinkNeoBoot + '/usedskin.p*; sleep 2' + cmd2 = 'sleep 2; cp -r ' + self.skindir + '/' + self.selectedskin + '/*.py ' + LinkNeoBoot + '/usedskin.py' cmd3 = "echo -e '\n\n%s '" % _('NeoBoot: Complete Skin Change!') cmd4 = "echo -e '\n\n%s '" % _('To use the new skin please restart enigma2') self.session.open(Console, _('NeoBoot Skin Change'), [cmd, cmd1, cmd2, cmd3, cmd4]) elif isHD(): cmd = "echo -e '\n\n%s '" % _('Please wait, NeoBot is working, skin change is progress...') - cmd1 = 'rm -f ' +LinkNeoBoot+ '/usedskin.p*; sleep 2' - cmd2 = 'sleep 2; cp -r ' + self.skindir + '/' + self.selectedskin + '/*.py ' +LinkNeoBoot+ '/usedskin.py' + cmd1 = 'rm -f ' + LinkNeoBoot + '/usedskin.p*; sleep 2' + cmd2 = 'sleep 2; cp -r ' + self.skindir + '/' + self.selectedskin + '/*.py ' + LinkNeoBoot + '/usedskin.py' cmd3 = "echo -e '\n\n%s '" % _('NeoBoot: Complete Skin Change!') cmd4 = "echo -e '\n\n%s '" % _('Skin change available only for full hd skin.') cmd5 = "echo -e '\n\n%s '" % _('Please come back to default skin.') @@ -1525,23 +1525,23 @@ class InternalFlash(Screen): if getBoxHostName == 'ax60': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p21 /media/InternalFlash') - if getBoxHostName() == 'ustym4kpro' or getTunerModel() == 'ustym4kpro': + if getBoxHostName() == 'ustym4kpro' or getTunerModel() == 'ustym4kpro': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p13 /media/InternalFlash') if os.path.exists('/proc/stb/info/model'): if getTunerModel() == 'dm900' or getCPUSoC() == 'BCM97252SSFF': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p2 /media/InternalFlash') - if getBoxVuModel() == 'uno4kse' or getBoxVuModel() == 'uno4k' or getBoxVuModel() == 'ultimo4k' or getBoxVuModel() == 'solo4k': + if getBoxVuModel() == 'uno4kse' or getBoxVuModel() == 'uno4k' or getBoxVuModel() == 'ultimo4k' or getBoxVuModel() == 'solo4k': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p4 /media/InternalFlash') - if getBoxVuModel() == 'zero4k': + if getBoxVuModel() == 'zero4k': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p7 /media/InternalFlash') - if getBoxVuModel() == 'duo4k': + if getBoxVuModel() == 'duo4k': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p9 /media/InternalFlash') - if getBoxVuModel() == 'duo4kse': + if getBoxVuModel() == 'duo4kse': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p9 /media/InternalFlash') if getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k': @@ -1661,7 +1661,7 @@ class TunerInfo(Screen): def iNFO(self): try: - cmd = ' cat ' +LinkNeoBoot+ '/stbinfo.cfg' + cmd = ' cat ' + LinkNeoBoot + '/stbinfo.cfg' cmd1 = '' self.session.openWithCallback(self.close, Console, _('NeoBoot....'), [cmd, cmd1]) diff --git a/NeoBoot/neoskins/darog69/skin_darog69.py b/NeoBoot/neoskins/darog69/skin_darog69.py index 45e8d65..b93ec20 100644 --- a/NeoBoot/neoskins/darog69/skin_darog69.py +++ b/NeoBoot/neoskins/darog69/skin_darog69.py @@ -5,7 +5,7 @@ import os # darog69 = ./neoskins/darog69/skin_darog69.py ### ImageChooseFULLHD - darog69 -ImageChooseFULLHD =""" +ImageChooseFULLHD = """ diff --git a/NeoBoot/neoskins/darog69_Ustym4kpro/skin_darog69_Ustym4kpro.py b/NeoBoot/neoskins/darog69_Ustym4kpro/skin_darog69_Ustym4kpro.py index 8f16d3c..a133682 100644 --- a/NeoBoot/neoskins/darog69_Ustym4kpro/skin_darog69_Ustym4kpro.py +++ b/NeoBoot/neoskins/darog69_Ustym4kpro/skin_darog69_Ustym4kpro.py @@ -5,7 +5,7 @@ import os # darog69 = ./neoskins/darog69_Ustym4kpro/skin_darog69_Ustym4kpro.py ### ImageChooseFULLHD - darog69_Ustym4kpro -ImageChooseFULLHD =""" +ImageChooseFULLHD = """ @@ -58,4 +58,4 @@ ImageChooseFULLHD =""" ### - \ No newline at end of file + diff --git a/NeoBoot/neoskins/default.py b/NeoBoot/neoskins/default.py index 073d785..fc47ce5 100644 --- a/NeoBoot/neoskins/default.py +++ b/NeoBoot/neoskins/default.py @@ -31,7 +31,7 @@ import os # ###____ Skin Ultra HD - ImageChooseFULLHD ___ mod. gutosie___ -ImageChooseFULLHD =""" +ImageChooseFULLHD = """ @@ -89,7 +89,7 @@ ImageChooseFULLHD =""" ###____ Skin Ultra HD - ImageChooseULTRAHD ___ mod. gutosie___ -ImageChooseULTRAHD =""" +ImageChooseULTRAHD = """ @@ -138,7 +138,7 @@ ImageChooseULTRAHD =""" ###____ Skin HD - ImageChoose ___mod. gutosie ___ -ImageChooseHD =""" +ImageChooseHD = """ \n \n \n @@ -190,7 +190,7 @@ ImageChooseHD =""" ###____ Skin FULLHD - MyUpgradeFULLHD ___mod. gutosie ___ -MyUpgradeFULLHD =""" +MyUpgradeFULLHD = """ @@ -209,7 +209,7 @@ MyUpgradeFULLHD =""" ###____ Skin UltraHD - MyUpgradeUltraHD ___mod. gutosie ___ -MyUpgradeUltraHD =""" +MyUpgradeUltraHD = """ @@ -226,7 +226,7 @@ MyUpgradeUltraHD =""" ###____ Skin MyUpgradeHD - MyUpgradeHD ___mod. gutosie ___ -MyUpgradeHD =""" +MyUpgradeHD = """ @@ -245,7 +245,7 @@ MyUpgradeHD =""" ###____ Skin NeoBootInstallationFULLHD - NeoBootInstallationFULLHD ___mod. gutosie ___ -NeoBootInstallationFULLHD =""" +NeoBootInstallationFULLHD = """ @@ -267,7 +267,7 @@ NeoBootInstallationFULLHD =""" """ ###____ Skin NeoBootInstallationUltraHD - NeoBootInstallationUltraHD ___mod. gutosie ___ -NeoBootInstallationUltraHD =""" +NeoBootInstallationUltraHD = """ @@ -299,7 +299,7 @@ NeoBootInstallationUltraHD =""" ###____ Skin NeoBootInstallationHD - NeoBootInstallationHD ___mod. gutosie ___ -NeoBootInstallationHD =""" +NeoBootInstallationHD = """ @@ -321,4 +321,4 @@ NeoBootInstallationHD =""" - \ No newline at end of file + diff --git a/NeoBoot/neoskins/mercus/mercus_skin.py b/NeoBoot/neoskins/mercus/mercus_skin.py index eb85862..74a63f4 100644 --- a/NeoBoot/neoskins/mercus/mercus_skin.py +++ b/NeoBoot/neoskins/mercus/mercus_skin.py @@ -6,7 +6,7 @@ import os # mercus = /neoskins/mercus/mercus_skin.py ### ImageChooseFULLHD - mercus -ImageChooseFULLHD =""" +ImageChooseFULLHD = """ diff --git a/NeoBoot/neoskins/metrix/metrix_skin.py b/NeoBoot/neoskins/metrix/metrix_skin.py index ba6c362..aafe96b 100644 --- a/NeoBoot/neoskins/metrix/metrix_skin.py +++ b/NeoBoot/neoskins/metrix/metrix_skin.py @@ -6,7 +6,7 @@ import os # skin /neoskins/matrix/matrix_skin.py - mod.gutosie ### ImageChooseFULLHD -ImageChooseFULLHD =""" +ImageChooseFULLHD = """ diff --git a/NeoBoot/neoskins/neo/neo_skin.py b/NeoBoot/neoskins/neo/neo_skin.py index 46bb0ea..464f906 100644 --- a/NeoBoot/neoskins/neo/neo_skin.py +++ b/NeoBoot/neoskins/neo/neo_skin.py @@ -26,7 +26,7 @@ import os # ### ImageChooseFULLHD -ImageChooseFULLHD =""" +ImageChooseFULLHD = """ diff --git a/NeoBoot/neoskins/oldhd/hd_skin.py b/NeoBoot/neoskins/oldhd/hd_skin.py index 78a42c3..9df3dbf 100644 --- a/NeoBoot/neoskins/oldhd/hd_skin.py +++ b/NeoBoot/neoskins/oldhd/hd_skin.py @@ -6,7 +6,7 @@ import os ###____ Skin HD - ImageChoose ___mod. gutosie ___ -ImageChooseHD =""" +ImageChooseHD = """ diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index a1fef61..eb20178 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -16,7 +16,7 @@ #--------------------------------------------- NEOBOOT ---------------------------------------------# from __future__ import absolute_import from . import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import LogCrashGS, getSupportedTuners, getLabelDisck, getINSTALLNeo, getNeoLocation, getLocationMultiboot, getNeoMount, getNeoMount2, getNeoMount3, getNeoMount4, getNeoMount5, getFSTAB, getFSTAB2, getKernelVersionString, getKernelImageVersion, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getTunerModel, getImageDistroN, getFormat, getNEO_filesystems, getBoxModelVU, getMountPointAll, getMountPointNeo +from Plugins.Extensions.NeoBoot.files.stbbranding import LogCrashGS, getSupportedTuners, getLabelDisck, getINSTALLNeo, getNeoLocation, getLocationMultiboot, getNeoMount, getNeoMount2, getNeoMount3, getNeoMount4, getNeoMount5, getFSTAB, getFSTAB2, getKernelVersionString, getKernelImageVersion, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getTunerModel, getImageDistroN, getFormat, getNEO_filesystems, getBoxModelVU, getMountPointAll, getMountPointNeo from Plugins.Extensions.NeoBoot.files import Harddisk from Components.About import about from enigma import getDesktop, eTimer @@ -101,13 +101,13 @@ def isUHD(): class MyUpgrade(Screen): if isFHD(): from Plugins.Extensions.NeoBoot.neoskins.default import MyUpgradeFULLHD - skin=MyUpgradeFULLHD + skin = MyUpgradeFULLHD elif isUHD(): from Plugins.Extensions.NeoBoot.neoskins.default import MyUpgradeUltraHD - skin=MyUpgradeUltraHD + skin = MyUpgradeUltraHD else: from Plugins.Extensions.NeoBoot.neoskins.default import MyUpgradeHD - skin=MyUpgradeHD + skin = MyUpgradeHD __module__ = __name__ @@ -162,13 +162,13 @@ class MyUpgrade(Screen): class NeoBootInstallation(Screen): if isFHD(): from Plugins.Extensions.NeoBoot.neoskins.default import NeoBootInstallationFULLHD - skin=NeoBootInstallationFULLHD + skin = NeoBootInstallationFULLHD elif isUHD(): from Plugins.Extensions.NeoBoot.neoskins.default import NeoBootInstallationUltraHD - skin=NeoBootInstallationUltraHD + skin = NeoBootInstallationUltraHD else: from Plugins.Extensions.NeoBoot.neoskins.default import NeoBootInstallationHD - skin=NeoBootInstallationHD + skin = NeoBootInstallationHD def __init__(self, session): Screen.__init__(self, session) @@ -420,7 +420,7 @@ class NeoBootInstallation(Screen): if fileExists('/proc/mounts'): with open('/proc/mounts', 'r') as f: for line in f.readlines(): - if line.find(' ext') and line.find('/media/hdd') or line.find('/media/usb') == -1 and (line.find('ext4') != -1 or line.find('ext3') != -1 or line.find('ext2') != -1): + if line.find(' ext') and line.find('/media/hdd') or line.find('/media/usb') == -1 and (line.find('ext4') != -1 or line.find('ext3') != -1 or line.find('ext2') != -1): check = True break @@ -665,20 +665,20 @@ class NeoBootImageChoose(Screen): if isFHD(): try: from Plugins.Extensions.NeoBoot.usedskin import ImageChooseFULLHD - skin=ImageChooseFULLHD + skin = ImageChooseFULLHD except: from Plugins.Extensions.NeoBoot.neoskins.default import ImageChooseFULLHD - skin=ImageChooseFULLHD + skin = ImageChooseFULLHD elif isUHD(): from Plugins.Extensions.NeoBoot.neoskins.default import ImageChooseULTRAHD - skin=ImageChooseULTRAHD + skin = ImageChooseULTRAHD else: try: from Plugins.Extensions.NeoBoot.usedskin import ImageChooseHD - skin=ImageChooseHD + skin = ImageChooseHD except: from Plugins.Extensions.NeoBoot.neoskins.default import ImageChooseHD - skin=ImageChooseHD + skin = ImageChooseHD def __init__(self, session): Screen.__init__(self, session) @@ -868,7 +868,7 @@ class NeoBootImageChoose(Screen): with open('/.multinfo', 'r') as f: imagefile = f.readline().strip() f.close() - out = open('%sImageBoot/.neonextboot'% getNeoLocation(), 'w') + out = open('%sImageBoot/.neonextboot' % getNeoLocation(), 'w') out.write(imagefile) out.close() else: @@ -1169,7 +1169,7 @@ class NeoBootImageChoose(Screen): strview2 = _('Free Space : ') + usfree[0:-3] + ' MB' self['label11'].setText(strview2) - strview1 = _('Capacity : ') + usperc + _(' Full') + strview1 = _('Capacity : ') + usperc + _(' Full') self['label18'].setText(strview1) try: @@ -1380,26 +1380,26 @@ class NeoBootImageChoose(Screen): system('mkdir %sImagesUpload' % getNeoLocation()) images = False - myimages=listdir('%sImagesUpload' % getNeoLocation()) + myimages = listdir('%sImagesUpload' % getNeoLocation()) print(myimages) for fil in myimages: if fil.endswith(".zip"): - images=True + images = True break if os.path.exists('%sImagesUpload/*zip' % getNeoLocation()): - images=True + images = True break if os.path.exists('%sImagesUpload/*.tar.bz2' % getNeoLocation()): - images=True + images = True break if fil.endswith(".tar.xz"): - images=True + images = True break if fil.endswith(".nfi"): - images=True + images = True break else: - images=False + images = False if images is True: self.ImageTrue() else: @@ -1473,7 +1473,7 @@ class NeoBootImageChoose(Screen): out.close() if getImageNeoBoot() != "Flash": - if not fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if not fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): message = _('After successful launch of the selected software\nyou must run the neoboot plugin\nif the software does not start or neoboot is not confirmed\nthe system will return to the internal flash memory\n\nPress OK or exit on the remote control to continue...') ybox = self.session.openWithCallback(self.StartReboot, MessageBox, message, MessageBox.TYPE_YESNO) ybox.setTitle(_('First start of software')) diff --git a/NeoBoot/tmpfiles/runpy/arm_run.py b/NeoBoot/tmpfiles/runpy/arm_run.py index 9b6a62f..b5b5e5b 100644 --- a/NeoBoot/tmpfiles/runpy/arm_run.py +++ b/NeoBoot/tmpfiles/runpy/arm_run.py @@ -2,7 +2,7 @@ #from __init__ import _ from Plugins.Extensions.NeoBoot.__init__ import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import getSupportedTuners, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxHostName, getTunerModel, getNeoLocation, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 +from Plugins.Extensions.NeoBoot.files.stbbranding import getSupportedTuners, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxHostName, getTunerModel, getNeoLocation, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -96,12 +96,12 @@ class StartImage(Screen): def StartImageInNeoBoot(self): if getImageNeoBoot() != 'Flash': - if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): system('touch /tmp/.control_ok ') else: system('touch %sImageBoot/%s/.control_boot_new_image ' % (getNeoLocation(), getImageNeoBoot())) if fileExists('/.multinfo') and getCPUtype() == 'ARMv7': - os.system(' ' +LinkNeoBoot+ '/files/findsk.sh; mkdir -p /media/InternalFlash; mount /tmp/root /media/InternalFlash') + os.system(' ' + LinkNeoBoot + '/files/findsk.sh; mkdir -p /media/InternalFlash; mount /tmp/root /media/InternalFlash') self.sel = self['list'].getCurrent() if self.sel: @@ -151,24 +151,24 @@ class StartImage(Screen): self.session.open(Console, _('NeoBoot-Reboot ....'), [cmd, cmd1]) elif not fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 5; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -d -f ' + cmd1 = 'sleep 5; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -d -f ' self.session.open(Console, _('NeoBoot ....'), [cmd, cmd1]) else: cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 5; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -d -f ' + cmd1 = 'sleep 5; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -d -f ' self.session.open(Console, _('NeoBoot-ERROR!!! ....'), [cmd, cmd1]) elif getImageNeoBoot() != 'Flash': if fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 5; reboot -d -f ' + cmd1 = 'sleep 5; reboot -d -f ' self.session.open(Console, _('NeoBoot ....'), [cmd, cmd1]) elif not fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 5; ln -sfn /sbin/neoinitarm /sbin/init; reboot -d -f ' + cmd1 = 'sleep 5; ln -sfn /sbin/neoinitarm /sbin/init; reboot -d -f ' self.session.open(Console, _('NeoBoot ....'), [cmd, cmd1]) else: cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 5; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -d -f ' + cmd1 = 'sleep 5; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -d -f ' self.session.open(Console, _('NeoBoot-ERROR!!! ....'), [cmd, cmd1]) else: os.system('echo "Flash " >> ' + getNeoLocation() + 'ImageBoot/.neonextboot') diff --git a/NeoBoot/tmpfiles/runpy/duo4k_run.py b/NeoBoot/tmpfiles/runpy/duo4k_run.py index 934e497..79ded8f 100644 --- a/NeoBoot/tmpfiles/runpy/duo4k_run.py +++ b/NeoBoot/tmpfiles/runpy/duo4k_run.py @@ -2,7 +2,7 @@ #from __init__ import _ from Plugins.Extensions.NeoBoot.__init__ import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 +from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -96,13 +96,13 @@ class StartImage(Screen): def StartImageInNeoBoot(self): if getImageNeoBoot() != 'Flash': - if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): system('touch /tmp/.control_ok ') else: system('touch %sImageBoot/%s/.control_boot_new_image ' % (getNeoLocation(), getImageNeoBoot())) if fileExists('/.multinfo') and getCPUtype() == 'ARMv7': - if getBoxVuModel() == 'duo4k': + if getBoxVuModel() == 'duo4k': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p9 /media/InternalFlash') @@ -132,7 +132,7 @@ class StartImage(Screen): cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') cmd1 = 'sleep 5; ln -sf "init.sysvinit" "/sbin/init"; reboot -dfhi' - elif getImageNeoBoot() != 'Flash': + elif getImageNeoBoot() != 'Flash': if not fileExists('/.multinfo'): if not fileExists('%sImageBoot/%s/boot/zImage.%s' % (getNeoLocation(), getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') diff --git a/NeoBoot/tmpfiles/runpy/duo4kse_run.py b/NeoBoot/tmpfiles/runpy/duo4kse_run.py index 4a9ea43..e5d0dd0 100644 --- a/NeoBoot/tmpfiles/runpy/duo4kse_run.py +++ b/NeoBoot/tmpfiles/runpy/duo4kse_run.py @@ -2,7 +2,7 @@ #from __init__ import _ from Plugins.Extensions.NeoBoot.__init__ import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 +from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -96,13 +96,13 @@ class StartImage(Screen): def StartImageInNeoBoot(self): if getImageNeoBoot() != 'Flash': - if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): system('touch /tmp/.control_ok ') else: system('touch %sImageBoot/%s/.control_boot_new_image ' % (getNeoLocation(), getImageNeoBoot())) if fileExists('/.multinfo') and getCPUtype() == 'ARMv7': - if getBoxVuModel() == 'duo4kse': + if getBoxVuModel() == 'duo4kse': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p9 /media/InternalFlash') @@ -132,7 +132,7 @@ class StartImage(Screen): cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') cmd1 = 'sleep 5; ln -sf "init.sysvinit" "/sbin/init"; reboot -dfhi' - elif getImageNeoBoot() != 'Flash': + elif getImageNeoBoot() != 'Flash': if not fileExists('/.multinfo'): if not fileExists('%sImageBoot/%s/boot/zImage.%s' % (getNeoLocation(), getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') diff --git a/NeoBoot/tmpfiles/runpy/mips_run.py b/NeoBoot/tmpfiles/runpy/mips_run.py index 40d87dd..3899ee6 100644 --- a/NeoBoot/tmpfiles/runpy/mips_run.py +++ b/NeoBoot/tmpfiles/runpy/mips_run.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from Plugins.Extensions.NeoBoot.__init__ import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import getSupportedTuners, getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 +from Plugins.Extensions.NeoBoot.files.stbbranding import getSupportedTuners, getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -95,7 +95,7 @@ class StartImage(Screen): def StartImageInNeoBoot(self): if getImageNeoBoot() != 'Flash': - if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): system('touch /tmp/.control_ok ') else: system('touch %sImageBoot/%s/.control_boot_new_image ' % (getNeoLocation(), getImageNeoBoot())) @@ -110,20 +110,20 @@ class StartImage(Screen): if (getSupportedTuners()): if getImageNeoBoot() == 'Flash': cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 8; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -f ' + cmd1 = 'sleep 8; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -f ' self.session.open(Console, _('NeoBoot ....'), [cmd, cmd1]) elif getImageNeoBoot() != 'Flash': if fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 5; reboot -f ' + cmd1 = 'sleep 5; reboot -f ' self.session.open(Console, _('NeoBoot ....'), [cmd, cmd1]) elif not fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 8; ln -sfn /sbin/neoinitmips /sbin/init; reboot -f ' + cmd1 = 'sleep 8; ln -sfn /sbin/neoinitmips /sbin/init; reboot -f ' self.session.open(Console, _('NeoBoot ....'), [cmd, cmd1]) else: cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') - cmd1='sleep 8; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -f ' + cmd1 = 'sleep 8; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -f ' self.session.open(Console, _('NeoBoot-ERROR!!! ....'), [cmd, cmd1]) else: os.system('echo "Flash " >> ' + getNeoLocation() + 'ImageBoot/.neonextboot') diff --git a/NeoBoot/tmpfiles/runpy/vu4k_run.py b/NeoBoot/tmpfiles/runpy/vu4k_run.py index 53a00cf..b1f3731 100644 --- a/NeoBoot/tmpfiles/runpy/vu4k_run.py +++ b/NeoBoot/tmpfiles/runpy/vu4k_run.py @@ -3,7 +3,7 @@ #from __init__ import _ from Plugins.Extensions.NeoBoot.__init__ import _ #from __future__ import print_function -from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 +from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -96,13 +96,13 @@ class StartImage(Screen): def StartImageInNeoBoot(self): if getImageNeoBoot() != "Flash": - if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): system('touch /tmp/.control_ok ') else: system('touch %sImageBoot/%s/.control_boot_new_image ' % (getNeoLocation(), getImageNeoBoot())) if fileExists('/.multinfo') and getCPUtype() == "ARMv7": - if getBoxVuModel() == "uno4kse" or getBoxVuModel() == "uno4k" or getBoxVuModel() == "ultimo4k" or getBoxVuModel() == "solo4k": + if getBoxVuModel() == "uno4kse" or getBoxVuModel() == "uno4k" or getBoxVuModel() == "ultimo4k" or getBoxVuModel() == "solo4k": os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p4 /media/InternalFlash') system('chmod 755 ' + LinkNeoBoot + '/files/kernel.sh') @@ -129,7 +129,7 @@ class StartImage(Screen): cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') cmd1 = 'sleep 5; ln -sf "init.sysvinit" "/sbin/init"; reboot -dfhi' - elif getImageNeoBoot() != "Flash": + elif getImageNeoBoot() != "Flash": if not fileExists("/.multinfo"): if not fileExists('%sImageBoot/%s/boot/zImage.%s' % (getNeoLocation(), getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') diff --git a/NeoBoot/tmpfiles/runpy/vu_mtd1_run.py b/NeoBoot/tmpfiles/runpy/vu_mtd1_run.py index bbfaf55..5a2cbcc 100644 --- a/NeoBoot/tmpfiles/runpy/vu_mtd1_run.py +++ b/NeoBoot/tmpfiles/runpy/vu_mtd1_run.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from Plugins.Extensions.NeoBoot.__init__ import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 +from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -95,7 +95,7 @@ class StartImage(Screen): def StartImageInNeoBoot(self): if getImageNeoBoot() != 'Flash': - if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): system('touch /tmp/.control_ok ') else: system('touch %sImageBoot/%s/.control_boot_new_image ' % (getNeoLocation(), getImageNeoBoot())) diff --git a/NeoBoot/tmpfiles/runpy/vu_mtd2_run.py b/NeoBoot/tmpfiles/runpy/vu_mtd2_run.py index 40a532f..ef27cc3 100644 --- a/NeoBoot/tmpfiles/runpy/vu_mtd2_run.py +++ b/NeoBoot/tmpfiles/runpy/vu_mtd2_run.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from Plugins.Extensions.NeoBoot.__init__ import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 +from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -95,7 +95,7 @@ class StartImage(Screen): def StartImageInNeoBoot(self): if getImageNeoBoot() != 'Flash': - if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): system('touch /tmp/.control_ok ') else: system('touch %sImageBoot/%s/.control_boot_new_image ' % (getNeoLocation(), getImageNeoBoot())) @@ -112,7 +112,7 @@ class StartImage(Screen): #################_____mips___########################## #VUPLUS MIPS vu_dev_mtd2.sh - if getBoxHostName() == 'vusolo2' or getBoxHostName() == 'vusolose' or getBoxHostName() == 'vuduo2' or getBoxHostName() == 'vuzero': + if getBoxHostName() == 'vusolo2' or getBoxHostName() == 'vusolose' or getBoxHostName() == 'vuduo2' or getBoxHostName() == 'vuzero': if not fileExists('%sImagesUpload/.kernel/%s.vmlinux.gz' % (getNeoLocation(), getBoxHostName())): self.myclose2(_('Error - in the location %sImagesUpload/.kernel/ \nkernel file not found flash kernel vmlinux.gz ' % getNeoLocation())) else: diff --git a/NeoBoot/tmpfiles/runpy/zero4k_run.py b/NeoBoot/tmpfiles/runpy/zero4k_run.py index 2907ae5..037ba15 100644 --- a/NeoBoot/tmpfiles/runpy/zero4k_run.py +++ b/NeoBoot/tmpfiles/runpy/zero4k_run.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from Plugins.Extensions.NeoBoot.__init__ import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 +from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getNeoMount, getNeoMount2,getNeoMount3, getNeoMount4, getNeoMount5, getMountPointNeo2 from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -95,13 +95,13 @@ class StartImage(Screen): def StartImageInNeoBoot(self): if getImageNeoBoot() != 'Flash': - if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): + if fileExists('%sImageBoot/%s/.control_ok' % (getNeoLocation(), getImageNeoBoot())): system('touch /tmp/.control_ok ') else: system('touch %sImageBoot/%s/.control_boot_new_image ' % (getNeoLocation(), getImageNeoBoot())) if fileExists('/.multinfo') and getCPUtype() == 'ARMv7': - if getBoxVuModel() == 'zero4k': + if getBoxVuModel() == 'zero4k': os.system('mkdir -p /media/InternalFlash; mount /dev/mmcblk0p7 /media/InternalFlash') system('chmod 755 ' + LinkNeoBoot + '/files/kernel.sh') @@ -129,7 +129,7 @@ class StartImage(Screen): cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') cmd1 = 'sleep 5; ln -sf "init.sysvinit" "/sbin/init"; reboot -dfhi' - elif getImageNeoBoot() != 'Flash': + elif getImageNeoBoot() != 'Flash': if not fileExists('/.multinfo'): if not fileExists('%sImageBoot/%s/boot/zImage.%s' % (getNeoLocation(), getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') diff --git a/NeoBoot/unpack.py b/NeoBoot/unpack.py index 8eeb60b..f008d2c 100644 --- a/NeoBoot/unpack.py +++ b/NeoBoot/unpack.py @@ -2,7 +2,7 @@ #from __init__ import _ from Plugins.Extensions.NeoBoot.__init__ import _ -from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getKernelVersionString, getKernelImageVersion, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getTunerModel +from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getKernelVersionString, getKernelImageVersion, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getTunerModel from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen diff --git a/NeoBoot/usedskin.py b/NeoBoot/usedskin.py index e0920ff..f0915bf 100644 --- a/NeoBoot/usedskin.py +++ b/NeoBoot/usedskin.py @@ -31,7 +31,7 @@ import os # ###____ Skin Ultra HD - ImageChooseFULLHD ___ mod. gutosie___ -ImageChooseFULLHD =""" +ImageChooseFULLHD = """ @@ -89,7 +89,7 @@ ImageChooseFULLHD =""" ###____ Skin Ultra HD - ImageChooseULTRAHD ___ mod. gutosie___ -ImageChooseULTRAHD =""" +ImageChooseULTRAHD = """ @@ -138,7 +138,7 @@ ImageChooseULTRAHD =""" ###____ Skin HD - ImageChoose ___mod. gutosie ___ -ImageChooseHD =""" +ImageChooseHD = """ @@ -185,7 +185,7 @@ ImageChooseHD =""" ###____ Skin FULLHD - MyUpgradeFULLHD ___mod. gutosie ___ -MyUpgradeFULLHD =""" +MyUpgradeFULLHD = """ @@ -204,7 +204,7 @@ MyUpgradeFULLHD =""" ###____ Skin UltraHD - MyUpgradeUltraHD ___mod. gutosie ___ -MyUpgradeUltraHD =""" +MyUpgradeUltraHD = """ @@ -221,7 +221,7 @@ MyUpgradeUltraHD =""" ###____ Skin MyUpgradeHD - MyUpgradeHD ___mod. gutosie ___ -MyUpgradeHD =""" +MyUpgradeHD = """ @@ -240,7 +240,7 @@ MyUpgradeHD =""" ###____ Skin NeoBootInstallationFULLHD - NeoBootInstallationFULLHD ___mod. gutosie ___ -NeoBootInstallationFULLHD =""" +NeoBootInstallationFULLHD = """ @@ -262,7 +262,7 @@ NeoBootInstallationFULLHD =""" """ ###____ Skin NeoBootInstallationUltraHD - NeoBootInstallationUltraHD ___mod. gutosie ___ -NeoBootInstallationUltraHD =""" +NeoBootInstallationUltraHD = """ @@ -294,7 +294,7 @@ NeoBootInstallationUltraHD =""" ###____ Skin NeoBootInstallationHD - NeoBootInstallationHD ___mod. gutosie ___ -NeoBootInstallationHD =""" +NeoBootInstallationHD = """ @@ -316,4 +316,4 @@ NeoBootInstallationHD =""" - \ No newline at end of file +