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

50_SSFile.pm: contrib Version 0.7.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23122 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-11-08 21:41:53 +00:00
parent 0a2fc7ed9c
commit 979d2dbd3a
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use Encode; use Encode;
use File::Find; use File::Find;
use File::Glob ':bsd_glob';
no if $] >= 5.017011, warnings => 'experimental::smartmatch'; no if $] >= 5.017011, warnings => 'experimental::smartmatch';
eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; ## no critic 'eval' eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; ## no critic 'eval'
@ -143,7 +144,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"0.7.1" => "08.11.2020 fix download ", "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 *. ",
"0.5.0" => "26.10.2020 new Setter Upload and fillup upload queue asynchronously, some more improvements around Upload ", "0.5.0" => "26.10.2020 new Setter Upload and fillup upload queue asynchronously, some more improvements around Upload ",
@ -593,7 +594,6 @@ sub _setDownload {
# method => auszuführende API-Methode, # method => auszuführende API-Methode,
# params => "spezifische API-Parameter> # params => "spezifische API-Parameter>
# $arg = smUrlEncode ($arg);
my ($s,$d) = split "dest=", $arg; my ($s,$d) = split "dest=", $arg;
$d = smUrlEncode ($d); $d = smUrlEncode ($d);
@ -692,21 +692,23 @@ sub _setUpload {
my @all; my @all;
for my $obj (@uld) { # nicht existierende objekte aussondern for my $obj (@uld) { # nicht existierende objekte aussondern
if (! -e $obj) { my @globes = bsd_glob ("$obj"); # Wildcards auflösen (https://perldoc.perl.org/functions/glob)
my @globes = glob ("$obj"); # Wildcards auflösen (https://perldoc.perl.org/functions/glob) push (@all, @globes);
if (@globes) { }
push (@all, @globes); Log3 ($name, 1, "$name - all: ".Dumper @all);
next; my @afiles;
} for my $file (@all) {
Log3 ($name, 3, qq{$name - The object "$obj" doesn't exist or can't be dissolved, ignore it for upload}); if (-e $file) {
push @afiles, $file;
next; next;
} }
push @all, $obj; Log3 ($name, 3, qq{$name - The object "$file" doesn't exist or can't be dissolved, ignore it for upload});
} next;
}
readingsSingleUpdate($hash, "state", "Wait for filling upload queue", 1); readingsSingleUpdate($hash, "state", "Wait for filling upload queue", 1);
$paref->{allref} = \@all; $paref->{allref} = \@afiles;
$paref->{remDir} = $remDir; $paref->{remDir} = $remDir;
$paref->{ow} = $ow; $paref->{ow} = $ow;
$paref->{cdir} = $cdir; $paref->{cdir} = $cdir;
@ -1975,7 +1977,7 @@ sub _parseUpload {
if($skip eq "false") { if($skip eq "false") {
$data{$type}{$name}{uploaded}{"$lclobj"} = { remobj => $remobj, 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 "$lclobj" uploaded}); Log3 ($name, 4, qq{$name - Object "$lclobj" uploaded});
$trtxt = qq{Upload: local File "$lclobj" to remote File "$remobj"}; $trtxt = qq{Uploaded: local File "$lclobj" to remote File "$remobj"};
} }
else { else {
Log3 ($name, 3, qq{$name - Object "$remobj" already exists -> upload skipped}); Log3 ($name, 3, qq{$name - Object "$remobj" already exists -> upload skipped});
@ -2680,6 +2682,7 @@ return $out;
"Download", "Download",
"Upload", "Upload",
"Backup", "Backup",
"Restore",
"Filestransfer", "Filestransfer",
"File Station" "File Station"
], ],
@ -2710,7 +2713,8 @@ return $out;
"FHEM::SynoModules::SMUtils": 0, "FHEM::SynoModules::SMUtils": 0,
"FHEM::SynoModules::ErrCodes": 0, "FHEM::SynoModules::ErrCodes": 0,
"GPUtils": 0, "GPUtils": 0,
"File::Find": 0 "File::Find": 0,
"File::Glob": 0
}, },
"recommends": { "recommends": {
"FHEM::Meta": 0 "FHEM::Meta": 0