Merge branch 'master' of git.opendreambox.org:/git/enigma2

7 files changed, 344 insertions, 9 deletions

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 4df02d5d..32e86272 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -913,13 +913,14 @@ class ConfigText(ConfigElement, NumericalTextInput):
 			self.timeout()
 			self.overwrite = not self.overwrite
 		elif key == KEY_ASCII:
-  			self.timeout()
-  			newChar = unichr(getPrevAsciiCode())
-			if self.allmarked:
-				self.deleteAllChars()
-				self.allmarked = False
-			self.insertChar(newChar, self.marked_pos, False)
-			self.marked_pos += 1
+			self.timeout()
+			newChar = unichr(getPrevAsciiCode())
+			if not self.useableChars or newChar in self.useableChars:
+				if self.allmarked:
+					self.deleteAllChars()
+					self.allmarked = False
+				self.insertChar(newChar, self.marked_pos, False)
+				self.marked_pos += 1
 		elif key in KEY_NUMBERS:
 			owr = self.lastKey == getKeyNumber(key)
 			newChar = self.getKey(getKeyNumber(key))
diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py
index 6d9a4491..9a37c14e 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py
@@ -166,7 +166,10 @@ class DemuxTask(Task):
 		if failed:
 			import os
 			for file in self.generated_files:
-				os.remove(file)
+				try:
+					os.remove(file)
+				except OSError:
+					pass
 
 class MplexTaskPostcondition(Condition):
 	def check(self, task):
