mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

50_SSFile.pm: contrib Version 0.5.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23041 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2020-10-28 20:31:59 +00:00
parent 116e9f0059
commit 175ac44a35
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -697,7 +697,8 @@ sub __fillUploadQueue {
reqtype => "POST", reqtype => "POST",
header => "Content-Type: multipart/form-data, boundary=$bound", header => "Content-Type: multipart/form-data, boundary=$bound",
lclFile => $lcf, lclFile => $lcf,
postdata => $dat postdata => $dat,
remFile => $dir."/".$fname
}; };
if(AttrVal($name, "noAsyncFillQueue", 0)) { if(AttrVal($name, "noAsyncFillQueue", 0)) {
@@ -1817,13 +1818,14 @@ sub _parseUpload {
$href->{Progress} = $jdata->{data}{progress}; $href->{Progress} = $jdata->{data}{progress};
$href->{RemoteFile} = encode("utf8", $file); $href->{RemoteFile} = encode("utf8", $file);
my $obj = $data{$type}{$name}{sendqueue}{entries}{$idx}{lclFile}; # File-Objekt des aktuellen Index 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
if($skip eq "false") { if($skip eq "false") {
$data{$type}{$name}{uploaded}{"$obj"} = { done => 1, ts => time }; # Status und Zeit des Objekt-Upload speichern $data{$type}{$name}{uploaded}{"$lclobj"} = { remobj => $remobj, done => 1, ts => time }; # Status und Zeit des Objekt-Upload speichern
Log3 ($name, 4, qq{$name - Object "$obj" uploaded}); Log3 ($name, 4, qq{$name - Object "$lclobj" uploaded});
} else { } else {
Log3 ($name, 3, qq{$name - Object "$obj" already exists -> upload skipped}); Log3 ($name, 3, qq{$name - Object "$remobj" already exists -> upload skipped});
} }
return; return;
@@ -1985,7 +1987,7 @@ sub listUploadsDone {
$out .= "<table class=\"block wide internals\">"; $out .= "<table class=\"block wide internals\">";
$out .= "<tbody>"; $out .= "<tbody>";
$out .= "<tr class=\"odd\">"; $out .= "<tr class=\"odd\">";
$out .= "<td> <b>Object</b> </td><td> <b>upload Date & Time</b> </td><td> <b>State</b> </td></tr>"; $out .= "<td> <b>local Object</b> </td><td> <b>remote Object</b> </td><td> <b>upload Date & Time</b> </td></tr>";
$out .= "<tr>"; $out .= "<tr>";
$out .= "<td> </td><td> </td><td> </td></tr>"; $out .= "<td> </td><td> </td><td> </td></tr>";
@@ -1993,7 +1995,9 @@ sub listUploadsDone {
for my $idx (sort keys %{$data{$type}{$name}{uploaded}}) { for my $idx (sort keys %{$data{$type}{$name}{uploaded}}) {
my $ds = $data{$type}{$name}{uploaded}{"$idx"}{done}; my $ds = $data{$type}{$name}{uploaded}{"$idx"}{done};
next if(!$ds); next if(!$ds);
my $ts = $data{$type}{$name}{uploaded}{"$idx"}{ts}; my $ts = $data{$type}{$name}{uploaded}{"$idx"}{ts};
my $ro = $data{$type}{$name}{uploaded}{"$idx"}{remobj};
$ds = "success"; $ds = "success";
$ts = FmtDateTime($ts); $ts = FmtDateTime($ts);
@@ -2007,8 +2011,8 @@ sub listUploadsDone {
$i++; $i++;
$out .= "<td style=\"vertical-align:top\"> $idx </td>"; $out .= "<td style=\"vertical-align:top\"> $idx </td>";
$out .= "<td style=\"vertical-align:top\"> $ro </td>";
$out .= "<td style=\"vertical-align:top\"> $ts </td>"; $out .= "<td style=\"vertical-align:top\"> $ts </td>";
$out .= "<td style=\"vertical-align:top\"> $ds </td>";
$out .= "</tr>"; $out .= "</tr>";
} }