Base: Add simple_get() function

[videosite.git] / videosite / CollegeHumorGrabber.pm

diff --git a/videosite/CollegeHumorGrabber.pm b/videosite/CollegeHumorGrabber.pm
index c325ed3..fb03286 100644 (file)
--- a/videosite/CollegeHumorGrabber.pm
+++ b/videosite/CollegeHumorGrabber.pm
@@ -1,8 +1,14 @@
-package CollegeHumorGrabber;
+# Grabber for collegehumor.com
+#
+# (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
+# licensed under GNU GPL v2
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+package videosite::CollegeHumorGrabber;
 
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
+
+use videosite::HTMLHelper;
 use LWP::Simple qw(!get);
 use XML::Simple;
 use Data::Dumper;
@@ -14,7 +20,8 @@ sub new {
     my $self = $class->SUPER::new();
 
     $self->{'NAME'} = 'collegehumor';
-    $self->{'PATTERNS'} = ['(http://www.collegehumor.com/video:(\d+))'];
+    $self->{'PATTERNS'} = ['(http://www.collegehumor.com/video:(\d+))',
+                           '(http://www.collegehumor.com/video/(\d+))'];
 
     bless($self, $class);
     $self->_prepare_parameters();
@@ -29,6 +36,7 @@ sub _parse {
     my $content;
     my $metadata = {};
     my $p = XML::Simple->new();
+    my @accum;
     my $t;
 
     $url =~ m|$pattern|;
@@ -37,12 +45,12 @@ sub _parse {
     $metadata->{'URL'} = $url;
     $metadata->{'ID'} = $2;
     $metadata->{'TYPE'} = 'video';
-    $metadata->{'SOURCE'} = 'collegehumor';
+    $metadata->{'SOURCE'} = $self->{'NAME'};
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 
     # Get the XML file containing the video metadata
-    unless(defined($content = LWP::Simple::get(sprintf('http://www.collegehumor.com/moogaloop/video:%s', $2)))) {
+    unless(defined($content = LWP::Simple::get(sprintf('http://www.collegehumor.com/moogaloop/video/%s', $2)))) {
         $self->error('Could not download XML metadata');
         return undef;
     }