rework to utilize hc event system and threads

img_url_wget.pl

@@ -1,11 +1,6 @@
-#!/usr/bin/perl
+use HexChat qw(:all);
-
+use threads;
-# HexChat Perl script
+use threads::shared;
-# Automatically save images that are linked in a channel to [hexchat-dir]/imgsave on linux/unices
-# The bad_domains array may be used to exclude image URLs with domains matching any of a list of patterns. Set to an empty list to disable.
-
-# TODO: enhance urlencode with punicode
-# TODO: create menu and plugin-own ini-file or some sort of config (or add one more section to hexchat config, which is possible via api)
 
 use strict;
 use warnings "all";
@@ -13,6 +8,12 @@ use warnings "all";
 use URI::URL;
 use Image::Magick;
 
+sub dlfunc(@);
+sub cdlfunc($);    # thread, that checks and downloads stuff
+sub is_picture($);
+sub urlencode($);
+sub hookfn;
+
 my $wgetpath;
 
 if (-f "/bin/wget") {
@@ -23,17 +24,8 @@ if (-f "/bin/wget") {
 	$wgetpath = '/usr/local/bin/wget';
 }
 
-sub dlfunc(@);     # download thread
-sub cdlfunc($);    # thread, that checks and downloads stuff
-sub is_picture($); # sub that checks mime-type given by the web server, this check should be used only to
-                   # detect that given url contain picture or video, after download we should check mime-type
-                   # again and rename file if needed
-sub urlencode($);  # correctly encode url :)
-sub hookfn;        # in defaults we trust: dunno arrayname/args name, but default values looks good :)
-
-
 my $script_name = "Image URL Auto Grabber and Downloader, wget flavour";
-HexChat::register($script_name, '0.6', 'Automatically grabs and downloads image URLs via wget');
+HexChat::register($script_name, '0.7', 'Automatically grabs and downloads image URLs via wget');
 
 HexChat::print("$script_name loaded\n");
 HexChat::hook_print('Channel Message', \&hookfn);
@@ -41,8 +33,49 @@ HexChat::hook_print('Channel Msg Hilight', \&hookfn);
 HexChat::hook_print('Channel Action', \&hookfn);
 HexChat::hook_print('Channel Action Hilight', \&hookfn);
 
-my @bad_domains = ();	#array of regexs for domain name exclusion
+my $active = 0;
-#my @bad_domains = (qr/^(?:.*\.)?example\.com$/, qr/\bbannedword\b/, qr/^name\./);		#example, exclude: example.com and subdomains, domains containing the term bannedword, and domains starting with name.
+share($active);
+
+sub hookfn {
+	my ($nick, $text, $modechar) = @{$_[0]};
+	my @words = split(/\s+/, $text);
+
+	foreach (@words) {
+		if ($_ =~ m{https?://([a-zA-Z0-9.-]+\.[a-zA-Z]+)/(?:.*)}) {
+			$active = 1;
+			threads->create(\&cdlfunc, $_);
+
+			if ($active == 1) {
+				HexChat::hook_timer( 100, sub { return REMOVE if ($active == 0); return KEEP; } );
+			}
+		}
+	}
+
+	foreach my $thread (threads->list(threads::joinable)) {
+		$thread->join();
+	}
+
+	return HexChat::EAT_NONE;
+}
+
+sub cdlfunc($) {
+	my $url = shift;
+	my $extension = is_picture($url);
+
+	if (defined($extension)) {
+		my $savepath = sprintf("%s/imgsave", HexChat::get_info("configdir"));
+		mkdir ($savepath) unless (-d $savepath);
+		$savepath = $savepath . "/" . s/[^\w!., -#]/_/gr . ".$extension";
+
+		if ( (lc($url) =~ /\.(gif|jpeg|png|webm|mp4)$/) and ($1 eq $extension) ){
+				$savepath = HexChat::get_info("configdir") . "/imgsave/" . s/[^\w!., -#]/_/gr;
+		}
+
+		dlfunc($url, $savepath);
+	}
+
+	$active = 0;
+}
 
 sub dlfunc(@) {
 	my $url = shift;
@@ -60,42 +93,13 @@ sub dlfunc(@) {
 			$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 ($rename == 1) {
-				rename $file, sprintf("%s.%s", $file, lc($format));
-			}
 		}
 	}
 
 	return 0;
 }
 
-sub cdlfunc($) {
-	my $url = shift;
-	my $extension = is_picture($url);
-
-	if (defined($extension)) {
-
-		my $savepath = sprintf("%s/imgsave", HexChat::get_info("configdir"));
-
-		unless (-d $savepath) {
-			mkdir ($savepath);
-		}
-
-		$savepath = $savepath . "/" . s/[^\w!., -#]/_/gr . ".$extension";
-
-		if (lc($url) =~ /\.(gif|jpeg|png|webm|mp4)$/) {
-		
-			if ($1 eq $extension) {
-				$savepath = HexChat::get_info("configdir") . "/imgsave/" . s/[^\w!., -#]/_/gr;
-			}
-
-		}
-
-		dlfunc($url, $savepath);
-	}
-}
-
 sub is_picture($) {
 	my $url = shift;
 	$url = urlencode($url);
@@ -127,20 +131,3 @@ sub urlencode($) {
 	undef $urlobj;
 	return $url;
 }
-
-sub hookfn {
-	my ($nick, $text, $modechar) = @{$_[0]};
-	my @words = split(/\s+/, $text);
-
-	foreach (@words) {
-		# here we try to catch string that can contain http or https at beginning (assume http if none)
-		# and after all ends with known extension
-		if ($_ =~ m{https?://([a-zA-Z0-9.-]+\.[a-zA-Z]+)/(?:.*)}) {
-			cdlfunc($_);
-		}
-	}
-
-	return HexChat::EAT_NONE;
-}
-
-__END__