add 'in program' download cmd to replace wget

diff --git a/Changes b/Changes
index 9a4307e4dcab4121d6249780725796ccdb05e9c3..74c07256e21aea98e4bddc26e751945a2f90df65 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,21 @@
+10Mar23=======================================================================
+1. I am aware that there are windows nodes out there on mojo (brave, impetuous 
+   that you are) and wget is not an easy option to download badip files. So, 
+   through the power of mojo I give you the new 'download' command. As it 
+   stands at the moment, it will download a file from a webserver and place
+   it in /spider/local_data. If it downloads successfully, it will overwrite
+   any file with that name in /spider/local_data. Needless to say this is a 
+   sysop only command. 
+
+24 * * * * run_cmd('download http://www.dxspider.net/download/badip.torexit')
+24 * * * * run_cmd('download http://www.dxspider.net/download/badip.torrelay')
+24 * * * * run_cmd('download http://www.dxspider.net/download/badip.global')
+25 * * * * run_cmd('load/badip')
+
+   would be an obvious use. But it can also be used to download spot, USDB 
+   and other data as well. If you do use it then you will still need to 
+   do a spawn_cmd in crontab for the conversion programs, but that too is 
+   going to change.
 07Mar23=======================================================================
 1. Fix odd (and old) regression dx command (line ending 59+++) '++' being the 
    culprit.

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 63cef603878c022925d56a0c03cd5ca73cea1d10..6d37efb96f459627dbe3daa385f0cef11c925253 100644 (file)
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -616,7 +616,24 @@ or everything (except yourself) with
 
   DISC all
 
-=== 0^DX [BY <call>] <freq> <call> <remarks>^Send a DX spot
+=== 9^DOWNLOAD <url>^Download a file into local_data
+This command is a direct replacement for the unix 'wget -Qn' command
+that is used to download files like badip, spot data, user databases
+like usdb. It is designed to work either on the command line in a console
+or (more likely) in the crontab, like the example below:
+
+24 * * * * run_cmd('download http://www.dxspider.net/download/badip.torexit')
+24 * * * * run_cmd('download http://www.dxspider.net/download/badip.torrelay')
+24 * * * * run_cmd('download http://www.dxspider.net/download/badip.global')
+25 * * * * run_cmd('load/badip')
+
+If you do use the crontab then *please* use a random minute between 15-40
+and not all use minute 24.
+
+Windows users may well find this particularly useful.
+
+=== 0^DX <freq> <call> <remarks>^Send a DX spot
+=== 2^DX [BY <call>] [ip <ipaddress>] <freq> <call> <remarks>^Send a DX spot
 This is how you send a DX Spot to other users. You can, in fact, now
 enter the <freq> and the <call> either way round. 
 

diff --git a/cmd/download.pl b/cmd/download.pl
new file mode 100644 (file)
index 0000000..46cb627
--- /dev/null
+++ b/cmd/download.pl
@@ -0,0 +1,58 @@
+#
+# download a file from t'internet
+#
+# A build in, non-spawning, wget -Qn
+#
+# Copyright 2023 Dirk Koopman G1TLH
+#
+
+#use IO::Socket::SSL;
+use File::Copy;
+
+my %h;
+
+sub handle
+{
+       my $self = shift;
+       return (1, $self->msg('e5')) if $self->priv < 9 || $self->remotecmd;
+       my $url = unpad(shift);
+       my $dest = unpad(shift) if @_;
+       dbg("download: url $url");
+       my $ua = Mojo::UserAgent->new->insecure(1)->max_redirects(5);
+       my $res = $ua->get($url => sub {finish(@_, $self, $ua)});
+       $self->{$res} = $res;
+       dbg("ua $ua start: $url") if isdbg('download');
+}
+
+sub finish {
+       my ($ua, $tx, $self, $ua) = @_;
+
+#      $DB::single = 1;
+       
+       my $res = $tx->res;
+       
+       if ($res->is_success) {
+               #dbg("body: " . $res->body) if isdbg('download');
+               my $tmp = localdata("tmp");
+               mkdir $tmp, 0777 unless -e $tmp;
+               my $path = $tx->req->url->to_abs->path;
+               my @parts = split m|/|, $path;
+               my $fn = $parts[-1];
+               dbg("ua $ua temp file: $tmp/$fn") if isdbg('download');
+               $res->save_to("$tmp/$fn");
+               my $target = localdata($fn);
+               if (-e "$tmp/$fn") {
+                       LogDbg('dxcommand', "moving $tmp/$fn -> $target from ");
+                       move "$tmp/$fn", $target;
+                       unlink "$tmp/$fn";
+               }
+               dbg("download: $target successfully downloaded") if isdbg('progress')
+       } elsif ($res->is_error) {
+               dbg("ua $ua err: " . $res->error) if isdbg('download');
+       } elsif ($res->code == 301) {
+               dbg("redirect: " . $res->headers->location)
+       } else {
+               dbg("something else: " . $res->error->{message});
+       }
+       delete $self->{$res};
+}