documentation fixes, switch to LWP

eansearch · Feb 14, 2024 · 5aa8167 · 5aa8167
1 parent e216f70
commit 5aa8167
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Net::EANSearch.
 
+1.02  Wed Feb 14 14:06:00 2024
+	- switch internally to LWP for broader plattform support
+	- documentation fixes
+
 1.01  Wed Feb 14 00:15:58 2024
 	- declare dependecies
 

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ use Net::EANSearch;
 
 my $API_TOKEN = $ENV{EAN_SEARCH_API_TOKEN};
 
-my $eansearch = EANSearch->new($API_TOKEN);
+my $eansearch = Net::EANSearch->new($API_TOKEN);
 
 my $ean = '5099750442227';
 my $isbn = '1119578884';
@@ -66,15 +66,15 @@ if (!defined($book)) {
 }
 
 my @product_list;
-@product_list = $eansearch->barcodePrefixSearch('885909', $EANSearch::ENGLISH);
+@product_list = $eansearch->barcodePrefixSearch('885909', $Net::EANSearch::ENGLISH);
 foreach my $p (@product_list) {
 	print "EAN $p->{ean} is $p->{name}\n";
 }
 
 my $page = 0;
 do {
 	$page++;
-	@product_list = $eansearch->productSearch('Bananaboat', $EANSearch::ALL_LANGUAGES, $page);
+	@product_list = $eansearch->productSearch('Bananaboat', $Net::EANSearch::ALL_LANGUAGES, $page);
 
 	foreach my $p (@product_list) {
 		print "EAN $p->{ean} is $p->{name}\n";

diff --git a/lib/Net/EANSearch.pm b/lib/Net/EANSearch.pm
@@ -4,7 +4,7 @@ use 5.030000;
 use strict;
 use warnings;
 
-use WWW::Curl::Easy;
+use LWP;
 use JSON;
 use URL::Encode;
 use MIME::Base64 qw(decode_base64);
@@ -30,7 +30,7 @@ our @EXPORT = qw(
 	
 );
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 our $ALL_LANGUAGES = 99;
 our $ENGLISH = 1;
@@ -53,19 +53,16 @@ our $ROMAINAN = 19;
 our $BULGARIAN = 20;
 our $GREEK = 21;
 
-my $BASE_URI = 'https://api.ean-search.org/api?token=';
+my $BASE_URI = 'https://api.ean-search.org/api?format=json&token=';
 
 sub new {
 	my $class = shift;
 	my $token = shift;
 
-	my $curl = WWW::Curl::Easy->new;
-	my @myheaders = ('Accept: application/json');
-	$curl->setopt(CURLOPT_HTTPHEADER, \@myheaders);
-	$curl->setopt(CURLOPT_ACCEPT_ENCODING, 'gzip, deflate');
-	$curl->setopt(CURLOPT_SSL_VERIFYPEER, 0); # TODO set better cert store instead ?
+	my $ua = LWP::UserAgent->new();
+	$ua->timeout(10);
 
-	my $self = bless { base_uri => $BASE_URI . $token, curl => $curl }, $class;
+	my $self = bless { base_uri => $BASE_URI . $token, ua => $ua }, $class;
 
     return $self;
 }
@@ -159,15 +156,12 @@ sub _apiCall {
 	my $self = shift;
 	my $url = shift;
 
-	$self->{curl}->setopt(CURLOPT_URL, $url);
-	my $result;
-	$self->{curl}->setopt(CURLOPT_WRITEDATA, \$result);
-	my $retcode = $self->{curl}->perform;
-	if (!defined($result) || $retcode != 0) {
-		print STDERR 'Network error: ' . $self->{curl}->strerror($retcode) . "\n";
+	my $doc = $self->{ua}->request(HTTP::Request->new(GET => $url));
+	if (!defined($doc) || $doc->is_error()) {
+		print STDERR 'Network error: ' . (defined($doc) ? $doc->code : 'unknown') . "\n";
 		return undef;
 	} else {
-		return $result;
+		return $doc->content;
 	}
 }