FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

configDB - added binfileimport to import non-text-files into database

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5680 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2014-04-27 17:42:08 +00:00
parent 795b9707bd
commit d0ec321243
2 changed files with 98 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/98_configdb.pm
View File

@ -223,6 +223,25 @@ sub CommandConfigdb($$) {
}
}
when ('binfileimport') {
return "\n Syntax: configdb fileimport <pathToFile>" if @a != 2;
my $filename;
if($param1 =~ m,^[./],) {
$filename = $param1;
} else {
$filename = $attr{global}{modpath};
$filename .= "/$param1";
}
if ( -r $filename ) {
my $filesize = -s $filename;
$ret = _cfgDB_binFileimport($filename,$filesize);
} elsif ( -e $filename) {
$ret = "\n Read error on file $filename";
} else {
$ret = "\n File $filename not found.";
}
}
when ('filelist') {
return _cfgDB_Filelist;
}

74
fhem/configDB.pm
View File

@ -174,6 +174,9 @@ if($cfgDB_dbconn =~ m/pg:/i) {
# create TABLE fhemfilesave if nonexistent
$fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemfilesave(filename TEXT, line TEXT)");
# create TABLE fhembinfilesave if nonexistent
$fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhembinfilesave(filename TEXT, content BLOB)");
# close database connection
$fhem_dbh->commit();
$fhem_dbh->disconnect();
@ -726,10 +729,28 @@ sub _cfgDB_Diff($$) {
# functions used for file handling
#
# delete file from database
sub _cfgDB_Filedelete($) {
sub _cfgDB_Filefind($) {
my ($filename) = @_;
my $fhem_dbh = _cfgDB_Connect;
my $ret = $fhem_dbh->do("delete from fhemfilesave where filename = '$filename'");
my @dbtable = ('fhemfilesave','fhembinfilesave');
my $retfile;
foreach (@dbtable) {
$retfile = $_;
my $ret = $fhem_dbh->selectrow_array("SELECT COUNT(*) from $retfile where filename = '$filename'");
last if $ret;
$retfile = undef;
}
$fhem_dbh->disconnect();
return $retfile;
}
sub _cfgDB_Filedelete($) {
my ($filename) = @_;
my $dbtable = _cfgDB_Filefind($filename);
return "File $filename not found in database." if(!$dbtable);
my $fhem_dbh = _cfgDB_Connect;
my $ret = $fhem_dbh->do("delete from $dbtable where filename = '$filename'");
$fhem_dbh->commit();
$fhem_dbh->disconnect();
if($ret > 0) {
@ -743,19 +764,38 @@ sub _cfgDB_Filedelete($) {
# export file from database to filesystem
sub _cfgDB_Fileexport($) {
my ($filename) = @_;
my $dbtable = _cfgDB_Filefind($filename);
return "File $filename not found in database." if(!$dbtable);
my $counter = 0;
my $binfile = ($dbtable eq 'fhembinfilesave') ? 1 : 0;
my $sunit = ($binfile) ? 'bytes' : 'lines';
my $fhem_dbh = _cfgDB_Connect;
my $sth = $fhem_dbh->prepare( "SELECT * FROM fhemfilesave WHERE filename = '$filename'" );
my $sth = $fhem_dbh->prepare( "SELECT * FROM $dbtable WHERE filename = '$filename'" );
$sth->execute();
if($binfile) { # write binfile
my $blobContent = $sth->fetchrow_array();
$counter = length($blobContent);
open( FILE,">$filename" );
binmode(FILE);
print FILE $blobContent;
close( FILE );
} else { # write textfile
open( FILE, ">$filename" );
while (my @line = $sth->fetchrow_array()) {
$counter++;
print FILE $line[1], "\n";
}
close ( FILE );
}
$sth->finish();
$fhem_dbh->disconnect();
return "$counter lines written from database into file $filename";
return "$counter $sunit written from database into file $filename";
}
# import file from filesystem into database
@ -780,6 +820,27 @@ sub _cfgDB_Fileimport($;$) {
return "$counter lines written from file $filename to database";
}
sub _cfgDB_binFileimport($;$) {
my ($filename,$filesize,$doDelete) = @_;
$doDelete = (defined($doDelete)) ? 1 : 0;
open (in,"<$filename") || die $!;
my $blobContent;
binmode(in);
my $readBytes = read(in, $blobContent, $filesize);
close(in);
my $fhem_dbh = _cfgDB_Connect;
$fhem_dbh->do("delete from fhembinfilesave where filename = '$filename'");
my $sth = $fhem_dbh->prepare('INSERT INTO fhembinfilesave values (?, ?)');
$sth->execute($filename, $blobContent);
$sth->finish();
$fhem_dbh->commit();
$fhem_dbh->disconnect();
unlink($filename) if(($attr{configdb}{deleteimported} || $doDelete) && $readBytes);
return "$readBytes bytes written from file $filename to database";
}
# show a list containing all file(names) in database
sub _cfgDB_Filelist(;$) {
my ($notitle) = @_;
@ -787,12 +848,15 @@ sub _cfgDB_Filelist(;$) {
"------------------------------------------------------------\n";
$ret = "" if $notitle;
my $fhem_dbh = _cfgDB_Connect;
my $sth = $fhem_dbh->prepare( "SELECT filename FROM fhemfilesave group by filename order by filename" );
my @dbtable = ('fhemfilesave','fhembinfilesave');
foreach (@dbtable) {
my $sth = $fhem_dbh->prepare( "SELECT filename FROM $_ group by filename order by filename" );
$sth->execute();
while (my $line = $sth->fetchrow_array()) {
$ret .= "$line\n";
}
$sth->finish();
}
$fhem_dbh->disconnect();
return $ret;
}