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

configDB.pm: add dbsize info for SQLITE to configdb info

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13382 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2017-02-10 20:48:14 +00:00
parent 8f216268ac
commit 59f9d421b1
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fhem/configDB.pm
View File

@ -220,6 +220,7 @@ my $cfgDB_dbconn = $dbconfig{connection};
my $cfgDB_dbuser = $dbconfig{user}; my $cfgDB_dbuser = $dbconfig{user};
my $cfgDB_dbpass = $dbconfig{password}; my $cfgDB_dbpass = $dbconfig{password};
my $cfgDB_dbtype; my $cfgDB_dbtype;
my $cfgDB_filename;
%dbconfig = (); %dbconfig = ();
@config = (); @config = ();
@ -232,6 +233,7 @@ if($cfgDB_dbconn =~ m/pg:/i) {
$cfgDB_dbtype = "MYSQL"; $cfgDB_dbtype = "MYSQL";
} elsif ($cfgDB_dbconn =~ m/sqlite:/i) { } elsif ($cfgDB_dbconn =~ m/sqlite:/i) {
$cfgDB_dbtype = "SQLITE"; $cfgDB_dbtype = "SQLITE";
(undef,$cfgDB_filename) = split(/=/,$cfgDB_dbconn);
} else { } else {
$cfgDB_dbtype = "unknown"; $cfgDB_dbtype = "unknown";
} }
@ -759,6 +761,31 @@ sub _cfgDB_Uuid() {
return createUniqueId(); return createUniqueId();
} }
sub _cfgDB_filesize_str($) {
my ($size) = @_;
if ($size > 1099511627776) # TiB: 1024 GiB
{
return sprintf("%.2f TB", $size / 1099511627776);
}
elsif ($size > 1073741824) # GiB: 1024 MiB
{
return sprintf("%.2f GB", $size / 1073741824);
}
elsif ($size > 1048576) # MiB: 1024 KiB
{
return sprintf("%.2f MB", $size / 1048576);
}
elsif ($size > 1024) # KiB: 1024 B
{
return sprintf("%.2f KB", $size / 1024);
}
else # bytes
{
return "$size byte" . ($size == 1 ? "" : "s");
}
}
################################################## ##################################################
# Additional backend functions # Additional backend functions
# not called from fhem.pl directly # not called from fhem.pl directly
@ -803,8 +830,12 @@ sub _cfgDB_Info() {
push @r, " dbtype: $cfgDB_dbtype"; push @r, " dbtype: $cfgDB_dbtype";
push @r, " Unknown dbmodel type in configuration file." if $cfgDB_dbtype eq 'unknown'; push @r, " Unknown dbmodel type in configuration file." if $cfgDB_dbtype eq 'unknown';
push @r, " Only Mysql, Postgresql, SQLite are fully supported." if $cfgDB_dbtype eq 'unknown'; push @r, " Only Mysql, Postgresql, SQLite are fully supported." if $cfgDB_dbtype eq 'unknown';
if ($cfgDB_dbtype eq "SQLITE") {
my $size = -s $cfgDB_filename;
$size = _cfgDB_filesize_str($size);
push @r, " dbsize: $size";
}
push @r, $l; push @r, $l;
my $fhem_dbh = _cfgDB_Connect; my $fhem_dbh = _cfgDB_Connect;
my ($sql, $sth, @line, $row); my ($sql, $sth, @line, $row);
@ -913,6 +944,7 @@ sub _cfgDB_Reorg(;$$) {
$fhem_dbh->do("delete from fhemversions where version = -1"); $fhem_dbh->do("delete from fhemversions where version = -1");
$fhem_dbh->commit(); $fhem_dbh->commit();
$fhem_dbh->disconnect(); $fhem_dbh->disconnect();
eval qx(sqlite3 $cfgDB_filename vacuum) if($cfgDB_dbtype eq "SQLITE");
return if(defined($quiet)); return if(defined($quiet));
return " Result after database reorg:\n"._cfgDB_Info; return " Result after database reorg:\n"._cfgDB_Info;
} }