Anri-chan/Source/anri.pl - Revision history

Njahnke: audio commentary etc

2009-09-13T20:31:17Z

audio commentary etc

Show changes

Dex: Added short command line arguments, help, additional way of specifying qualities

2009-08-16T02:14:03Z

Added short command line arguments, help, additional way of specifying qualities

Tate: small compile error fix

2009-07-19T03:59:55Z

small compile error fix

Tate at 03:26, 19 July 2009

2009-07-19T03:26:39Z

Ninetigerr: Unix $anri_dir is now implemented in pure Perl. Included File::Basename and File::Spec.

2009-06-07T10:09:45Z

Unix $anri_dir is now implemented in pure Perl. Included File::Basename and File::Spec.

Ninetigerr at 09:29, 7 June 2009

2009-06-07T09:29:13Z

Ninetigerr: Unix desktop location is "~/Desktop" for all flavors of Unix

2009-06-07T09:25:29Z

Unix desktop location is "~/Desktop" for all flavors of Unix

Tate: small fix to chopper function, small fix to keep the progress bar from dieing and taking mplayer with it before it should.

2009-05-26T17:14:06Z

small fix to chopper function, small fix to keep the progress bar from dieing and taking mplayer with it before it should.

Tate at 22:15, 25 May 2009

2009-05-25T22:15:53Z

Tate at 22:13, 25 May 2009

2009-05-25T22:13:10Z

@@ Line 25: / Line 25: @@
 use strict 'subs';
 package anri;
-use Getopt::Long;
+use Getopt::Long qw(:config bundled);
 use File::Find;
 use File::Basename;
@@ Line 249: / Line 249: @@
 	$spec='';
 	$rip_a_dvd='';
 	#load all args, some as string, some as int, some as boolean
 	#all variables are temporary in order to enforce cli precedence over config
