FHEM/mod-backupToStorage
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

change code style

Browse Source 
add new functions to handling password and password container
add rename function
This commit is contained in:
Marko Oldenburg 2020-06-17 10:52:59 +02:00
parent f0de2c5605
commit 5b3ee18585
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/FHEM/backupToStorage.pm
View File

@ -53,6 +53,9 @@ BEGIN {
readingsEndUpdate
defs
modules
setKeyValue
getKeyValue
getUniqueId
Log3
CommandAttr
attr
@ -80,6 +83,12 @@ sub Define {
$hash->{VERSION} = version->parse($VERSION)->normal;
$hash->{NOTIFYDEV} = 'global';
readingsSingleUpdate( $hash, 'state',
'please set storage account credentials first', 1 )
if ( AttrVal( $name, 'bTS_Host', 'none' ) eq 'none'
|| AttrVal( $name, 'bTS_User', 'none' ) eq 'none'
|| !defined( ReadPassword( $hash, $name ) ) );
Log3( $name, 3, "backupToStorage ($name) - defined" );
return;
@ -113,22 +122,12 @@ sub Notify {
. Dumper $events); # mit Dumper
PushToStorage($hash)
if (
(
grep /^backup.done/,
@{$events}
and $devname eq 'global'
&& $init_done)
)
and defined( $hash->{UID} )
);
if ( grep /^backup.done/,
@{$events} && $devname eq 'global' && $init_done );
return
return;
}
sub Set {
my $hash = shift // return;
my $aArg = shift // return;
@ -138,6 +137,8 @@ sub Set {
// return qq{"set $name" needs at least one argument};
if ( lc $cmd eq 'addpassword' ) {
return "please set Attribut bTS_User first"
if ( AttrVal( $name, 'bTS_User', 'none' ) eq 'none' );
return "usage: $cmd <password>" if ( scalar( @{$aArg} ) != 1 );
StorePassword( $hash, $name, $aArg->[0] );
@ -148,21 +149,17 @@ sub Set {
DeletePassword($hash);
}
else {
return 'Unknown argument '
. $cmd
. ', choose one of addpassword,deletepassword';
return 'Unknown argument ' . $cmd
. ', choose one of addpassword,deletepassword';
}
return;
}
sub PushToStorage {
my $hash = shift;
my $name = $hash->{NAME};
my $hash = shift;
my $name = $hash->{NAME};
return;
}
@ -210,14 +207,12 @@ sub ReadPassword {
if ( defined($err) ) {
Log3 $name, 3,
"backupToStorage ($name) - unable to read password from file: $err";
"backupToStorage ($name) - unable to read password from file: $err";
return undef;
}
if ( defined($password) ) {
if ( eval "use Digest::MD5;1" ) {
$key = Digest::MD5::md5_hex( unpack "H*", $key );
$key .= Digest::MD5::md5_hex($key);
}
@ -232,10 +227,8 @@ sub ReadPassword {
}
return $dec_pwd;
}
else {
Log3 $name, 3, "backupToStorage ($name) - No password in file";
return undef;
}