git://git.camperquake.de
/
videosite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace use of LWP::Simple in all grabbers by $self->simple_get()
[videosite.git]
/
videosite
/
CollegeHumorGrabber.pm
diff --git
a/videosite/CollegeHumorGrabber.pm
b/videosite/CollegeHumorGrabber.pm
index
2d9b37f
..
48ccc7b
100644
(file)
--- a/
videosite/CollegeHumorGrabber.pm
+++ b/
videosite/CollegeHumorGrabber.pm
@@
-3,12
+3,12
@@
# (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
# licensed under GNU GPL v2
# (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
# licensed under GNU GPL v2
-package CollegeHumorGrabber;
+package
videosite::
CollegeHumorGrabber;
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use
videosite::
GrabberBase;
+@ISA = qw(
videosite::
GrabberBase);
-use
LWP::Simple qw(!get)
;
+use
videosite::HTMLHelper
;
use XML::Simple;
use Data::Dumper;
use XML::Simple;
use Data::Dumper;
@@
-19,7
+19,8
@@
sub new {
my $self = $class->SUPER::new();
$self->{'NAME'} = 'collegehumor';
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();
bless($self, $class);
$self->_prepare_parameters();
@@
-34,6
+35,7
@@
sub _parse {
my $content;
my $metadata = {};
my $p = XML::Simple->new();
my $content;
my $metadata = {};
my $p = XML::Simple->new();
+ my @accum;
my $t;
$url =~ m|$pattern|;
my $t;
$url =~ m|$pattern|;
@@
-42,12
+44,12
@@
sub _parse {
$metadata->{'URL'} = $url;
$metadata->{'ID'} = $2;
$metadata->{'TYPE'} = 'video';
$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
$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 =
$self->simple_get(sprintf('http://www.collegehumor.com/moogaloop/video/
%s', $2)))) {
$self->error('Could not download XML metadata');
return undef;
}
$self->error('Could not download XML metadata');
return undef;
}