Moved downloading to main job loop, changed print values, so that . = no update, D = downloaded update, F = program failure, E = error downloading file, | = retry
This commit is contained in:
12
pcurse.pm
12
pcurse.pm
@ -326,22 +326,22 @@ sub init_pool {
|
||||
$addon->{'downloaduri'} = $addon->{'host'}.$addon->{'uri'}.'/download/'.$fileid.'/file';
|
||||
}
|
||||
$addon->{'targetversion'} = $version;
|
||||
return (1,$addon);
|
||||
return { retval => 1, did => 'check', addon => $addon };
|
||||
}
|
||||
} else {
|
||||
return (0,'No need to update');
|
||||
return { retval => 0, did => 'check', result => 'No need to update', addon => $addon };
|
||||
}
|
||||
} else {
|
||||
return (0,'Could not find file id for '.$addon->{'name'});
|
||||
return { retval => 0, did => 'check', result => 'Could not find file id for '.$addon->{'name'} };
|
||||
}
|
||||
} elsif($todo eq 'download') {
|
||||
my $uri = shift;
|
||||
my $fileid = shift;
|
||||
my ($ret,$filename,$file) = pcurse::download_update($uri,$fileid);
|
||||
return { retval => $ret, filename => $filename, filecontent => $file } if($ret);
|
||||
return { retval => 0, filename => undef, filecontent => undef };
|
||||
return { retval => $ret, did => 'download', filename => $filename, filecontent => $file } if($ret);
|
||||
return { retval => 0, did => 'download', filename => undef, filecontent => undef, uri => $uri };
|
||||
} else {
|
||||
return (0,'Unknown task');
|
||||
return { retval => 0, result => 'Unknown task' };
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user