get rid off evil absolute paths in dvdburn and nfiflash (fixes bug #620)

5 files changed, 24 insertions, 15 deletions

diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
index 7f755db4..6dbcd499 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
@@ -2,6 +2,7 @@ from Tools.Directories import fileExists
 from Components.config import config, ConfigSubsection, ConfigInteger, ConfigText, ConfigSelection, getConfigListEntry, ConfigSequence, ConfigSubList
 import DVDTitle
 import xml.dom.minidom
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_FONTS
 
 class ConfigColor(ConfigSequence):
 	def __init__(self, default = [128,128,128]):
@@ -125,6 +126,14 @@ class DVDProject:
 			for key in self.filekeys:
 				val = self.settings.dict()[key].getValue()
 				if not fileExists(val):
+					if val[0] != "/":
+						if key.find("font") == 0:
+							val = resolveFilename(SCOPE_FONTS)+val
+						else:
+							val = resolveFilename(SCOPE_PLUGINS)+"Extensions/DVDBurn/"+val
+						if fileExists(val):
+							self.settings.dict()[key].setValue(val)
+							continue
 					self.error += "\n%s '%s' not found" % (key, val)
 		#except AttributeError:
 		  	#print "loadProject AttributeError", self.error
diff --git a/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml b/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml
index 451e8a8b..4645260d 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml
+++ b/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml
@@ -3,11 +3,11 @@
 	<settings
 		name="Dreambox DVD record"
 		authormode="menu_linked"
-		menutemplate="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml"
+		menutemplate="Thumbs_menu_clouds.ddvdm.xml"
 		titlesetmode="multi"
-		vmgm="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/vmgmdream.mpg"
+		vmgm="vmgmdream.mpg"
 		output="dvd"
-		isopath="/media/hdd/movie/"
+		isopath="/hdd/movie/"
 		dataformat="iso9660_4"
 	/>
 	<titles> </titles>
diff --git a/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml b/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml
index 0de7f4b6..bf6356a9 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml
+++ b/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml
@@ -3,17 +3,17 @@
 	<settings
 		titleformat="$i. $t"
 		subtitleformat="$D.$M.$Y, $T $C, $d"
-		menubg="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/dreamdvd_boat.jpg"
-		menuaudio="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/silence.mp2"
+		menubg="dreamdvd_boat.jpg"
+		menuaudio="silence.mp2"
 		dimensions="(720, 576)"
 		rows="5"
 		cols="1"
 		color_button="[8, 0, 0]"
 		color_highlight="[0, 192, 192]"
 		color_headline="[0, 0, 128]"
-		fontface_headline="/usr/share/fonts/nmsbd.ttf"
-		fontface_title="/usr/share/fonts/nmsbd.ttf"
-		fontface_subtitle="/usr/share/fonts/nmsbd.ttf"
+		fontface_headline="nmsbd.ttf"
+		fontface_title="nmsbd.ttf"
+		fontface_subtitle="nmsbd.ttf"
 		fontsize_headline="46"
 		fontsize_title="24"
 		fontsize_subtitle="14"
diff --git a/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml b/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml
index c00c3fee..074f2037 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml
+++ b/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml
@@ -3,17 +3,17 @@
 	<settings
 		titleformat="$t"
 		subtitleformat="$d"
-		menubg="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/dreamdvd_clouds.jpg"
-		menuaudio="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/silence.mp2"
+		menubg="dreamdvd_clouds.jpg"
+		menuaudio="silence.mp2"
 		dimensions="(720, 576)"
 		rows="2"
 		cols="2"
 		color_button="[8, 0, 0]"
 		color_highlight="[128, 0, 0]"
 		color_headline="[128, 0, 0]"
-		fontface_headline="/usr/share/fonts/nmsbd.ttf"
-		fontface_title="/usr/share/fonts/nmsbd.ttf"
-		fontface_subtitle="/usr/share/fonts/nmsbd.ttf"
+		fontface_headline="nmsbd.ttf"
+		fontface_title="nmsbd.ttf"
+		fontface_subtitle="nmsbd.ttf"
 		fontsize_headline="46"
 		fontsize_title="18"
 		fontsize_subtitle="12"
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
index 296d3bca..34f87256 100644
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
@@ -16,7 +16,7 @@ from Components.MultiContent import MultiContentEntryText
 from Components.ScrollLabel import ScrollLabel
 from Components.Harddisk import harddiskmanager
 from Components.Task import Task, Job, job_manager, Condition
-from Tools.Directories import fileExists, isMount
+from Tools.Directories import fileExists, isMount, resolveFilename, SCOPE_HDD
 from Tools.HardwareInfo import HardwareInfo
 from Tools.Downloader import downloadWithProgress
 from enigma import eConsoleAppContainer, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_VALIGN_CENTER, RT_WRAP, eTimer
@@ -792,7 +792,7 @@ If you already have a prepared bootable USB stick, please insert it now. Otherwi
 		self.umountCallback()
 
 def main(session, **kwargs):
-	session.open(NFIDownload,"/home/root")
+	session.open(NFIDownload,resolveFilename(SCOPE_HDD))
 
 def filescan_open(list, session, **kwargs):
 	dev = "/dev/" + (list[0].path).rsplit('/',1)[0][7:]