X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FGoogleGrabber.pm;h=51d0e2e1f9180705b2d679eee69aa8a5129849bd;hb=9257f7504905acaae56297cf7f1a479853e68fe7;hp=7d9cad66751b9da984b6672d78c5ec98aab85de4;hpb=a9bb044fe82d7093b94eca821ef1e72ac9e57607;p=videosite.git

diff --git a/videosite/GoogleGrabber.pm b/videosite/GoogleGrabber.pm
index 7d9cad6..51d0e2e 100644
--- a/videosite/GoogleGrabber.pm
+++ b/videosite/GoogleGrabber.pm
@@ -3,12 +3,11 @@
 #
 # Grabber for video.google.com
 
-package GoogleGrabber;
+package videosite::GoogleGrabber;
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
 
-use LWP::Simple qw(!get);
 use HTML::TokeParser;
 use Data::Dumper;
 
@@ -16,15 +15,16 @@ use strict;
 
 sub new {
     my $class = shift;
-    my $self = $class->SUPER::new();
-
-    $self->{'NAME'} = 'google';
-    $self->{'PATTERNS'} = ['(http://video\.google\.com/videoplay\?docid=([-\d]+))'];
-
-    bless($self, $class);
-    $self->_prepare_parameters();
-
-    return $self;
+    my $self = $class->SUPER::new(
+        NAME => 'google',
+        PATTERNS => ['(http://video\.google\.com/videoplay\?docid=([-\d]+))'],
+        _PARAMS => {
+            QUALITY => ['normal', 'Quality of the video to download. normal = standard resolution flash video, h264 = high resolution MPEG4 video']
+        },
+        @_,
+    );
+
+    return bless($self, $class);
 }
 
 sub _parse {
@@ -35,6 +35,7 @@ sub _parse {
     my $metadata = {};
     my $p;
     my $e;
+    my $quality = $self->_getval('QUALITY');
 
     $url =~ m|$pattern|;
     $url = $1;
@@ -46,7 +47,7 @@ sub _parse {
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 
-    unless(defined($content = LWP::Simple::get(sprintf('http://video.google.com/videohosted?docid=%s', $2)))) {
+    unless(defined($content = $self->simple_get(sprintf('http://video.google.com/videohosted?docid=%s', $2)))) {
         $self->error('Could not download %s', $url);
         return undef;
     }
@@ -56,13 +57,24 @@ sub _parse {
     # Look for the title
     if ($p->get_tag('title')) {
         $metadata->{'TITLE'} = $p->get_text();
-        $metadata->{'TITLE'} =~ s/ - Google Video$//;
+        $metadata->{'TITLE'} =~ s/\s?- Google Video$//s;
     }
 
-    while ($e = $p->get_tag('a')) {
-        if ((exists($a->[1]{'id'})) and ('ipoddownloadlink' eq $a->[1]{'id'})) {
-            $metadata->{'DLURL'} = $a->[1]{'href'};
-            last;
+    if ($quality eq 'h264') {
+        while ($e = $p->get_tag('a')) {
+            if ((exists($e->[1]{'id'})) and ('ipoddownloadlink' eq $e->[1]{'id'})) {
+                $metadata->{'DLURL'} = $e->[1]{'href'};
+                last;
+            }
+        }
+    } else {
+        while ($e = $p->get_tag('script')) {
+            if ($p->get_text() =~ m|googleplayer\.swf\?\\46videoUrl\\75(.+?)\\46|s) {
+                my $u = $1;
+                $u =~ s/%(..)/chr(hex($1))/ge;
+                $metadata->{'DLURL'} = $u;
+                last;
+            }
         }
     }