small changes

3 files changed, 97 insertions, 48 deletions

diff --git a/tools/image_text b/tools/image_text
index fa286bd..d67e9c8 100644
--- a/tools/image_text
+++ b/tools/image_text
@@ -17,6 +17,41 @@ SIZE=`./video_resolution $1`
 COUNTER=$2
 BGCOLOR=$3
 
+# NEW ####
+COUNT1=`echo $4 | wc -c`
+COUNT2=`echo $5 | wc -c`
+
+SIZE1="0"
+SIZE2="0"
+
+if [ $COUNT1 -ge "30" ] ; then
+	SIZE1="30"
+	SIZE2=`echo $SIZE1-10|bc`
+elif [ $COUNT1 -ge "25" ] ; then
+	SIZE1="40"
+	SIZE2=`echo $SIZE1-10|bc`
+elif [ $COUNT1 -ge "20" ] ; then
+	SIZE1="50"
+	SIZE2=`echo $SIZE1-20|bc`
+else
+	SIZE1="60"
+	SIZE2=`echo $SIZE1-20|bc`
+fi
+
+
+#if [ $COUNT1 -ge "25" ] || [ $COUNT2 -ge "25" ] ; then
+#	echo "25 eller over"
+#echo "$1. count1: $COUNT1, count2: $COUNT2"
+#	SIZE1="40"
+#	SIZE2="20"
+#else
+#	echo "under 25"
+#echo "$1. count1: $COUNT1, count2: $COUNT2"
+#	SIZE1="60"
+#	SIZE2="40"
+#fi
+#########
+
 if [ -z "$4" ]; then
 	echo "Usage: $0 <video-file> <counter> <bg-color> <text1> [<text2>]"
 	exit 1