diff --git a/lib/python/Plugins/Extensions/Makefile.am b/lib/python/Plugins/Extensions/Makefile.am
index edbd2084..c15e1c2c 100755
--- a/lib/python/Plugins/Extensions/Makefile.am
+++ b/lib/python/Plugins/Extensions/Makefile.am
@@ -1 +1 @@
-SUBDIRS = TuxboxPlugins FileManager CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDPlayer DVDBurn
+SUBDIRS = TuxboxPlugins FileManager CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDPlayer DVDBurn Modem
diff --git a/lib/python/Plugins/Extensions/Modem/Makefile.am b/lib/python/Plugins/Extensions/Modem/Makefile.am
new file mode 100644
index 00000000..3fc61053
--- /dev/null
+++ b/lib/python/Plugins/Extensions/Modem/Makefile.am
@@ -0,0 +1,7 @@
+installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/Modem
+
+install_PYTHON =	\
+	__init__.py \
+	plugin.py
+
+install_DATA = keymap.xml
\ No newline at end of file
diff --git a/lib/python/Plugins/Extensions/Modem/__init__.py b/lib/python/Plugins/Extensions/Modem/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/lib/python/Plugins/Extensions/Modem/__init__.py
diff --git a/lib/python/Plugins/Extensions/Modem/keymap.xml b/lib/python/Plugins/Extensions/Modem/keymap.xml
new file mode 100644
index 00000000..1f1bdfc8
--- /dev/null
+++ b/lib/python/Plugins/Extensions/Modem/keymap.xml
@@ -0,0 +1,41 @@
+<keymap>
+	<map context="ModemActions">
+		<key id="KEY_ENTER" mapto="ok" flags="m" />
+		<key id="KEY_EXIT" mapto="cancel" flags="m" />
+		<key id="KEY_ESC" mapto="cancel" flags="m" />
+		<key id="KEY_RED" mapto="disconnect" flags="m" />
+		<key id="KEY_GREEN" mapto="connect" flags="m" />
+		<device name="dreambox remote control (native)">
+			<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
+			<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
+			<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		</device>
+		<device name="dreambox advanced remote control (native)">
+			<key id="KEY_MUTE" mapto="deleteForward" flags="mr" />
+			<key id="KEY_NEXT" mapto="deleteForward" flags="mr" />
+			<key id="KEY_PREVIOUS" mapto="deleteBackward" flags="mr" />
+		</device>
+		<key id="KEY_LEFT" mapto="left" flags="mr" />
+		<key id="KEY_RIGHT" mapto="right" flags="mr" />
+		<key id="KEY_1" mapto="1" flags="m" />
+		<key id="KEY_2" mapto="2" flags="m" />
+		<key id="KEY_3" mapto="3" flags="m" />
+		<key id="KEY_4" mapto="4" flags="m" />
+		<key id="KEY_5" mapto="5" flags="m" />
+		<key id="KEY_6" mapto="6" flags="m" />
+		<key id="KEY_7" mapto="7" flags="m" />
+		<key id="KEY_8" mapto="8" flags="m" />
+		<key id="KEY_9" mapto="9" flags="m" />
+		<key id="KEY_0" mapto="0" flags="m" />
+	</map>
+	<map context="ListboxDisableActions">
+		<key id="KEY_UP" mapto="moveUp" flags="mr" />
+		<key id="KEY_DOWN" mapto="moveDown" flags="mr" />
+		<key id="KEY_HOME" mapto="moveTop" flags="mr" />
+		<key id="KEY_END" mapto="moveEnd" flags="mr" />
+		<key id="KEY_PAGEUP" mapto="pageUp" flags="mr" />
+		<key id="KEY_PAGEDOWN" mapto="pageDown" flags="mr" />
+		<key id="KEY_LEFT" mapto="pageUp" flags="mr" />
+		<key id="KEY_RIGHT" mapto="pageDown" flags="mr" />
+	</map>
+</keymap>
diff --git a/lib/python/Plugins/Extensions/Modem/plugin.py b/lib/python/Plugins/Extensions/Modem/plugin.py
new file mode 100644
index 00000000..e57e4f51
--- /dev/null
+++ b/lib/python/Plugins/Extensions/Modem/plugin.py
@@ -0,0 +1,283 @@
+def getDefaultGateway():
+	f = open("/proc/net/route", "r")
+	if f:
+		for line in f.readlines():
+			tokens = line.split('\t')
+			if tokens[1] == '00000000': #dest 0.0.0.0
+				return int(tokens[2], 16)
+	return None
+
+def getTelephone():
+	f = open("/etc/ppp/options", "r")
+	if f:
+		for line in f.readlines():
+			if line.find('connect') == 0:
+				line = line[line.find(' ')+1:]
+				line = line[line.find(' ')+1:]
+				line = line[:line.find('"')]
+				return line
+	return ""
+
+def setOptions(tel, user):
+	f = open("/etc/ppp/options", "r+")
+	if f:
+		lines = f.readlines()
+		f.seek(0)
+		for line in lines:
+			if line.find('connect') == 0:
+				p = line.find(' ')
+				p = line.find(' ', p+1)
+				line = line[:p+1]
+				f.write(line+tel+'"\n')
+			elif line.find('user') == 0:
+				f.write('user '+user+'\n')
+			else:
+				f.write(line)
+
+def getSecretString():
+	f = open("/etc/ppp/pap-secrets", "r")
+	if f:
+		for line in f.readlines():
+			if line[0] == '#' or line.find('*') == -1:
+				continue
+			for ch in (' ', '\t', '\n', '"'):
+				line = line.replace(ch, '')
+			return line
+	return None
+
+def setSecretString(secret):
+	f = open("/etc/ppp/pap-secrets", 'r+')
+	if f:
+		lines = f.readlines()
+		f.seek(0)
+		for line in lines:
+			if line[0] == '#' or line.find('*') == -1:
+				f.write(line)
+				continue
+			f.write(secret+'\n')
+
+from Screens.Screen import Screen
+from Plugins.Plugin import PluginDescriptor
+from enigma import eConsoleAppContainer, eTimer
+from Components.Label import Label
+from Components.Button import Button
+from Components.ConfigList import ConfigList
+from Components.config import ConfigText, ConfigPassword, KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_BACKSPACE
+from Components.ActionMap import NumberActionMap, ActionMap
+from os import system
+
+NONE = 0
+CONNECT = 1
+ABORT = 2
+DISCONNECT = 3
+
+gateway = None
+
+def pppdClosed(ret):
+	global gateway
+	print "modem disconnected", ret
+	if gateway:
+		#FIXMEEE... hardcoded for little endian!!
+		system("route add default gw %d.%d.%d.%d" %(gateway&0xFF, (gateway>>8)&0xFF, (gateway>>16)&0xFF, (gateway>>24)&0xFF))
+
+connected = False
+conn = eConsoleAppContainer()
+conn.appClosed.append(pppdClosed)
+
+class ModemSetup(Screen):
+	skin = """
+		<screen position="180,100" size="320,300" title="Modem" >
+		<ePixmap pixmap="skin_default/buttons/green.png" position="10,10" size="140,40" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/red.png" position="160,10" size="140,40" alphatest="on" />
+		<widget name="key_green" position="10,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+		<widget name="key_red" position="160,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="list" position="10,60" size="300,120" />
+		<widget name="state" position="10,210" size="300,80" font="Regular;20" />
+		</screen>"""
+
+	def nothing(self):
+		print "nothing!"
+
+	def __init__(self, session, args = None):
+		global connected
+		global conn
+		self.skin = ModemSetup.skin
+		secret = getSecretString()
+		user = secret[:secret.find('*')]
+		password = secret[secret.find('*')+1:]
+		self.username = ConfigText(user, fixed_size=False)
+		self.password = ConfigPassword(password, fixed_size=False)
+		self.phone = ConfigText(getTelephone(), fixed_size=False)
+		self.phone.setUseableChars(u"0123456789")
+		lst = [ (_("Username"), self.username),
+			(_("Password"), self.password),
+			(_("Phone number"), self.phone) ]
+		self["list"] = ConfigList(lst)
+		self["key_green"] = Button("")
+		self["key_red"] = Button("")
+		self["state"] = Label("")
+		self["actions"] = NumberActionMap(["ModemActions"],
+		{
+			"cancel": self.close,
+			"left": self.keyLeft,
+			"right": self.keyRight,
+			"connect": self.connect,
+			"disconnect": self.disconnect,
+			"deleteForward": self.deleteForward,
+			"deleteBackward": self.deleteBackward,
+			"0": self.keyNumber,
+			"1": self.keyNumber,
+			"2": self.keyNumber,
+			"3": self.keyNumber,
+			"4": self.keyNumber,
+			"5": self.keyNumber,
+			"6": self.keyNumber,
+			"7": self.keyNumber,
+			"8": self.keyNumber,
+			"9": self.keyNumber
+		}, -1)
+
+		self["ListActions"] = ActionMap(["ListboxDisableActions"],
+		{
+			"moveUp": self.nothing,
+			"moveDown": self.nothing,
+			"moveTop": self.nothing,
+			"moveEnd": self.nothing,
+			"pageUp": self.nothing,
+			"pageDown": self.nothing
+		}, -1)
+
+		self.stateTimer = eTimer()
+		self.stateTimer.callback.append(self.stateLoop)
+
+		conn.appClosed.append(self.pppdClosed)
+		conn.dataAvail.append(self.dataAvail)
+
+		Screen.__init__(self, session)
+		self.onClose.append(self.__closed)
+		self.onLayoutFinish.append(self.__layoutFinished)
+
+	def __layoutFinished(self):
+		global conn
+		if conn.running():
+			self["state"].setText(_("Connected!"));
+			self.green_function = NONE
+			self.red_function = DISCONNECT
+		else:
+			self.green_function = CONNECT
+			self.red_function = NONE
+		self.updateGui()
+
+	def __closed(self):
+		global connected
+		conn.appClosed.remove(self.pppdClosed)
+		conn.dataAvail.remove(self.dataAvail)
+		if not connected:
+			conn.sendCtrlC()
+		setOptions(self.phone.getText(), self.username.getText())
+		setSecretString(self.username.getText() + ' * ' + self.password.getText())
+
+	def stateLoop(self):
+		txt = self["state"].getText()
+		txt += '.'
+		self["state"].setText(txt)
+
+	def connect(self):
+		if self.green_function == CONNECT:
+			global gateway
+			gateway = getDefaultGateway()
+			self["state"].setText(_("Dialing:"))
+			system("route del default")
+			system("modprobe ppp_async");
+			self.stateTimer.start(1000,False)
+			setOptions(self.phone.getText(), self.username.getText())
+			setSecretString(self.username.getText() + ' * ' + self.password.getText())
+			ret = conn.execute("pppd", "pppd", "-d", "-detach")
+			if ret:
+				print "execute pppd failed!"
+				self.pppdClosed(ret)
+				pppdClosed(ret)
+			self.green_function = NONE
+			self.red_function = ABORT
+			self.updateGui()
+
+	def disconnect(self):
+		conn.sendCtrlC()
+		self.red_function = NONE
+		self.updateGui()
+
+	def keyLeft(self):
+		if self.green_function == CONNECT:
+			self["list"].handleKey(KEY_LEFT)
+
+	def keyRight(self):
+		if self.green_function == CONNECT:
+			self["list"].handleKey(KEY_RIGHT)
+
+	def keyNumber(self, number):
+		if self.green_function == CONNECT:
+			self["list"].handleKey(KEY_0 + number)
+
+	def deleteForward(self):
+		if self.green_function == CONNECT:
+			self["list"].handleKey(KEY_DELETE)
+
+	def deleteBackward(self):
+		if self.green_function == CONNECT:
+			self["list"].handleKey(KEY_BACKSPACE)
+
+	def pppdClosed(self, retval):
+		global connected
+		self.stateTimer.stop()
+		self.red_function = NONE
+		self.green_function = CONNECT
+		self["state"].setText("")
+		self.updateGui()
+		connected = False
+
+	def dataAvail(self, text):
+		if text.find("Serial connection established") != -1:
+			tmp = self["state"].getText()
+			tmp += "OK\nLogin:"
+			self["state"].setText(tmp)
+		if text.find("PAP authentication succeeded") != -1:
+			tmp = self["state"].getText()
+			tmp += "OK\n";
+			self["state"].setText(tmp)
+			self.stateTimer.stop()
+		if text.find("ip-up finished") != -1:
+			global connected
+			tmp = self["state"].getText()
+			tmp += "Connected :)\n"
+			self["state"].setText(tmp)
+			self.red_function = DISCONNECT
+			connected=True
+		if text.find("Connect script failed") != -1:
+			tmp = self["state"].getText()
+			tmp += "FAILED\n"
+			self["state"].setText(tmp)
+			self.stateTimer.stop()
+			self.red_function = NONE
+			self.green_function = CONNECT
+		self.updateGui()
+
+	def updateGui(self):
+		if self.red_function == NONE:
+			self["key_red"].setText("")
+		elif self.red_function == DISCONNECT:
+			self["key_red"].setText(_("Disconnect"))
+		elif self.red_function == ABORT:
+			self["key_red"].setText(_("Abort"))
+		if self.green_function == NONE:
+			self["key_green"].setText("")
+		elif self.green_function == CONNECT:
+			self["key_green"].setText(_("Connect"))
+		focus_enabled = self.green_function == CONNECT
+		self["list"].instance.setSelectionEnable(focus_enabled)
+		self["ListActions"].setEnabled(not focus_enabled)
+
+def main(session, **kwargs):
+	session.open(ModemSetup)
+
+def Plugins(**kwargs):
+	return PluginDescriptor(name="Modem", description="plugin to connect to internet via builtin modem", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)