Index: /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/control
===================================================================
--- /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/control	(revision 8759)
+++ /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/control	(revision 8759)
@@ -0,0 +1,11 @@
+Package: enigma2-plugin-swapeditors-movieretitle
+Version: 1.0
+Description:With this Plugin you can rename movies. SWAPSTICK IS NEEDED!
+Section: extra
+Priority: optional
+Maintainer: AAF Forum
+Architecture: sh4
+OE: MovieRetitle to rename movies for Swapstick
+Homepage: http://www.aaf-digital.info
+Depends:
+Source: http://www.aaf-digital.info
Index: /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/postinst
===================================================================
--- /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/postinst	(revision 8759)
+++ /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/postinst	(revision 8759)
@@ -0,0 +1,25 @@
+#!/bin/sh
+TMP=/tmp/.editors
+echo "successfully installed"
+echo "syncing disk"
+
+echo "---------------------------------"
+echo "-----------PLEASE READ-----------"
+echo "---------------------------------"
+echo "now you can fins the editors in the menu of the movielist!!!"
+echo "....(press PLAY Button -> MENU Button)...."
+echo "---------------------------------"
+echo "---------------------------------"
+echo "---------------------------------"
+echo ""
+echo "---------------------------------"
+echo "-----------Bitte lesen-----------"
+echo "---------------------------------"
+echo "du kannst die Erweiterungen nun im Menue der Filmliste finden!!!"
+echo "....(drücke PLAY Taste -> MENU Taste)...."
+echo "---------------------------------"
+echo "---------------------------------"
+echo "---------------------------------"
+
+sync
+exit 0
Index: /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/postrm
===================================================================
--- /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/postrm	(revision 8759)
+++ /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/postrm	(revision 8759)
@@ -0,0 +1,9 @@
+#!/bin/sh
+TMP=/tmp/.editors
+
+rm -rf /var/swap/extensions/MovieRetitle
+
+echo "successfully removed"
+echo "syncing disk"
+sync
+exit 0
Index: /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/preinst
===================================================================
--- /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/preinst	(revision 8759)
+++ /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/preinst	(revision 8759)
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+TMP=/tmp/.editors
+echo "syncing disk"
+sync
+
+model=`cat /etc/model`
+echo""
+echo "Checking your Boxtype...."
+echo "Some Plugins will not work correctly on your $model!"
+echo ""
+if [ "$model" = "" ]; then
+	echo "Sorry! This Plugin is not available for your $model because it will not work correctly!!!"
+	echo "Aborting installation..."
+	exit 1
+else
+	echo "Boxtype: $model OK"
+fi
+
+echo "checking swapstick"
+if [ ! -d /var/swap/extensions/ ]; then
+  echo "--------------------------"
+	echo "no swapstick found...."
+	echo "--------------------------"
+	exit 1
+fi
+echo "swapstick found...."
+echo "installing MovieRetitle to rename movies to swapstick..."
+echo "checking OS"
+if  [ `cat /etc/motd | grep AAF | grep M | grep rev | wc -l` -eq 0 ]; then                      
+	echo ---------------------------
+	echo DONT USE this IPK Package!!
+	echo ---
+	echo Only for AAF Image!!
+	echo ---------------------------
+	exit 1
+fi
+exit 0
Index: /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/prerm
===================================================================
--- /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/prerm	(revision 8759)
+++ /ipk/source.sh4/swapeditors_movieretitle_1_0/CONTROL/prerm	(revision 8759)
@@ -0,0 +1,6 @@
+#!/bin/sh
+TMP=/tmp/.editors
+echo "syncing disk"
+sync
+echo "removing MovieRetitle from swapstick"
+exit 0
Index: /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/__init__.py
===================================================================
--- /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/__init__.py	(revision 8759)
+++ /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/__init__.py	(revision 8759)
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from Components.Language import language
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_LANGUAGE
+from os import environ as os_environ
+import gettext
+
+def localeInit():
+	lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
+	os_environ["LANGUAGE"] = lang # Enigma doesn't set this (or LC_ALL, LC_MESSAGES, LANG). gettext needs it!
+	gettext.bindtextdomain("MovieRetitle", resolveFilename(SCOPE_PLUGINS, "Extensions/MovieRetitle/locale"))
+
+def _(txt):
+	t = gettext.dgettext("MovieRetitle", txt)
+	if t == txt:
+		print "[MovieRetitle] fallback to default translation for", txt
+		t = gettext.gettext(txt)
+	return t
+
+localeInit()
+language.addCallback(localeInit)
+
Index: /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/maintainer.info
===================================================================
--- /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/maintainer.info	(revision 8759)
+++ /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/maintainer.info	(revision 8759)
@@ -0,0 +1,2 @@
+aho@sics.se
+MovieRetitle
Index: /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/plugin.py
===================================================================
--- /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/plugin.py	(revision 8759)
+++ /ipk/source.sh4/swapeditors_movieretitle_1_0/var/swap/extensions/MovieRetitle/plugin.py	(revision 8759)
@@ -0,0 +1,296 @@
+# for localized messages
+from . import _
+
+from Plugins.Plugin import PluginDescriptor
+from Screens.Screen import Screen
+from Screens.MessageBox import MessageBox
+from Screens.LocationBox import MovieLocationBox
+import Screens.Standby
+from Components.config import config, ConfigText, ConfigSelection, getConfigListEntry
+from Components.ActionMap import ActionMap
+from Components.ConfigList import ConfigListScreen
+from Components.Sources.StaticText import StaticText
+from enigma import eTimer, eServiceCenter, iServiceInformation, eConsoleAppContainer
+from os import path as os_path, rename as os_rename, unlink as os_unlink
+
+def main(session, service, **kwargs):
+	session.open(MovieRetitle, service, session.current_dialog, **kwargs)
+
+def Plugins(**kwargs):
+	return PluginDescriptor(name="MovieRetitle", description=_("change name..."), where = PluginDescriptor.WHERE_MOVIELIST, fnc=main)
+
+
+class MovieRetitle(Screen, ConfigListScreen):
+	def __init__(self, session, service, parent, args = 0):
+		Screen.__init__(self, session, parent = parent)
+		self.skinName = [ "MovieRetitle", "Setup" ]
+
+		serviceHandler = eServiceCenter.getInstance()
+		info = serviceHandler.info(service)
+		path = service.getPath()
+		if path.endswith(".ts") is True:
+			path = path[:-3]
+		self.path = path
+		self.dir = '/'.join(path.split('/')[:-1]) + '/'
+		self.file = self.baseName(path)
+		self.name = info.getName(service)
+		if self.file == self.baseName(self.name):
+			self.orig_title = ""
+		else:
+			self.orig_title = self.name
+		self.descr = info.getInfoString(service, iServiceInformation.sDescription)
+
+		self["key_green"] = StaticText(_("OK"))
+		self["key_red"] = StaticText(_("Cancel"))
+
+		self.input_file = ConfigText(default = self.file, fixed_size = False, visible_width = 42)
+		self.input_title = ConfigText(default = self.orig_title, fixed_size = False, visible_width = 42)
+		self.input_descr = ConfigText(default = self.descr, fixed_size = False, visible_width = 42)
+		tmp = config.movielist.videodirs.value
+		if not self.dir in tmp:
+			tmp.append(self.dir)
+		self.input_dir = ConfigSelection(choices = tmp, default = self.dir)
+
+		self["actions"] = ActionMap(["SetupActions"],
+		{
+			"ok": self.keySelectOrGo,
+			"save": self.keyGo,
+			"cancel": self.keyCancel,
+		}, -2)
+
+		self.locationEl = getConfigListEntry(_("Location"), self.input_dir)
+		l = [
+			getConfigListEntry(_("Filename"), self.input_file),
+			getConfigListEntry(_("Title"), self.input_title),
+			getConfigListEntry(_("Description"), self.input_descr),
+			self.locationEl
+		]
+
+		ConfigListScreen.__init__(self, l)
+
+		self.onLayoutFinish.append(self.setCustomTitle)
+		
+	def setCustomTitle(self):
+		self.setTitle(_("Name and Description Input"))
+
+	def pathSelected(self, res):
+		if res is not None:
+			videodirs = config.movielist.videodirs.value
+			if videodirs != self.input_dir.choices:
+				self.input_dir.setChoices(videodirs, default=res)
+			self.input_dir.value = res
+
+	def keySelectOrGo(self):
+		cur = self["config"].getCurrent()
+		if cur is self.locationEl:
+			self.session.openWithCallback(
+				self.pathSelected,
+				MovieLocationBox,
+				_("Choose target folder"),
+				self.input_dir.value,
+			)
+		else:
+			self.keyGo()
+
+	def keyGo(self):
+		if self.input_title.value != self.orig_title or self.input_descr.value != self.descr:
+			self.setTitleDescr(self.path, self.input_title.value, self.input_descr.value)
+		if self.input_file.value != self.file or self.input_dir.value != self.dir:
+			self.maybeMoveMovieFiles(self.path, self.rejoinName(self.input_dir.value, self.input_file.value))
+		else:
+			self.exitDialog()
+
+	def keyCancel(self):
+		self.close()
+
+	def setTitleDescr(self, file, title, descr):
+		if os_path.exists(file + ".ts.meta"):
+			metafile = open(file + ".ts.meta", "r")
+			sid = metafile.readline()
+			oldtitle = metafile.readline().rstrip()
+			olddescr = metafile.readline().rstrip()
+			rest = metafile.read()
+			metafile.close()
+			if not title and title != "":
+				title = oldtitle
+			if not descr and descr != "":
+				descr = olddescr
+			metafile = open(file + ".ts.meta", "w")
+			metafile.write("%s%s\n%s\n%s" %(sid, title, descr, rest))
+			metafile.close()
+
+	def maybeMoveMovieFiles(self, fr, to):
+		if os_path.exists(to+".ts"):
+			self.inter_fr = fr
+			self.inter_to = to
+			self.session.openWithCallback(self.confirmedReplace, MessageBox, _("Target file %s.ts already exist.\nDo you want to replace it?") % (to), MessageBox.TYPE_YESNO)
+		elif os_path.isdir(os_path.dirname(to)):
+			self.moveMovieFiles(fr, to)
+		else:
+			self.session.openWithCallback(self.exitDialog, MessageBox, _("The target directory is not found. The file is not renamed."), MessageBox.TYPE_ERROR)
+
+	def confirmedReplace(self, answer):
+		if answer == True:
+			self.moveMovieFiles(self.inter_fr, self.inter_to)
+
+	def moveMovieFiles(self, fr, to):
+		try:
+			os_rename(fr + ".ts", to + ".ts")
+		except OSError:
+			print "Moving in background"
+			global_background_mover.enqueue(self.exitDialog, self.session, fr, to)
+		else:
+			print "Moving in foreground"
+			for suff in (".ts.meta", ".ts.cuts", ".ts.ap", ".ts.sc", ".eit"):
+				if os_path.exists(fr + suff):
+					os_rename(fr + suff, to + suff)
+			self.exitDialog()
+
+	def exitDialog(self, dummy=None):
+		self.close()
+		# This will try to get back to an updated movie list.
+		# A proper way to do this should be provided in enigma2.
+		try:
+			parent = self.parent
+			parent.csel.reloadList()
+			parent.close()
+		except AttributeError:
+			try:
+				# when started from MovieSelection Quickbutton Plugin, MovieSelection is parent, not MovieContextMenu --> try again
+				self.parent.reloadList()
+			except: pass
+
+	def baseName(self, str):
+		name = str.split('/')[-1]
+		if name.endswith(".ts") is True:
+			return name[:-3]
+		else:
+			return name
+
+	def rejoinName(self, dir, name):
+		name = name.strip()
+		if name.endswith(".ts") is True:
+			return dir + name[:-3]
+		else:
+			return dir + name
+
+class MovieRetitleBackgroundMover:
+	def __init__(self):
+		self.container = eConsoleAppContainer()
+		self.container.appClosed.append(self.moveNextSuffBG)
+		self.currid = 0;
+		self.queue = []
+		self.running = False
+		self.messageQueue = []
+		self.messageTimer = eTimer()
+		self.messageTimer.callback.append(self.tryLaunchMessage)
+
+	def message(self, session, id, cb, txt):
+		global global_message_block
+		done = False
+		if global_message_block and global_message_block == id:
+			self.messageQueue = [(session, id, txt)] + self.messageQueue
+		else:
+			i = 0
+			for ele in self.messageQueue:
+				if ele[1] == id:
+					self.messageQueue[i] = (session, id, txt)
+					done = True
+					break
+				i += 1
+			if not done:
+				self.messageQueue.append((session, id, txt))
+		self.tryLaunchMessage(callback = cb)
+
+	def tryLaunchMessage(self, dummy=0, callback = None):
+		global global_message_block
+		self.messageTimer.stop()
+		if not self.messageQueue:
+			if callback:
+				callback()
+		elif not Screens.Standby.inStandby and self.messageQueue[0][0].in_exec and (not global_message_block or global_message_block == self.messageQueue[0][1]):
+			self.messageTimer.stop()
+			session = self.messageQueue[0][0]
+			id = self.messageQueue[0][1]
+			mess = self.messageQueue[0][2]
+			self.messageQueue = self.messageQueue[1:]
+			if global_message_block == id:
+				closeprev = session.current_dialog
+			else:
+				closeprev = None
+			global_message_block = id
+			try:
+				session.openWithCallback(lambda x: self.tryLaunchMessageCallback(callback, closeprev), MessageBox, mess, MessageBox.TYPE_INFO)
+			except:
+				global_message_block = False
+				self.tryLaunchMessage()
+		else:
+			self.messageTimer.start(1500, True)
+			if callback:
+				callback()
+
+	def tryLaunchMessageCallback(self, callback, closeprev):
+		global global_message_block
+		global_message_block = False
+		if closeprev:
+			closeprev.close(True)
+		self.tryLaunchMessage(callback = callback)
+
+	def enqueue(self, cb, session, fr, to):
+		self.currid += 1
+		mess = _("The movie is moved in the background from %s to %s.") % (os_path.dirname(fr), os_path.dirname(to))
+		self.message(session, self.currid, cb, mess)
+		self.queue.append((session, self.currid, fr, to))
+		if not self.running:
+			self.running = True
+			self.runNext()
+			return True
+		else:
+			return False
+
+	def runNext(self):
+		if not self.queue:
+			self.running = False
+		else:
+			self.moveMovieFilesBackground(self.queue[0])
+
+	def runDone(self, retval):
+		ele = self.queue[0]
+		self.queue = self.queue[1:]
+		self.runNext()
+
+	def moveMovieFilesBackground(self, ele):
+		self.ele = ele
+		self.sufflst = (".ts.meta", ".ts.cuts", ".ts.ap", ".ts.sc", ".eit", ".ts")
+		self.sufflst2 = self.sufflst
+		self.moveNextSuffBG(0)
+
+	def moveNextSuffBG(self, retval):
+		if self.sufflst and not retval:
+			fr = self.ele[2] + self.sufflst[0]
+			to = self.ele[3] + self.sufflst[0]
+			self.sufflst = self.sufflst[1:]
+			print "Moving %s to %s" % (fr, to)
+			if os_path.exists(fr):
+				self.container.execute("/bin/cp", "/bin/cp", fr, to)
+			else:
+				self.moveNextSuffBG(0)
+		elif retval:
+			for suff in self.sufflst2:
+				if os_path.exists(self.ele[3] + suff) and os_path.exists(self.ele[2] + suff):
+					os_unlink(self.ele[3] + suff)
+			mess = _("Failed to move the movie %s to %s in the background") % (self.ele[2], self.ele[3])
+			self.message(self.ele[0], self.ele[1], None, mess)
+			self.runDone(1)
+		else:
+			for suff in self.sufflst2:
+				if os_path.exists(self.ele[2] + suff) and os_path.exists(self.ele[3] + suff):
+					os_unlink(self.ele[2] + suff)
+			mess = _("Successfully moved the movie %s") % (self.ele[2])
+			self.message(self.ele[0], self.ele[1], None, mess)
+			self.runDone(0)
+
+global_background_mover = MovieRetitleBackgroundMover()
+
+global_message_block = False
+