-	GetOptions ('config=s' => \$config_file ,
+	GetOptions ('config|c=s' => \$config_file ,
-		'statid1=s' => \$statidline1,
+		'statid1|1=s' => \$statidline1,
-		'statid2=s' => \$statidline2,
+		'statid2|2=s' => \$statidline2,
-		'statid3=s' => \$statidline3,
+		'statid3|3=s' => \$statidline3,
-		'statid_lines=s' => \$statid_lines,
+		'statid_lines|s=s' => \$statid_lines,
-		'spec=s' => \$spec,
+		'spec|S=s' => \$spec,
-		'trim=s' => \$trim_arg ,
+		'trim|t=s' => \$trim_arg ,
-		'rip=s' => \$rip_a_dvd,
+		'rip|r=s' => \$rip_a_dvd,
-		'gb_crop=s' => \$gb_crop,
+		'gb_crop|p=s' => \$gb_crop,
-		'gba_crop=s' => \$gba_crop,
+		'gba_crop|P=s' => \$gba_crop,
-		'language=s' => \$lang,
+		'language|l=s' => \$lang,
-		'qualities=s' => \$qual,
+		'qualities|q=s' => \$qual,
-		'projectname=s' => \$project_name,
+		'projectname|n=s' => \$project_name,
-		'avidir=s' => \$avidirectory,
+		'avidir|d=s' => \$avidirectory,
-		'avifile=s' => \@avi_files,
+		'avifile|f=s' => \@avi_files,
-		'dvdsource=s' => \$dvd_source,
+		'dvdsource|D=s' => \$dvd_source,
-		'sample_extraction=i' => \$start_frame,
+		'sample_extraction|x=i' => \$start_frame,
 		'database' => \$data_dfnd,
-		'gb' => \$gb_source,
+		'gb|g' => \$gb_source,
-		'gba' => \$gba_source,
+		'gba|G' => \$gba_source,
-		'nes' => \$nes_source,
+		'nes|N' => \$nes_source,
-		'vhs' => \$vhs_source,
+		'vhs|v' => \$vhs_source,
-		'deflickered' => \$dflckrd,
+		'deflickered|F' => \$dflckrd,
-		'progressive' => \$progressive_source,
+		'progressive|R' => \$progressive_source,
-		'field_order' => \$order_of_fields,
+		'field_order|L' => \$order_of_fields,
-		'pixelbob' => \$pixel_bobbing,
+		'pixelbob|b' => \$pixel_bobbing,
-		'nmf' => \$create_nmf,
+		'nmf|m' => \$create_nmf,
-		'no_statid' => \$nostatid,
+		'no_statid|o' => \$nostatid,
-		'no_trim'   => \$notrim,
+		'no_trim|i'   => \$notrim,
-		'maxaudbitrate=i' => \$maximal_bitrate,
+		'maxaudbitrate|a=i' => \$maximal_bitrate,
-		'pcgame' => \$is_pc,
+		'pcgame|C' => \$is_pc,
-		'quietmen' => \$mencoder_quiet
+		'quietmen|Q' => \$mencoder_quiet,
 	);
 	#load config if one specified
 	&load_config($config_file) if $config_file;
 	#qualities
-	@encodethese=split (',',$qual) if $qual;
+	#can be provided in binary or decimal or as a string:
 	#trim
 	@trimarr=split(',', $trim_arg) if $trim_arg;
@@ Line 294: / Line 331: @@
 	#avis
 	push(@avifiles,@avi_files);
 	#statid
 	@statidlines=split(',',$statid_lines) if $statid_lines;

@@ Line 2,006: / Line 2,006: @@
 			&pgccount(sort @ifofiles);
-			if ($advanced_mode) {
+		#	if ($advanced_mode) {
 		#       IF NOT "%auto%"=="y" (
 		#         ECHO.
@@ Line 2,022: / Line 2,022: @@
 		#       )
 		#     )
+		#	}
+			$end_bar = 0; #safety for multiple dvd rips
 			share($end_bar);
 			$mplayer_loop_thread = threads->create(\&mplayer_loop);

@@ Line 749: / Line 749: @@
 		q_boo($lang{QUESTION_PROGRESSIVE_INTERLACED}, $prog);
 		#IF "%prog%"=="y" GOTO proc_gameproperties_p2
+			############################################################################
-		############################################################################
+			# function: q_fieldorder
-		# function: q_fieldorder
+			# There's no foolproof method to detect field order programmatically. The
-		# There's no foolproof method to detect field order programmatically. The
+			# next best thing is to show the user both, and let them decide which looks
-		# next best thing is to show the user both, and let them decide which looks
+			# better.
-		# better.
+			# The script is simple enough, have a split screen with AssumeTFF and
-		# The script is simple enough, have a split screen with AssumeTFF and
+			# AssumeBFF. Whichever is chosen will be used in all AviSynth scripts.
-		# AssumeBFF. Whichever is chosen will be used in all AviSynth scripts.
+			############################################################################
-		############################################################################
 			&echo("");
-			&cp("${projname}.bak","${projname}_fieldordertemp.avs");
+			if (! defined $fieldorder) {
-			&echotofile("tff=last.AssumeTFF().SeparateFields().bilinearresize(320,240).subtitle(\"t\")\n",">>","${projname}_fieldordertemp.avs");
+				&out_info($lang{FIELDORDER_VDUB_WINDOW_OPENS});
-			&echotofile("bff=last.AssumeBFF().SeparateFields().bilinearresize(320,240).subtitle(\"b\")\n",">>","${projname}_fieldordertemp.avs");
+				&out_info($lang{PRESS_ENTER_TO_CONTINUE});
-			&echotofile("StackVertical(tff,bff)\n",">>","${projname}_fieldordertemp.avs");
+				<STDIN>;
-			system("${start} \"determine field order\" \"${vdub_dir}/${vdubgui}\" \"${projname}_fieldordertemp.avs\"");
+				&echo("");
-			#:q_fieldorder_p2
+				&cp("${projname}.bak","${projname}_fieldordertemp.avs");
-			print $prompt;
+				&echotofile("tff=last.AssumeTFF().SeparateFields().bilinearresize(320,240).subtitle(\"t\")\n",">>","${projname}_fieldordertemp.avs");
-			while (<STDIN>) {
+				&echotofile("bff=last.AssumeBFF().SeparateFields().bilinearresize(320,240).subtitle(\"b\")\n",">>","${projname}_fieldordertemp.avs");
-				chomp;
+				&echotofile("StackVertical(tff,bff)\n",">>","${projname}_fieldordertemp.avs");
-				if (m/^[tb]$/) {
+				system("${start} \"determine field order\" \"${vdub_dir}/${vdubgui}\" \"${projname}_fieldordertemp.avs\"");
-					#t becomes 1 (true), b becomes 0 (false)
+				#:q_fieldorder_p2
-					tr/tb/10/;
+				print $prompt;
-					$fieldorder = $_;
+				while (<STDIN>) {
-					last;
+					chomp;
+				}
-				print "$lang{INVALID_INPUT}\n\n";
+				&out_info($lang{VDUB_WINDOW_CAN_CLOSE_NOW});
-				print $prompt;
+				&rm("${projname}_fieldordertemp.avs");
+			}
-			&out_info($lang{VDUB_WINDOW_CAN_CLOSE_NOW});
+			&echo("");
-			&rm("${projname}_fieldordertemp.avs");
-−
-		&echo("");
-		#q_vhs
+			#q_vhs
-		q_boo($lang{QUESTION_VHS}, $vhs);
+			q_boo($lang{QUESTION_VHS}, $vhs);
-		#IF "%d%"=="1" GOTO proc_gameproperties_p2
+			#IF "%d%"=="1" GOTO proc_gameproperties_p2
-		q_boo($lang{QUESTION_1PIXEL_BOB}, $onepixel) if ($f != 2);
+			q_boo($lang{QUESTION_1PIXEL_BOB}, $onepixel) if ($f != 2);
-		q_boo($lang{QUESTION_NES}, $nes);
+			q_boo($lang{QUESTION_NES}, $nes);
-		#IF "%nes%"=="y" GOTO proc_gameproperties_p2
+			#IF "%nes%"=="y" GOTO proc_gameproperties_p2
-		q_boo($lang{QUESTION_GBA}, $gba);
+			q_boo($lang{QUESTION_GBA}, $gba);
-		$deflicker=1 if $gba;
+			$deflicker=1 if $gba;
-		#GOTO proc_gameproperties_p2
+			#GOTO proc_gameproperties_p2
-		q_boo($lang{QUESTION_GB}, $gb);
+			q_boo($lang{QUESTION_GB}, $gb);
-		$deflicker=1 if $gb;
+			$deflicker=1 if $gb;
-		q_boo($lang{QUESTION_DEFLICKERED}, $deflicker) if ($f != 2);
+			q_boo($lang{QUESTION_DEFLICKERED}, $deflicker) if ($f != 2);
-−
+		}
+	} #end if($prog != 1)
 	############################################################################
 	# Main procedure - Content properties

@@ Line 27: / Line 27: @@
 use Getopt::Long;
 use File::Find;
 use threads;
 use threads::shared;
@@ Line 150: / Line 152: @@
+	}
-	#anri program directory ### FIXME ###
+	#anri program directory
-	$anri_dir = `pwd`;
+      $anri_dir = File::Spec->rel2abs(dirname($0));
-	chomp($anri_dir);
 	#our encoders - invocation names only - path will be prepended later ...

@@ Line 142: / Line 142: @@
 	system("Color 80");
 } else { #we're on unix
-        $desktop = glob("~/Desktop");
+      $desktop = glob("~/Desktop");
 	#os-dependent path to verdana stuff
 	if ("$^O" eq "darwin") {

@@ Line 2,794: / Line 2,794: @@
 			my ($self,$new_filesize, $old_filesize) = @_;
 			if($new_filesize<$old_filesize){
-				$percent_left = int(($new_filesize*100)/$old_filesize +.5);
+				$percent_left = int(($new_filesize*100)/$old_filesize + .5);
 			}else{
 				$percent_left=100;
@@ Line 2,828: / Line 2,828: @@
 		if($end_bar){
 			$i=1;
-		}elsif($j<100){
+		}elsif($j<101){
 			sleep $_[2];
 		}else{
@@ Line 2,849: / Line 2,849: @@
 		for(; ${i}>0;${i}--){
 			${tmp}=chop(${string});
-			if(${tmp} eq '\\'){
+			if(${tmp} ne '\\'){
-−
-			}else{
 				${not_chopped}="${tmp}${not_chopped}";
+			}

@@ Line 2,050: / Line 2,050: @@
 # to run simultaneously with it.
 sub mplayer_loop{
-	my $redirect = "\&>${dvdripto}/mplayer.log";
+	my $redirect = "\&>\"${dvdripto}/mplayer.log\"";
 	if($os eq 'windows'){
 		$redirect = "> \"${dvdripto}/mplayer.log\" 2>\&1";
@@ Line 2,855: / Line 2,855: @@
+			}
+		}
 		return ${not_chopped};
+	}
+}
 </nowiki></pre>

@@ Line 2,052: / Line 2,052: @@
 	my $redirect = "\&>${dvdripto}/mplayer.log";
 	if($os eq 'windows'){
-		$redirect = "> ${dvdripto}/mplayer.log 2>\&1";
+		$redirect = "> \"${dvdripto}/mplayer.log\" 2>\&1";
+	}
 	#Rip the titles with Mplayer using info from &pgccount()
@@ Line 2,060: / Line 2,060: @@
 		$expandpgc = sprintf("%03d", $1);
 		#FIXME log this
-		system("\"${anri_dir}/${mplayer}\" dvd://${1} -dvd-device \"${video_ts}\" -dumpstream -dumpfile \"${dvdripto}/I${2}_${expandpgc}.vob\" \"${redirect}\"");
+		system("\"${anri_dir}/${mplayer}\" dvd://${1} -dvd-device \"${video_ts}\" -dumpstream -dumpfile \"${dvdripto}/I${2}_${expandpgc}.vob\" ${redirect}");
+	}
 	#used to kill the progress bar just in case it doesn't kill itself first.