- Adapt plugins to documentation

diff --git a/videosite.pl b/videosite.pl
index 7c8253e..4eada13 100644 (file)
--- a/videosite.pl
+++ b/videosite.pl
@@ -81,7 +81,7 @@ sub check_for_link {
     # Offer the message to all Grabbers in turn
     foreach $g (@grabbers) {
         if (defined($m = $g->get($message))) {
-            write_irssi($witem, '%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'TYPE'}, $m->{'TITLE'});
+            write_irssi($witem, '%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
             unless($getter->get($m)) {
                 write_irssi($witem, '%%R>>> FAILED');
             }

diff --git a/videosite/CollegeHumorGrabber.pm b/videosite/CollegeHumorGrabber.pm
index 9fdb87e..c325ed3 100644 (file)
--- a/videosite/CollegeHumorGrabber.pm
+++ b/videosite/CollegeHumorGrabber.pm
@@ -36,7 +36,8 @@ sub _parse {
 
     $metadata->{'URL'} = $url;
     $metadata->{'ID'} = $2;
-    $metadata->{'TYPE'} = 'collegehumor';
+    $metadata->{'TYPE'} = 'video';
+    $metadata->{'SOURCE'} = 'collegehumor';
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 

diff --git a/videosite/FileGetter.pm b/videosite/FileGetter.pm
index a01c285..e26d07d 100644 (file)
--- a/videosite/FileGetter.pm
+++ b/videosite/FileGetter.pm
@@ -1,3 +1,6 @@
+#
+# A getter which will download the media to a local file storage
+#
 package FileGetter;
 
 use GetterBase;
@@ -27,7 +30,7 @@ sub get {
     my $dirname;
 
     $dlfile = sprintf($self->_getval('FILEPATTERN'),
-        $self->_encode($video->{'TYPE'}),
+        $self->_encode($video->{'SOURCE'}),
         $self->_encode($video->{'ID'}),
         $self->_encode($video->{'TITLE'}),
         $self->_encode($video->{'DLURL'}),

diff --git a/videosite/HTTPRPCGetter.pm b/videosite/HTTPRPCGetter.pm
index 007fd6c..c584392 100644 (file)
--- a/videosite/HTTPRPCGetter.pm
+++ b/videosite/HTTPRPCGetter.pm
@@ -1,3 +1,7 @@
+#
+# A getter which calls a remote URL in order to trigger a 
+# download.
+#
 package HTTPRPCGetter;
 
 use GetterBase;
@@ -25,7 +29,7 @@ sub get {
     my $callurl;
 
     $callurl = sprintf($self->_getval('URL'),
-        $self->_encode($video->{'TYPE'}),
+        $self->_encode($video->{'SOURCE'}),
         $self->_encode($video->{'ID'}),
         $self->_encode($video->{'TITLE'}),
         $self->_encode($video->{'DLURL'}),

diff --git a/videosite/NullGetter.pm b/videosite/NullGetter.pm
index ad97294..d3ac3d9 100644 (file)
--- a/videosite/NullGetter.pm
+++ b/videosite/NullGetter.pm
@@ -1,3 +1,6 @@
+#
+# A getter which dows not do anything useful.
+#
 package NullGetter;
 
 use GetterBase;

diff --git a/videosite/SevenloadGrabber.pm b/videosite/SevenloadGrabber.pm
index 83ba8f6..1ad6c23 100644 (file)
--- a/videosite/SevenloadGrabber.pm
+++ b/videosite/SevenloadGrabber.pm
@@ -36,7 +36,8 @@ sub _parse {
 
     $metadata->{'URL'} = $url;
     $metadata->{'ID'} = $2;
-    $metadata->{'TYPE'} = 'sevenload';
+    $metadata->{'TYPE'} = 'video';
+    $metadata->{'SOURCE'} = 'sevenload';
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 

diff --git a/videosite/YouTubeGrabber.pm b/videosite/YouTubeGrabber.pm
index dd1b2af..71eb0a2 100644 (file)
--- a/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@ -43,7 +43,8 @@ sub _parse {
 
     $metadata->{'URL'} = $url;
     $metadata->{'ID'} = $2;
-    $metadata->{'TYPE'} = 'youtube';
+    $metadata->{'TYPE'} = 'video';
+    $metadata->{'SOURCE'} = 'youtube';
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;