cleanup
This commit is contained in:
@@ -8,8 +8,7 @@ use warnings "all";
|
|||||||
use URI::URL;
|
use URI::URL;
|
||||||
use Image::Magick;
|
use Image::Magick;
|
||||||
|
|
||||||
sub dlfunc(@);
|
sub dlfunc($); # thread, that checks and downloads stuff
|
||||||
sub cdlfunc($); # thread, that checks and downloads stuff
|
|
||||||
sub is_picture($);
|
sub is_picture($);
|
||||||
sub urlencode($);
|
sub urlencode($);
|
||||||
sub hookfn;
|
sub hookfn;
|
||||||
@@ -26,7 +25,7 @@ if (-f "/bin/wget") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
my $script_name = "Image URL Auto Grabber and Downloader, wget flavour";
|
my $script_name = "Image URL Auto Grabber and Downloader, wget flavour";
|
||||||
HexChat::register($script_name, '0.8.4', 'Automatically grabs and downloads image URLs via wget', \&freehooks);
|
HexChat::register($script_name, '0.8.5', 'Automatically grabs and downloads image URLs via wget', \&freehooks);
|
||||||
|
|
||||||
HexChat::print("$script_name loaded\n");
|
HexChat::print("$script_name loaded\n");
|
||||||
my @hooks;
|
my @hooks;
|
||||||
@@ -48,7 +47,7 @@ sub hookfn {
|
|||||||
my $t = undef;
|
my $t = undef;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
$t = threads->create('cdlfunc', $_);
|
$t = threads->create('dlfunc', $_);
|
||||||
sleep 1 unless(defined($t));
|
sleep 1 unless(defined($t));
|
||||||
} unless (defined($t));
|
} unless (defined($t));
|
||||||
|
|
||||||
@@ -67,7 +66,7 @@ sub hookfn {
|
|||||||
return HexChat::EAT_NONE;
|
return HexChat::EAT_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub cdlfunc($) {
|
sub dlfunc($) {
|
||||||
my $url = shift;
|
my $url = shift;
|
||||||
my $extension = is_picture($url);
|
my $extension = is_picture($url);
|
||||||
|
|
||||||
@@ -80,37 +79,29 @@ sub cdlfunc($) {
|
|||||||
$savepath = HexChat::get_info("configdir") . "/imgsave/" . s/[^\w!., -#]/_/gr;
|
$savepath = HexChat::get_info("configdir") . "/imgsave/" . s/[^\w!., -#]/_/gr;
|
||||||
}
|
}
|
||||||
|
|
||||||
dlfunc($url, $savepath);
|
|
||||||
undef $savepath;
|
|
||||||
}
|
|
||||||
|
|
||||||
$active = 0;
|
|
||||||
undef $url; undef $extension;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub dlfunc(@) {
|
|
||||||
my $url = shift;
|
|
||||||
my $file = shift;
|
|
||||||
|
|
||||||
$url = urlencode($url);
|
$url = urlencode($url);
|
||||||
system($wgetpath, '--no-check-certificate', '-q', '-T', '20', '-O', $file, '-o', '/dev/null', $url);
|
system($wgetpath, '--no-check-certificate', '-q', '-T', '20', '-O', $file, '-o', '/dev/null', $url);
|
||||||
|
|
||||||
if ($file =~ /(png|jpe?g|gif)$/i){
|
if ($file =~ /(png|jpe?g|gif)$/i){
|
||||||
my $im = Image::Magick->new();
|
my $im = Image::Magick->new();
|
||||||
my $rename = 1;
|
my $rename = 1;
|
||||||
my (undef, undef, undef, $format) = $im->Ping($file);
|
my (undef, undef, undef, $format) = $im->Ping($savepath);
|
||||||
|
|
||||||
if (defined($format)) {
|
if (defined($format)) {
|
||||||
$rename = 0 if (($format eq 'JPEG') and ($file =~ /jpe?g$/i));
|
$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 eq 'GIF') and ($file =~ /gif$/i));
|
||||||
$rename = 0 if (($format =~ /^PNG/) and ($file =~ /png$/i));
|
$rename = 0 if (($format =~ /^PNG/) and ($file =~ /png$/i));
|
||||||
rename $file, sprintf("%s.%s", $file, lc($format)) if ($rename == 1);
|
rename $savepath, sprintf("%s.%s", $savepath, lc($format)) if ($rename == 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
undef $im; undef $rename;
|
undef $im; undef $rename;
|
||||||
}
|
}
|
||||||
|
|
||||||
undef $url; undef $file;
|
undef $savepath;
|
||||||
|
}
|
||||||
|
|
||||||
|
$active = 0;
|
||||||
|
undef $url; undef $extension;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub is_picture($) {
|
sub is_picture($) {
|
||||||
@@ -121,10 +112,7 @@ sub is_picture($) {
|
|||||||
$r = `$wgetpath --no-check-certificate -q --method=HEAD -S --timeout=5 "$url" 2>&1`;
|
$r = `$wgetpath --no-check-certificate -q --method=HEAD -S --timeout=5 "$url" 2>&1`;
|
||||||
undef $url;
|
undef $url;
|
||||||
|
|
||||||
if ($? != 0) {
|
if ($? == 0) {
|
||||||
return undef;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (split(/\n/, $r)) {
|
foreach (split(/\n/, $r)) {
|
||||||
next unless($_ =~ /Content\-Type: (.+)/);
|
next unless($_ =~ /Content\-Type: (.+)/);
|
||||||
$r = ($1); chomp($r);
|
$r = ($1); chomp($r);
|
||||||
@@ -141,6 +129,9 @@ sub is_picture($) {
|
|||||||
} else {
|
} else {
|
||||||
$r = undef;
|
$r = undef;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
$r = undef;
|
||||||
|
}
|
||||||
|
|
||||||
return $r;
|
return $r;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user