From cb5822dbcc11be4ef36d40bf8c6f8138a1ebb218 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Sat, 31 Oct 2020 20:46:24 +0000 Subject: [PATCH] 50_SSFile.pm: contrib Version 0.6.0 git-svn-id: https://svn.fhem.de/fhem/trunk@23064 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/50_SSFile.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fhem/contrib/DS_Starter/50_SSFile.pm b/fhem/contrib/DS_Starter/50_SSFile.pm index c88ac5810..77a527971 100644 --- a/fhem/contrib/DS_Starter/50_SSFile.pm +++ b/fhem/contrib/DS_Starter/50_SSFile.pm @@ -753,6 +753,9 @@ sub __fillUploadQueueFinish { readingsSingleUpdate($hash, "state", "Upload queue fill finished", 1); + my $ql = ReadingsVal($name, "QueueLength", 0); # zusätzlichen Event wenn Queue Aufbau fertig + CommandTrigger(undef, "$name QueueLength: $ql"); + if($opt ne "prepareUpload") { getApiSites ($name); # Queue starten } @@ -1859,14 +1862,20 @@ sub _parseUpload { my $lclobj = $data{$type}{$name}{sendqueue}{entries}{$idx}{lclFile}; # lokales File-Objekt des aktuellen Index my $remobj = $data{$type}{$name}{sendqueue}{entries}{$idx}{remFile}; # File-Objekt im Zielverezichnis + my $trtxt; if($skip eq "false") { $data{$type}{$name}{uploaded}{"$lclobj"} = { remobj => $remobj, done => 1, ts => time }; # Status und Zeit des Objekt-Upload speichern Log3 ($name, 4, qq{$name - Object "$lclobj" uploaded}); - } else { + $trtxt = qq{Upload: local File "$lclobj" to remote File "$remobj"}; + } + else { Log3 ($name, 3, qq{$name - Object "$remobj" already exists -> upload skipped}); + $trtxt = qq{Upload: skipped upload local File "$lclobj"}; } + CommandTrigger(undef, "$name $trtxt"); + return; }