Attachment #147251 for bug #193591




use File::Copy;
use English;
use Carp;
#require 'flush.pl';
use IO::Handle;

# to shut up -w
use vars qw($opt_recurse);


# Extract info
print "Extracting image info";
STDOUT->flush();

foreach my $file (@files) {


	# at the user so that the video regexp might be adjusted
	if ($retval == -1) {
	    print "\nwarning: $pathname identified by extension as video file but mplayer doesn't recognize it\n";
	    STDOUT->flush();
	}
    } else  {
	&extract_image_info ($filename);

    my ($arate, $anch, $length, $is_video);

    print ".";
    STDOUT->flush();

    if ($mplayer_prog eq '' || ($do_video_files == 0)) {
	if (($do_video_files != 0) && $mplayer_prog eq '') {
	    print "\nwarning: Trying to process video files but cannot find mplayer in \$path!\n";
	    STDOUT->flush();
	}
	print "\nSkipping $pathname";
	STDOUT->flush();
	return 0;
    } else {
	$object_counter++;

    my $i;

    print ".";
    STDOUT->flush();

    $retval = $image->Read($pathname);


    if ($retval ne "") {
	print "\nSkipping $pathname";
	STDOUT->flush();
	return;
    } else {
	$object_counter++;

    if (defined($lastdate)) {
	print "<META NAME=\"$enddatemetatag\" CONTENT=\"$lastdate\">\n";
    }
    if (!defined ($opt_includeall) && @opt_exclude && scalar (@opt_exclude)) {
	my $tmp = join (',', @opt_exclude);
	my $etmp;


    }
    printf ("<META NAME=\"$numimagesmetatag\" CONTENT=\"%d\">\n", $image_counter);

    if (@opt_skipmontv && scalar (@opt_skipmont)) {
	my $tmp = join (',', @opt_skipmont);
	printf ("<META NAME=\"$skipmetatag\" CONTENT=\"%s\">\n", $tmp);
    }

    # then process. Check to see if any of the -skipmont options were given as
    # strings of filenames concatenated with ',' characters. If so, support it.
    #
    if (@opt_skipmont) {
	foreach (@opt_skipmont) {
	    (@tokens) = split (/,/, $_);
	    foreach $token (@tokens) {

    # then process. Check to see if any of the -exclude options were given as
    # strings of filenames concatenated with ',' characters. If so, support it.
    #
    if (@opt_exclude) {
	# -includeall takes priority over -exclude on the commandline if they are
	# used together (wierd, but ...)
	#

Return to bug 193591

Lines 325-331 Link Here

(-)imageindex (-12 / +13 lines)
325	use File::Copy;	325	use File::Copy;
326	use English;	326	use English;
327	use Carp;	327	use Carp;
328	require 'flush.pl';	328	#require 'flush.pl';
		329	use IO::Handle;
329		330
330	# to shut up -w	331	# to shut up -w
331	use vars qw($opt_recurse);	332	use vars qw($opt_recurse);
Lines 523-529 Link Here
523		524
524	# Extract info	525	# Extract info
525	print "Extracting image info";	526	print "Extracting image info";
526	flush (STDOUT);	527	STDOUT->flush();
527		528
528	foreach my $file (@files) {	529	foreach my $file (@files) {
529		530
Lines 1708-1714 Link Here
1708	# at the user so that the video regexp might be adjusted	1709	# at the user so that the video regexp might be adjusted
1709	if ($retval == -1) {	1710	if ($retval == -1) {
1710	print "\nwarning: $pathname identified by extension as video file but mplayer doesn't recognize it\n";	1711	print "\nwarning: $pathname identified by extension as video file but mplayer doesn't recognize it\n";
1711	flush (STDOUT);	1712	STDOUT->flush();
1712	}	1713	}
1713	} else {	1714	} else {
1714	&extract_image_info ($filename);	1715	&extract_image_info ($filename);
Lines 1731-1745 Link Here
1731	my ($arate, $anch, $length, $is_video);	1732	my ($arate, $anch, $length, $is_video);
1732		1733
1733	print ".";	1734	print ".";
1734	flush (STDOUT);	1735	STDOUT->flush();
1735		1736
1736	if ($mplayer_prog eq '' \|\| ($do_video_files == 0)) {	1737	if ($mplayer_prog eq '' \|\| ($do_video_files == 0)) {
1737	if (($do_video_files != 0) && $mplayer_prog eq '') {	1738	if (($do_video_files != 0) && $mplayer_prog eq '') {
1738	print "\nwarning: Trying to process video files but cannot find mplayer in \$path!\n";	1739	print "\nwarning: Trying to process video files but cannot find mplayer in \$path!\n";
1739	flush (STDOUT);	1740	STDOUT->flush();
1740	}	1741	}
1741	print "\nSkipping $pathname";	1742	print "\nSkipping $pathname";
1742	flush (STDOUT);	1743	STDOUT->flush();
1743	return 0;	1744	return 0;
1744	} else {	1745	} else {
1745	$object_counter++;	1746	$object_counter++;
Lines 1893-1906 Link Here
1893	my $i;	1894	my $i;
1894		1895
1895	print ".";	1896	print ".";
1896	flush (STDOUT);	1897	STDOUT->flush();
1897		1898
1898	$retval = $image->Read($pathname);	1899	$retval = $image->Read($pathname);
1899		1900
1900		1901
1901	if ($retval ne "") {	1902	if ($retval ne "") {
1902	print "\nSkipping $pathname";	1903	print "\nSkipping $pathname";
1903	flush (STDOUT);	1904	STDOUT->flush();
1904	return;	1905	return;
1905	} else {	1906	} else {
1906	$object_counter++;	1907	$object_counter++;
Lines 2298-2304 Link Here
2298	if (defined($lastdate)) {	2299	if (defined($lastdate)) {
2299	print "<META NAME=\"$enddatemetatag\" CONTENT=\"$lastdate\">\n";	2300	print "<META NAME=\"$enddatemetatag\" CONTENT=\"$lastdate\">\n";
2300	}	2301	}
2301	if (!defined ($opt_includeall) && defined (@opt_exclude) && scalar (@opt_exclude)) {	2302	if (!defined ($opt_includeall) && @opt_exclude && scalar (@opt_exclude)) {
2302	my $tmp = join (',', @opt_exclude);	2303	my $tmp = join (',', @opt_exclude);
2303	my $etmp;	2304	my $etmp;
2304		2305
Lines 2311-2317 Link Here
2311	}	2312	}
2312	printf ("<META NAME=\"$numimagesmetatag\" CONTENT=\"%d\">\n", $image_counter);	2313	printf ("<META NAME=\"$numimagesmetatag\" CONTENT=\"%d\">\n", $image_counter);
2313		2314
2314	if (defined (@opt_skipmont) && scalar (@opt_skipmont)) {	2315	if (@opt_skipmontv && scalar (@opt_skipmont)) {
2315	my $tmp = join (',', @opt_skipmont);	2316	my $tmp = join (',', @opt_skipmont);
2316	printf ("<META NAME=\"$skipmetatag\" CONTENT=\"%s\">\n", $tmp);	2317	printf ("<META NAME=\"$skipmetatag\" CONTENT=\"%s\">\n", $tmp);
2317	}	2318	}
Lines 2475-2481 Link Here
2475	# then process. Check to see if any of the -skipmont options were given as	2476	# then process. Check to see if any of the -skipmont options were given as
2476	# strings of filenames concatenated with ',' characters. If so, support it.	2477	# strings of filenames concatenated with ',' characters. If so, support it.
2477	#	2478	#
2478	if (defined (@opt_skipmont)) {	2479	if (@opt_skipmont) {
2479	foreach (@opt_skipmont) {	2480	foreach (@opt_skipmont) {
2480	(@tokens) = split (/,/, $_);	2481	(@tokens) = split (/,/, $_);
2481	foreach $token (@tokens) {	2482	foreach $token (@tokens) {
Lines 2499-2505 Link Here
2499	# then process. Check to see if any of the -exclude options were given as	2500	# then process. Check to see if any of the -exclude options were given as
2500	# strings of filenames concatenated with ',' characters. If so, support it.	2501	# strings of filenames concatenated with ',' characters. If so, support it.
2501	#	2502	#
2502	if (defined (@opt_exclude)) {	2503	if (@opt_exclude) {
2503	# -includeall takes priority over -exclude on the commandline if they are	2504	# -includeall takes priority over -exclude on the commandline if they are
2504	# used together (wierd, but ...)	2505	# used together (wierd, but ...)
2505	#	2506	#