Diff of /trunk/tubetutor/tubetutor.py [r3] .. [r4]  Maximize  Restore

Switch to side-by-side view

--- a/trunk/tubetutor/tubetutor.py
+++ b/trunk/tubetutor/tubetutor.py
@@ -253,30 +253,37 @@
 		self.refresh_files()
 		videos=[]
 		description=""
-		
-		# intro
-		r = ffmpeg.renderer()
-		r.resolution(resolution)
-		r.filename(os.path.join("media", "intro.mkv"))
-		params = " -scale %s!" % resolution.replace(":", "x")
-		params += " -font %s -weight 500 -pointsize 100" % ffmpeg.font
-		params += " -draw \"gravity northwest fill white text 100,775 '%s'\"" % self.get_title()
-		params += " -scale %s!" % resolution.replace(":", "x")
-		ffmpeg.convert_image(os.path.join("media", "intro.jpg"), os.path.join(path, "tmp", "intro.jpg"), params)
-		r.add_image(os.path.join(path, "tmp", "intro.jpg"), fadein=False)
-		r.process(os.path.join(path, "tmp", "intro-scale.mkv"), "-vf scale=" + resolution)
-		r.concat(os.path.join(path, "tmp", "intro-concat.mkv"))
-
-		# mux intro
-		r = ffmpeg.renderer()
-		r.resolution(resolution)
-		r.filename(os.path.join(path, "tmp", "intro-concat.mkv"))
-		r.mux(os.path.join(path, "tmp", "intro.mkv"), os.path.join("media", "intro.mp3"))
-		videos.append(r.lastfilename)
+
+		if os.path.exists(os.path.join("media", "intro.mkv")):
+			# intro
+			r = ffmpeg.renderer()
+			r.resolution(resolution)
+			r.filename(os.path.join("media", "intro.mkv"))
+			params = " -scale %s!" % resolution.replace(":", "x")
+			params += " -font %s -weight 500 -pointsize 100" % ffmpeg.font
+			params += " -draw \"gravity northwest fill white text 100,775 '%s'\"" % self.get_title()
+			params += " -scale %s!" % resolution.replace(":", "x")
+			ffmpeg.convert_image(os.path.join("media", "intro.jpg"), os.path.join(path, "tmp", "intro.jpg"), params)
+			r.add_image(os.path.join(path, "tmp", "intro.jpg"), fadein=False)
+			r.process(os.path.join(path, "tmp", "intro-scale.mkv"), "-vf scale=" + resolution)
+			r.concat(os.path.join(path, "tmp", "intro-concat.mkv"))
+
+			# mux intro
+			r = ffmpeg.renderer()
+			r.resolution(resolution)
+			r.filename(os.path.join(path, "tmp", "intro-concat.mkv"))
+			r.mux(os.path.join(path, "tmp", "intro.mkv"), os.path.join("media", "intro.mp3"))
+			videos.append(r.lastfilename)
+			r = ffmpeg.renderer()
+			r.resolution(resolution)
+		else:
+			r = ffmpeg.renderer()
+			r.resolution(resolution)
+			r.add_image(os.path.join("media", "intro.png"))
 
 		# main
-		r = ffmpeg.renderer()
-		r.resolution(resolution)
+		#r = ffmpeg.renderer()
+		#r.resolution(resolution)
 		for file in self.files:
 			if os.path.basename(file).startswith("tmp_"):
 				continue