Modify videosite-test.pl to use libvideosite

diff --git a/videosite-test.pl b/videosite-test.pl
index 34b6f52..bfea2f2 100755 (executable)
--- a/videosite-test.pl
+++ b/videosite-test.pl
@@ -4,103 +4,35 @@ use strict;
 use Getopt::Long;
 use File::Spec;
 use File::Basename;
+use Module::Load;
 use Cwd qw(realpath);
 
-sub ploader {
-
-    my $dir = shift;
-    my $pattern = shift;
-    my $type = shift;
-    my @list;
-    my $p;
-    my $g;
-    my @g = ();
-
-    unshift(@INC, $dir);
-
-    opendir(D, $dir) || return ();
-    @list = grep {/$pattern/ && -f File::Spec->catfile($dir, $_) } readdir(D);
-    closedir(D);
-
-    foreach $p (@list) {
-        $p =~ s/\.pm$//;
-        eval qq{ require videosite::$p; };
-        if ($@) {
-            print("Failed to load plugin: $@");
-            next;
-        }
-
-        $g = eval qq{ videosite::$p->new();};
-        if ($@) {
-            print("Failed to instanciate: $@");
-            delete($INC{$p});
-            next;
-        }
-
-        if ($type eq $g->{'TYPE'}) {
-            push(@g, $g);
-        } else {
-            printf('%s has wrong type (got %s, expected %s)', $p, $g->{'TYPE'}, $type);
-            delete($INC{$p});
-        }
-    }
-
-    return @g;
-}
-
-sub connectors {
-    my $c = {name => 'environment', schemas => {}};
-
-    if (exists($ENV{'http_proxy'})) {
-        $c->{schemas}->{'http'} = $ENV{'http_proxy'}
-    }
-
-    if (exists($ENV{'https_proxy'})) {
-        $c->{schemas}->{'https'} = $ENV{'https_proxy'}
-    }
-
-    return ( $c );
-}
-
-
-my $hq = 0;
-my $ext = '.flv';
-my $y;
-my $f;
-my $m;
-my @g;
-my $bp;
 my $debug = 0;
-my ($success, $notest, $fail) = (0,0,0);
-
-GetOptions("d" => \$debug);
-
-# This is some dark magic to find out our real base directory,
-# where we hope to find our plugins.
-$bp = File::Spec->catdir(dirname(realpath($0)), 'videosite');
-unshift(@INC, dirname(realpath($0)));
-
-@g = ploader($bp, '.*Grabber\.pm$', 'grabber');
-($f) = ploader($bp, '^FileGetter\.pm$', 'getter');
-
-unless(@g and defined($f)) {
-    print("No plugins could be loaded\n");
-    exit 1;
+my %config = (
+    mode => 'download',
+    getter => 'filegetter',
+);
+my $success = 0;
+my $fail = 0;
+my $notest = 0;
+
+push(@INC, dirname(realpath($0)));
+load 'libvideosite';
+
+unless(libvideosite::register_api({
+    _debug => sub { return $debug },
+})) {
+    die("Error registering API: $libvideosite::error");
 }
 
-foreach (@g, $f) {
-    $_->setio(sub { printf(@_); print("\n"); } );
-
-    if ($debug) {
-        $_->setdebug(1);
-        $_->setconn(\&connectors);
-    }
+unless(libvideosite::init()) {
+    die("Could not init libvideosite: $libvideosite::error");
 }
 
 select(STDOUT);
 $| = 1;
 printf("Doing self tests:\n");
-foreach(@g) {
+foreach (libvideosite::_grabbers()) {
     my $r;
 
     printf("  %s...", $_->{'NAME'});