FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-16 16:56:04 +00:00
Code Issues Releases Wiki Activity

50_SSFile.pm: contrib Version 0.7.3

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23256 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-11-29 12:03:56 +00:00
parent 08cee74905
commit e45ac0d657
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fhem/contrib/DS_Starter/50_SSFile.pm
View File

@ -144,6 +144,8 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"0.7.3" => "29.11.2020 fix (prepare)Download without dest= option",
"0.7.2" => "22.11.2020 undef variables containing a lot of data in execOp ",
"0.7.1" => "08.11.2020 fix download, fix perl warning while upload not existing files ", "0.7.1" => "08.11.2020 fix download, fix perl warning while upload not existing files ",
"0.7.0" => "02.11.2020 new set command deleteRemoteObj, fix download object with space in name ", "0.7.0" => "02.11.2020 new set command deleteRemoteObj, fix download object with space in name ",
"0.6.0" => "30.10.2020 Upload files may contain wildcards *. ", "0.6.0" => "30.10.2020 Upload files may contain wildcards *. ",
@ -597,8 +599,7 @@ sub _setDownload {
my ($s,$d) = split "dest=", $arg; my ($s,$d) = split "dest=", $arg;
$d = smUrlEncode ($d); $d = smUrlEncode ($d);
$arg = $s."dest=".$d; $arg = $s." dest=".$d if($d);
my ($a,$h) = parseParams ($arg); my ($a,$h) = parseParams ($arg);
my $fp = $a->[0]; my $fp = $a->[0];
@ -643,6 +644,14 @@ sub _setDownload {
if($opt ne "prepareDownload") { if($opt ne "prepareDownload") {
getApiSites ($name); # Queue starten getApiSites ($name); # Queue starten
} }
else {
readingsBeginUpdate ($hash);
readingsBulkUpdateIfChanged ($hash, "Errorcode", "none" );
readingsBulkUpdateIfChanged ($hash, "Error", "none" );
readingsBulkUpdate ($hash, "QueueAddDownload", $a->[0]);
readingsBulkUpdate ($hash, "state", "done" );
readingsEndUpdate ($hash, 1);
}
return; return;
} }
@ -810,6 +819,13 @@ sub __fillUploadQueueFinish {
if($opt ne "prepareUpload") { if($opt ne "prepareUpload") {
getApiSites ($name); # Queue starten getApiSites ($name); # Queue starten
} }
else {
readingsBeginUpdate ($hash);
readingsBulkUpdateIfChanged ($hash, "Errorcode", "none");
readingsBulkUpdateIfChanged ($hash, "Error", "none");
readingsBulkUpdate ($hash, "state", "done");
readingsEndUpdate ($hash, 1);
}
return; return;
} }
@ -1520,7 +1536,7 @@ sub execOp {
my $toutdef = $data{$type}{$name}{sendqueue}{entries}{$idx}{timeout} // 20; my $toutdef = $data{$type}{$name}{sendqueue}{entries}{$idx}{timeout} // 20;
my $fileapi = $data{$type}{$name}{fileapi}; my $fileapi = $data{$type}{$name}{fileapi};
my ($url,$param,$error,$errorcode); my ($url,$param,$error,$errorcode,$content);
my $timeout = AttrVal($name, "timeout", $toutdef); my $timeout = AttrVal($name, "timeout", $toutdef);
@ -1552,12 +1568,13 @@ sub execOp {
Log3($name, 5, "$name - POST data (string <FILE> will be replaced with content of $lclFile):\n$postdata"); Log3($name, 5, "$name - POST data (string <FILE> will be replaced with content of $lclFile):\n$postdata");
($errorcode, my $content) = slurpFile ($name, $lclFile); ($errorcode, $content) = slurpFile ($name, $lclFile);
if($errorcode) { if($errorcode) {
$error = expErrors ($hash, $errorcode ); $error = expErrors ($hash, $errorcode );
setReadingErrorState ($hash, $error, $errorcode ); setReadingErrorState ($hash, $error, $errorcode );
checkSendRetry ($name, 1, $queueStartFn); checkSendRetry ($name, 1, $queueStartFn);
undef $content;
return; return;
} }
@ -1569,6 +1586,9 @@ sub execOp {
HttpUtils_NonblockingGet ($param); HttpUtils_NonblockingGet ($param);
undef $content;
undef $postdata;
return; return;
} }