eleksir/irssi-scripts
1
Fork 0
Code Activity

img_wget.pl: if there is no Image::Magick in system do not use it

Browse Source 
in cygwin Image Magick looks not thread safe, at least it chokes when used in thread context, avoid using it
This commit is contained in:
C:\Users\eleksir\AppData\Roaming\The Bat!
2017-11-11 21:25:45 +03:00
parent a3f0e7e0fd
commit ae25d16f49
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
img_wget.pl
View File

@@ -3,7 +3,16 @@
use threads;
use threads::shared;
use URI::URL;
use Image::Magick;
my $IMAGEMAGICK = undef; # use on demand
if ($^O ne 'cygwin') { # cygwin 2.882 64-bit hag broken Image::Magick
$IMAGEMAGICK = eval {
require Image::Magick;
import Image::Magick qw(ping);
return 1;
}
}
use Irssi qw (command_bind
settings_get_bool settings_add_bool
settings_get_str settings_add_str);
@@ -100,19 +109,22 @@ sub dlfunc(@) {
$url = urlencode($url);
system($wgetpath, '--no-check-certificate', '-q', '-T', '20', '-O', $file, '-o', '/dev/null', $url);
if ($file =~ /(png|jpe?g|gif)$/i){
my $im = Image::Magick->new();
my $rename = 1;
my (undef, undef, undef, $format) = $im->Ping($file);
if (($^O ne 'cygwin') and defined($IMAGEMAGICK)) {
eval {
if ($file =~ /(png|jpe?g|gif)$/i){
my $im = Image::Magick->new();
my $rename = 1;
my (undef, undef, undef, $format) = $im->Ping($file);
if (defined($format)) {
$rename = 0 if (($format eq 'JPEG') and ($file =~ /jpe?g$/i));
$rename = 0 if (($format eq 'GIF') and ($file =~ /gif$/i));
$rename = 0 if (($format =~ /^PNG/) and ($file =~ /png$/i));
rename $file, sprintf("%s.%s", $file, lc($format)) if ($rename == 1);
if (defined($format)) {
$rename = 0 if (($format eq 'JPEG') and ($file =~ /jpe?g$/i));
$rename = 0 if (($format eq 'GIF') and ($file =~ /gif$/i));
$rename = 0 if (($format =~ /^PNG/) and ($file =~ /png$/i));
rename $file, sprintf("%s.%s", $file, lc($format)) if ($rename == 1);
}
}
}
}
return;
}