diff --git a/NeoBoot/files/stbbranding.py b/NeoBoot/files/stbbranding.py index 194bb12..18dd449 100644 --- a/NeoBoot/files/stbbranding.py +++ b/NeoBoot/files/stbbranding.py @@ -9,6 +9,17 @@ from Tools.Directories import fileExists, SCOPE_PLUGINS def fileCheck(f, mode = 'r'): return fileExists(f, mode) and f +#check imageATV +def getImageATv(): + 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' + return atvimage + #check install def getNeoLocation(): locatino='UNKNOWN' diff --git a/NeoBoot/files/tools.py b/NeoBoot/files/tools.py index d3b622c..faa0886 100644 --- a/NeoBoot/files/tools.py +++ b/NeoBoot/files/tools.py @@ -22,7 +22,7 @@ from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE, from os import system, listdir, mkdir, chdir, getcwd, rename as os_rename, remove as os_remove, popen from os.path import dirname, isdir, isdir as os_isdir from enigma import eTimer -from stbbranding import getNeoLocation, getImageNeoBoot, getKernelVersionString, getBoxHostName, getCPUtype, getBoxVuModel, getTunerModel, getCPUSoC +from stbbranding import getNeoLocation, getImageNeoBoot, getKernelVersionString, getBoxHostName, getCPUtype, getBoxVuModel, getTunerModel, getCPUSoC, getImageATv import os import time import sys @@ -55,8 +55,8 @@ def getKernelVersion(): try: return open('/proc/version', 'r').read().split(' ', 4)[2].split('-', 2)[0] except: - return _('unknown') - + return _('unknown') + def getCPUtype(): cpu='UNKNOWN' if os.path.exists('/proc/cpuinfo'): @@ -189,11 +189,15 @@ class MBTools(Screen): self.list.append (res) self ['list']. list = self.list - res = (_ ('Supported sat tuners'), png, 16) + res = (_ ('Add cams to feed for OpenATV '), png, 16) self.list.append (res) self ['list']. list = self.list - res = (_ ('NeoBoot Information'), png, 17) + res = (_ ('Supported sat tuners'), png, 17) + self.list.append (res) + self ['list']. list = self.list + + res = (_ ('NeoBoot Information'), png, 18) self.list.append (res) self ['list']. list = self.list @@ -234,9 +238,11 @@ class MBTools(Screen): pass if self.sel == 15 and self.session.open(DeletingLanguages): pass - if self.sel == 16 and self.session.open(TunerInfo): + if self.sel == 16 and self.session.open(ATVcamfeed): pass - if self.sel == 17 and self.session.open(MultiBootMyHelp): + if self.sel == 17 and self.session.open(TunerInfo): + pass + if self.sel == 18 and self.session.open(MultiBootMyHelp): pass class MBBackup(Screen): @@ -1431,6 +1437,35 @@ class DeletingLanguages(Screen): self.close() +class ATVcamfeed(Screen): + __module__ = __name__ + skin = """ + + + + """ + + def __init__(self, session): + Screen.__init__(self, session) + self['lab1'] = Label(_('Add Cam dowloand from feed.')) + self['key_red'] = Label(_('Start')) + self['actions'] = ActionMap(['WizardActions', 'ColorActions'], {'back': self.close, + 'red': self.addcamatv}) + + def addcamatv(self): + if getImageATv() == 'okfeedCAMatv': + cmd = "echo -e '\n\n%s '" % _('NeoBoot - ATV add cam feed ...') + cmd1 = 'wget -O - -q http://updates.mynonpublic.com/oea/feed | bash' + self.session.open(Console, _('NeoBoot: Cams feed add...'), [cmd, cmd1]) + + elif getImageATv() != 'okfeedCAMatv': + self.myClose(_('Sorry, is not image Open ATV !!!')) + + def myClose(self, message): + self.session.open(MessageBox, message, MessageBox.TYPE_INFO) + self.close() + + class TunerInfo(Screen): __module__ = __name__ skin = """