eleksir/hexchat-scripts
1
Fork 0
Code Activity

now we handle all lists correctly

Browse Source
This commit is contained in:
eleksir
2016-10-15 13:08:54 +03:00
parent 889b1ec6c7 cb5b2d6223
commit e3f657c7f6
2 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
img_url_wget.pl
View File

@@ -8,8 +8,7 @@ use warnings "all";
use URI::URL;
use Image::Magick;
sub dlfunc(@);
sub cdlfunc($); # thread, that checks and downloads stuff
sub dlfunc($); # thread, that checks and downloads stuff
sub is_picture($);
sub urlencode($);
sub hookfn;
@@ -26,7 +25,7 @@ if (-f "/bin/wget") {
}
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");
my @hooks;
@@ -48,7 +47,7 @@ sub hookfn {
my $t = undef;
do {
$t = threads->create('cdlfunc', $_);
$t = threads->create('dlfunc', $_);
sleep 1 unless(defined($t));
} unless (defined($t));
@@ -67,7 +66,7 @@ sub hookfn {
return HexChat::EAT_NONE;
}
sub cdlfunc($) {
sub dlfunc($) {
my $url = shift;
my $extension = is_picture($url);
@@ -80,37 +79,29 @@ sub cdlfunc($) {
$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);
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);
my (undef, undef, undef, $format) = $im->Ping($savepath);
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);
rename $savepath, sprintf("%s.%s", $savepath, lc($format)) if ($rename == 1);
}
undef $im; undef $rename;
}
undef $url; undef $file;
undef $savepath;
}
$active = 0;
undef $url; undef $extension;
}
sub is_picture($) {
@@ -121,10 +112,7 @@ sub is_picture($) {
$r = `$wgetpath --no-check-certificate -q --method=HEAD -S --timeout=5 "$url" 2>&1`;
undef $url;
if ($? != 0) {
return undef;
}
if ($? == 0) {
foreach (split(/\n/, $r)) {
next unless($_ =~ /Content\-Type: (.+)/);
$r = ($1); chomp($r);
@@ -141,6 +129,9 @@ sub is_picture($) {
} else {
$r = undef;
}
} else {
$r = undef;
}
return $r;
}

15
notifications.pl
View File

@@ -1,4 +1,3 @@
# TODO: handle quotes in "/notify add netname network" with space containing entities
use strict;
use warnings "all";
use HexChat qw(:all);
@@ -26,7 +25,7 @@ my $help = 'Usage:
/notify show - shows whitelists and their statuses
';
register($script_name, '0.8', 'Sends *nix desktop notifications', \&freehooks);
register($script_name, '0.8.1', 'Sends *nix desktop notifications', \&freehooks);
HexChat::print("$script_name loaded\n");
my @hooks;
@@ -128,9 +127,10 @@ sub timeraction {
}
sub notify_cmd {
my $cmd = $_[0][1] // undef;
my $entity = $_[0][2] // undef;
my $value = $_[0][3] // undef;
shift(@{$_[0]});
my $cmd = shift(@{$_[0]});
my $entity = shift(@{$_[0]});
my $value = join(' ', @{$_[0]});
unless (defined($cmd)) {
HexChat::print($help);
@@ -304,10 +304,13 @@ sub notify_cmd {
my @netlist;
foreach (@list) {
HexChat::printf("_: %s, value: %s", $_, $value);
next if($_ eq $value);
push @netlist, $value;
push @netlist, $_;
}
@list = -1; undef @list;
unless (defined(savelist('nets', @netlist))) {
return HexChat::EAT_ALL;
}