Use YouTube's rel="canonical"

There are a few different kinds of URLs that resolve to the same page.
In this case, "http://www.youtube.com/embed/CODE" is the same as
"http://www.youtube.com/watch?v=CODE"

So, rather than add a special case for it, I just used the tag in
YouTube's markup that says "I'm the same as this url"

That way the logic is consolidated across the different formats.

I'm almost leaning towards just having the upstream always perform
this... but that might involve a lot more checking than I have time for
right now.

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/FlashVideo/Site/Youtube.pm b/lib/FlashVideo/Site/Youtube.pm
index 293f3d6..ce84859 100644
--- a/lib/FlashVideo/Site/Youtube.pm
+++ b/lib/FlashVideo/Site/Youtube.pm
@@ -23,6 +23,12 @@ my @formats = (
 sub find_video {
   my ($self, $browser, $embed_url, $prefs) = @_;
 
+  # There are a few different kinds of URLs that end up on the same page
+  # So, let's canonicalize to the "real" one
+  if ($browser->content =~ m!<link *rel=['"]canonical['"] *href=['"]([^'"]*)!) {
+    $embed_url = "http://www.youtube.com$1"
+  }
+
   if($embed_url !~ m!youtube\.com/watch!) {
     $browser->get($embed_url);
     if ($browser->response->header('Location') =~ m!/swf/.*video_id=([^&]+)!