Fix URL by specifying https, add required dep.

Add extra error-handling code, without which this was totally
non-obvious :/

3 files changed, 16 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 538adaadd8bf..0e5f023924f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fortune-mod-farscape
 	pkgdesc = Fortune cookies: Farscape (TV series), scraped from https://en.wikiquote.org/wiki/Farscape
-	pkgver = r2128592
+	pkgver = r2221412
 	pkgrel = 1
 	url = http://github.com/dwoffinden/fortune-mod-farscape
 	arch = any
@@ -9,9 +9,10 @@ pkgbase = fortune-mod-farscape
 	makedepends = perl
 	makedepends = perl-mediawiki-api
 	makedepends = perl-libwww
+	makedepends = perl-lwp-protocol-https
 	depends = fortune-mod
 	source = wiki.pl
-	md5sums = c298998fe5c54870fbc12ce315ef311f
+	md5sums = 3ad9f6b85b5441f271d31a2f4985c519
 
 pkgname = fortune-mod-farscape
 
diff --git a/PKGBUILD b/PKGBUILD
index 5b662644792a..3c7b74425197 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: d.woffinden
 pkgname=fortune-mod-farscape
-pkgver=r2128592
+pkgver=r2221412
 pkgrel=1
 pkgdesc='Fortune cookies: Farscape (TV series), scraped from https://en.wikiquote.org/wiki/Farscape'
 arch=('any')
 url='http://github.com/dwoffinden/fortune-mod-farscape'
 license=('CCPL:by-sa3.0')
-makedepends=('perl' 'perl-mediawiki-api' 'perl-libwww')
+makedepends=('perl' 'perl-mediawiki-api' 'perl-libwww' 'perl-lwp-protocol-https')
 depends=('fortune-mod')
 groups=('fortune-mods')
 source=('wiki.pl')
-md5sums=('c298998fe5c54870fbc12ce315ef311f')
+md5sums=('3ad9f6b85b5441f271d31a2f4985c519')
 
 pkgver() {
   cd "$srcdir"
diff --git a/wiki.pl b/wiki.pl
index afc9b2b4efc6..07cd74b9180e 100644
--- a/wiki.pl
+++ b/wiki.pl
@@ -8,7 +8,15 @@ use MediaWiki::API;
 
 binmode STDOUT, ":utf8";
 
-my $mw = MediaWiki::API->new({ api_url => 'http://en.wikiquote.org/w/api.php' });
+my $mw = MediaWiki::API->new({ api_url => 'https://en.wikiquote.org/w/api.php' });
+
+$mw->{config}->{on_error} = \&on_error;
+
+sub on_error {
+  print "Error code: $mw->{error}->{code}\n";
+  print "$mw->{error}->{stacktrace}\n";
+  die;
+}
 
 # TODO fetch a specific, stable revision
 # TODO add series numbers + episode names to the end?
@@ -17,7 +25,7 @@ my $mw = MediaWiki::API->new({ api_url => 'http://en.wikiquote.org/w/api.php' })
 my $page = $mw->get_page( { title => 'Farscape' } );
 
 if ($#ARGV == 0 && $ARGV[0] eq "revision") {
-  print $page->{ 'revid' };
+  print "$page->{revid}";
   exit;
 }