@@ -38,11 +73,11 @@ fi
 
 if [ $# -gt 4 ]; then
 	convert -font $FONT -size $SIZE xc:$BGCOLOR \
-	-fill $FGCOLOR -gravity center -pointsize 50 -draw "text 0,0 '${4}'" \
-	-fill $FGCOLOR -gravity center -pointsize 30 -draw "text 0,60 '${5}'" \
+	-fill $FGCOLOR -gravity center -pointsize $SIZE1 -draw "text 0,0 '${4}'" \
+	-fill $FGCOLOR -gravity center -pointsize $SIZE2 -draw "text 0,60 '${5}'" \
 	-append $NAME-$COUNTER.png
 else
 	convert -font $FONT -size $SIZE xc:$BGCOLOR \
-	-fill $FGCOLOR -gravity center -pointsize 60 -draw "text 0,0 '${4}'" \
+	-fill $FGCOLOR -gravity center -pointsize $SIZE1 -draw "text 0,0 '${4}'" \
 	-append $NAME-$COUNTER.png
 fi
diff --git a/tools/intro-outro b/tools/intro-outro
index 99682e4..3830186 100644
--- a/tools/intro-outro
+++ b/tools/intro-outro
@@ -12,8 +12,14 @@
 use strict;
 use warnings;
 use Text::CSV;
+use File::Basename;
+
+if ($#ARGV != 0 ) {
+	print "usage: intro-outro <csv-file>\n";
+	exit;
+}
+my $file=$ARGV[0];
 
-my $file = 'test.csv';
 my $csv = Text::CSV->new();
 my @takk;
 my @url;
@@ -50,71 +56,79 @@ while (<CSV>) {
 		my $license  = $columns[7];
 		my $takk     = $columns[8];
 
+		my $filenametmp = fileparse($filename, qr/\.\D.*/);
+
+		unless (-e $filename) {
+			print "File: $filename doesn't Exist!\n";
+			exit 1;
+		}
+
 		print "#$.. Filename: $filename\n";
 
 		print "\tIntro:\n";
-		print "\t\tSlide 1: Logo: $logo\n";
-		print "\t\tSlide 2: Name: $name\n";
-		print "\t\tSlide 2: Title: $title\n";
-		print "\t\tSlide 2: What: $what\n";
-		print "\t\tSlide 2: Date: $date\n";
-		print "\t\tSlide 2: Location: $location\n";
-		print "\t\tSlide 3: License: $license\n";
-
-		system("bash ./image_logo $filename.dv $counter white $logo"); $counter++;
-		system("bash ./image_logo $filename.dv $counter white $logo"); $counter++;
-		system("bash ./image_logo $filename.dv $counter white $logo"); $counter++;
-
-		system("bash ./image_text $filename.dv $counter white '$what' '$date - $location'"); $counter++;
-		system("bash ./image_text $filename.dv $counter white '$what' '$date - $location'"); $counter++;
-		system("bash ./image_text $filename.dv $counter white '$what' '$date - $location'"); $counter++;
-
-		system("bash ./image_text $filename.dv $counter white '$title' '$name'"); $counter++;
-		system("bash ./image_text $filename.dv $counter white '$title' '$name'"); $counter++;
-		system("bash ./image_text $filename.dv $counter white '$title' '$name'"); $counter++;
-
-		system("cp $license.png $filename-$counter.png"); $counter++;
-		system("cp $license.png $filename-$counter.png"); $counter++;
-		system("cp $license.png $filename-$counter.png"); $counter++;
+		print "\t\tLogo: $logo\n";
+		print "\t\tName: $name\n";
+		print "\t\tTitle: $title\n";
+		print "\t\tWhat: $what\n";
+		print "\t\tDate: $date\n";
+		print "\t\tLocation: $location\n";
+		print "\t\tLicense: $license\n";
+
+		system("bash ./image_logo $filename $counter white $logo"); $counter++;
+		system("bash ./image_logo $filename $counter white $logo"); $counter++;
+		system("bash ./image_logo $filename $counter white $logo"); $counter++;
+
+		system("bash ./image_text $filename $counter white '$what' '$date - $location'"); $counter++;
+		system("bash ./image_text $filename $counter white '$what' '$date - $location'"); $counter++;
+		system("bash ./image_text $filename $counter white '$what' '$date - $location'"); $counter++;
+
+		system("bash ./image_text $filename $counter white '$title' '$name'"); $counter++;
+		system("bash ./image_text $filename $counter white '$title' '$name'"); $counter++;
+		system("bash ./image_text $filename $counter white '$title' '$name'"); $counter++;
+
+		system("cp $license.png $filenametmp-$counter.png"); $counter++;
+		system("cp $license.png $filenametmp-$counter.png"); $counter++;
+		system("cp $license.png $filenametmp-$counter.png"); $counter++;
 
 		# .dv buh fix!
-		system("./image2video $filename.dv intro");
-		system("rm $filename-*.png");
+		system("./image2video $filename intro");
+		system("rm $filenametmp-*.png");
 		$counter="000";
 
 		print "\tOutro:\n";
 
-		system("bash ./image_text $filename.dv $counter black 'TAKK TIL'"); $counter++;
-		system("bash ./image_text $filename.dv $counter black 'TAKK TIL'"); $counter++;
-		system("bash ./image_text $filename.dv $counter black 'TAKK TIL'"); $counter++;
+		system("bash ./image_text $filename $counter black 'TAKK TIL'"); $counter++;
+		system("bash ./image_text $filename $counter black 'TAKK TIL'"); $counter++;
+		system("bash ./image_text $filename $counter black 'TAKK TIL'"); $counter++;
 
 		print "\t\tName: $name\n";
 		print "\t\tLocation: $location\n";
 
-		system("bash ./image_text $filename.dv $counter black '$name' Foredragsholder"); $counter++;
-		system("bash ./image_text $filename.dv $counter black '$location' Lokaler"); $counter++;
+		system("bash ./image_text $filename $counter black '$name' Foredragsholder"); $counter++;
+		system("bash ./image_text $filename $counter black '$location' Lokaler"); $counter++;
 
 		foreach (@takk) {
 			my $test = $columns[$_];
-			my @takk = split(/:/, $test);
-			my $hva = $takk[0];
-			my $hvem = $takk[1];
-		# if takk1 ""
-			print "\t\t$hvem - $hva\n";
-			system("bash ./image_text $filename.dv $counter black '$hvem' '$hva'"); $counter++;
+			if($test) {
+				my @takk = split(/:/, $test);
+				my $hva = $takk[0];
+				my $hvem = $takk[1];
+			# if takk1 ""
+				print "\t\tTakk: $hvem - $hva\n";
+				system("bash ./image_text $filename $counter black '$hvem' '$hva'"); $counter++;
+			}
 		}
 
 		foreach (@url) {
 			my $lenke = $columns[$_];
 			print "\t\tURL: $lenke\n";
-			system("bash ./image_text $filename.dv $counter black ' '"); $counter++;
-			system("bash ./image_text $filename.dv $counter black '$lenke'"); $counter++;
-			system("bash ./image_text $filename.dv $counter black '$lenke'"); $counter++;
+			system("bash ./image_text $filename $counter black ' '"); $counter++;
+			system("bash ./image_text $filename $counter black '$lenke'"); $counter++;
+			system("bash ./image_text $filename $counter black '$lenke'"); $counter++;
 		}
 
-		# .dv buh fix!
-		system("./image2video $filename.dv outro");
-		system("rm $filename-*.png");
+		system("./image2video $filename outro");
+		system("rm $filenametmp-*.png");
 
 	} else {
 		my $err = $csv->error_input;
diff --git a/tools/test.csv b/tools/test.csv
index e535248..50fa683 100755
--- a/tools/test.csv
+++ b/tools/test.csv
@@ -1,2 +1,2 @@
-"Filename","Logo","Name","Title","What","Date","Location","License","Takk","Takk","Takk","Takk","URL"
-"test","Wikimedia_Norge-logo.png","Christopher Harris","About Bergen","Wikipedia Academy 2009","2009-10-14","Bryggens Museum","cc-by-sa-3.0-no","Videogruppen:Ole Kristian Lien","Videogruppen:Hans-Petter Fjeld","Videogruppen:Lars Åge Kamfjord","Videogruppen:Jon Harald Søby","http://nuug.no/"
+"Filename","Logo","Name","Title","What","Date","Location","License","Takk","Takk","Takk","URL","URL"
+"20091016-wa-helland-introduksjon_til_wikipedia.dv","Wikimedia_Norge-logo.png","Frode Inge Helland","Introduksjon til Wikipedia","Wikipedia Workshop",2009-10-16,"Høgskolen i Bergen","cc-by-sa-3.0-no","Videogruppen:Ole Kristian Lien","Videogruppen:Hans-Petter Fjeld","Videogruppen:Lars Åge Kamfjord","http://nuug.no/","http://no.wikimedia.org/"