fix binary detection

[Biblio-RFID.git] / lib / RFID / Biblio / librfid.pm

diff --git a/lib/RFID/Biblio/librfid.pm b/lib/RFID/Biblio/librfid.pm
index 2dbe62c..a7e8f00 100644 (file)
--- a/lib/RFID/Biblio/librfid.pm
+++ b/lib/RFID/Biblio/librfid.pm
@@ -6,6 +6,8 @@ use strict;
 use base 'RFID::Biblio';
 use RFID::Biblio;
 
+use Data::Dump qw(dump);
+
 =head1 NAME
 
 RFID::Biblio::librfid - execute librfid-tool
@@ -16,31 +18,78 @@ This is wrapper around C<librfid-tool> from
 
 L<http://openmrtd.org/projects/librfid/>
 
+Due to limitation of C<librfid-tool> only C<inventory> and
+C<read_blocks> is supported.
+
+However, this code might provide template for integration
+with any command-line utilities for different RFID readers.
+
 =cut
 
 sub serial_settings {} # don't open serial
 
-our $tool = '/rest/cvs/librfid/utils/librfid-tool';
+our $bin = '/rest/cvs/librfid/utils/librfid-tool';
 
 sub init {
-       warn "# no $tool found\n" if ! -e $tool;
+       my $self = shift;
+       if ( -e $bin ) {
+               warn "# using $bin";
+               return 1;
+       } else {
+               warn "# no $bin found\n";
+               return 0;
+       }
 }
 
-sub inventory {
-
-       my @tags; 
+sub _grep_tool {
+       my ( $param, $coderef ) = @_;
 
-       open(my $s, '-|', "$tool --scan") || die $!;
+       warn "# _grep_tool $bin $param\n";
+       open(my $s, '-|', "$bin $param") || die $!;
        while(<$s>) {
                chomp;
                warn "## $_\n";
+
+               my $sid;
                if ( m/success.+:\s+(.+)/ ) {
-                       push @tags, $1;
+                       $sid = $1;
+                       $sid =~ s/\s*'\s*//g;
+                       $sid = uc join('', reverse split(/\s+/, $sid));
                }
+
+               $coderef->( $sid );
        }
 
+
+}
+
+sub inventory {
+
+       my @tags; 
+       _grep_tool '--scan' => sub {
+               my $sid = shift;
+               push @tags, $sid if $sid;
+       };
+       warn "# invetory ",dump(@tags);
        return @tags;
 }
 
+sub read_blocks {
+
+       my $sid;
+       my $blocks;
+       _grep_tool '--read -1' => sub {
+               $sid ||= shift;
+               $blocks->{$sid}->[$1] = hex2bytes($2)
+               if m/block\[\s*(\d+):.+data.+:\s*(.+)/;
+
+       };
+       warn "# read_blocks ",dump($blocks);
+       return $blocks;
+}
+
+sub write_blocks {}
+sub read_afi {}
+sub write_afi {}
 
 1