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
- Study message before throwing it to the grabbers
[videosite.git]
/
videosite
/
DailyMotionGrabber.pm
diff --git
a/videosite/DailyMotionGrabber.pm
b/videosite/DailyMotionGrabber.pm
index
286c876
..
5e4f10e
100644
(file)
--- a/
videosite/DailyMotionGrabber.pm
+++ b/
videosite/DailyMotionGrabber.pm
@@
-1,3
+1,8
@@
+# Grabber for dailymotion.com
+#
+# (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
+# licensed under GNU GPL v2
+
package DailyMotionGrabber;
use GrabberBase;
package DailyMotionGrabber;
use GrabberBase;
@@
-14,10
+19,12
@@
sub new {
my $self = $class->SUPER::new();
$self->{'NAME'} = 'dailymotion';
my $self = $class->SUPER::new();
$self->{'NAME'} = 'dailymotion';
- $self->{'PATTERNS'} = ['(http://(?:[-a-zA-Z0-9_.]+\.)*
.
dailymotion.com/(?:[^/]+/)*video/([-a-zA-Z0-9_]+))'];
+ $self->{'PATTERNS'} = ['(http://(?:[-a-zA-Z0-9_.]+\.)*dailymotion.com/(?:[^/]+/)*video/([-a-zA-Z0-9_]+))'];
bless($self, $class);
bless($self, $class);
+ $self->_prepare_parameters();
+
return $self;
}
return $self;
}
@@
-38,7
+45,7
@@
sub _parse {
$metadata->{'URL'} = $url;
$metadata->{'ID'} = $2;
$metadata->{'TYPE'} = 'video';
$metadata->{'URL'} = $url;
$metadata->{'ID'} = $2;
$metadata->{'TYPE'} = 'video';
- $metadata->{'SOURCE'} =
'dailymotion'
;
+ $metadata->{'SOURCE'} =
$self->{'NAME'}
;
$metadata->{'TITLE'} = undef;
$metadata->{'DLURL'} = undef;
$metadata->{'TITLE'} = undef;
$metadata->{'DLURL'} = undef;
@@
-58,14
+65,19
@@
sub _parse {
if ('meta' eq $e->[0]) {
if ('title' eq $e->[1]->{'name'}) {
$metadata->{'TITLE'} = $e->[1]->{'content'};
if ('meta' eq $e->[0]) {
if ('title' eq $e->[1]->{'name'}) {
$metadata->{'TITLE'} = $e->[1]->{'content'};
+ $metadata->{'TITLE'} =~ s/^Dailymotion\s*:\s*//;
}
}
}
# Look for the download URL
foreach $e (@text) {
}
}
}
# Look for the download URL
foreach $e (@text) {
- if ($e->[0] =~ m|\.add
_variable("url", "([^\"]+)")
|) {
+ if ($e->[0] =~ m|\.add
Variable\("video", "([^\"]+)"
|) {
$metadata->{'DLURL'} = $1;
$metadata->{'DLURL'} = $1;
+ $metadata->{'DLURL'} =~ s/%(..)/chr(hex($1))/ge;
+ $metadata->{'DLURL'} =~ s/\@\@spark.*//g;
+ $metadata->{'DLURL'} = 'http://www.dailymotion.com' . $metadata->{'DLURL'};
+
}
}
}
}