- Fix MyVideo grabber

diff --git a/videosite/MyVideoGrabber.pm b/videosite/MyVideoGrabber.pm
index 4b41387..be83de2 100644 (file)
--- a/videosite/MyVideoGrabber.pm
+++ b/videosite/MyVideoGrabber.pm
@@ -54,8 +54,7 @@ sub _parse {
     }
 
     $p->handler(start => \@accum, "tagname, attr");
-    $p->handler(text => \@text, "text");
-    $p->report_tags(qw(meta script));
+    $p->report_tags(qw(meta link));
     $p->utf8_mode(1);
     $p->parse($content);
 
@@ -64,15 +63,23 @@ sub _parse {
         if ('meta' eq $e->[0]) {
             if ('title' eq $e->[1]->{'name'}) {
                 $metadata->{'TITLE'} = $e->[1]->{'content'};
-                $metadata->{'TITLE'} =~ s/\s*-\s*MyVideo$//;
+                $metadata->{'TITLE'} =~ s/\s+Video\s+-\s+\S+\s+-\s+MyVideo$//;
+                $self->debug("Found title: %s", $metadata->{'TITLE'});
+                last;
             }
         }
     }
 
     # Look for the download URL
-    foreach $e (@text) {
-        if ($e->[0] =~ m|SWFObject\(.*?\.swf\?([^\&]+)\&|) {
-            $metadata->{'DLURL'} = $1;
+    foreach $e (@accum) {
+        if ('link' eq $e->[0]) {
+            if (exists($e->[1]->{'rel'}) and ('image_src' eq $e->[1]->{'rel'})) {
+                $metadata->{'DLURL'} = $e->[1]->{'href'};
+                $metadata->{'DLURL'} =~ s,thumbs/[^/]*$,,;
+                $metadata->{'DLURL'} .= $metadata->{'ID'} . ".flv";
+                $self->debug("Found URL: %s", $metadata->{'DLURL'});
+                last;
+            }
         }
     }