From f399afdd2e3cc072efaca069b7a874c7801b31f6 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Mon, 9 Apr 2012 17:05:57 -0400 Subject: switched to platform classes. see https://github.com/Elgg/videolist/issues/4 --- lib/Videolist/Platform/Bliptv.php | 39 ++++++++++++++++++++++++++++ lib/Videolist/Platform/Gisstv.php | 51 +++++++++++++++++++++++++++++++++++++ lib/Videolist/Platform/Metacafe.php | 39 ++++++++++++++++++++++++++++ lib/Videolist/Platform/Vimeo.php | 41 +++++++++++++++++++++++++++++ lib/Videolist/Platform/Youtube.php | 38 +++++++++++++++++++++++++++ 5 files changed, 208 insertions(+) create mode 100644 lib/Videolist/Platform/Bliptv.php create mode 100644 lib/Videolist/Platform/Gisstv.php create mode 100644 lib/Videolist/Platform/Metacafe.php create mode 100644 lib/Videolist/Platform/Vimeo.php create mode 100644 lib/Videolist/Platform/Youtube.php (limited to 'lib/Videolist/Platform') diff --git a/lib/Videolist/Platform/Bliptv.php b/lib/Videolist/Platform/Bliptv.php new file mode 100644 index 000000000..6956e060d --- /dev/null +++ b/lib/Videolist/Platform/Bliptv.php @@ -0,0 +1,39 @@ + 'bliptv', + 'video_id' => $parsed['path'], + ); + } + + public function getData($parsed) + { + $video_id = $parsed['video_id']; + + $buffer = file_get_contents('http://blip.tv'.$video_id.'?skin=rss'); + $xml = new SimpleXMLElement($buffer); + + return array( + 'title' => current($xml->xpath('/rss/channel/item/title')), + 'description' => strip_tags(current($xml->xpath('/rss/channel/item/description'))), + 'thumbnail' => current($xml->xpath('/rss/channel/item/media:thumbnail/@url')), + 'embedurl' => current($xml->xpath('/rss/channel/item/blip:embedUrl')), + ); + } +} diff --git a/lib/Videolist/Platform/Gisstv.php b/lib/Videolist/Platform/Gisstv.php new file mode 100644 index 000000000..f811619a8 --- /dev/null +++ b/lib/Videolist/Platform/Gisstv.php @@ -0,0 +1,51 @@ + 'gisstv', + 'video_id' => $video_id, + ); + } + + public function getData($parsed) + { + $video_id = $parsed['video_id']; + + $buffer = file_get_contents('http://giss.tv/dmmdb//rss.php'); + $xml = new SimpleXMLElement($buffer); + + $data = array(); + foreach($xml->xpath('/rss/channel/item') as $item){ + if ($item->link === 'http://giss.tv/dmmdb//contents/'.$video_id) { + $data['title'] = $item->title; + $data['description'] = strip_tags($item->description); + $data['thumbnail'] = $item->thumbnail; + break; + } + } + return $data; + } +} diff --git a/lib/Videolist/Platform/Metacafe.php b/lib/Videolist/Platform/Metacafe.php new file mode 100644 index 000000000..3cf2fb8ce --- /dev/null +++ b/lib/Videolist/Platform/Metacafe.php @@ -0,0 +1,39 @@ + 'metacafe', + 'video_id' => $path[2], + ); + } + + public function getData($parsed) + { + $video_id = $parsed['video_id']; + + $buffer = file_get_contents("http://www.metacafe.com/api/item/$video_id"); + $xml = new SimpleXMLElement($buffer); + + return array( + 'title' => current($xml->xpath('/rss/channel/item/title')), + 'description' => strip_tags(current($xml->xpath('/rss/channel/item/description'))), + 'thumbnail' => current($xml->xpath('/rss/channel/item/media:thumbnail/@url')), + 'embedurl' => current($xml->xpath('/rss/channel/item/media:content/@url')), + ); + } +} diff --git a/lib/Videolist/Platform/Vimeo.php b/lib/Videolist/Platform/Vimeo.php new file mode 100644 index 000000000..82bd57309 --- /dev/null +++ b/lib/Videolist/Platform/Vimeo.php @@ -0,0 +1,41 @@ + 'vimeo', + 'video_id' => $path[1], + ); + } + + public function getData($parsed) + { + $video_id = $parsed['video_id']; + + $buffer = file_get_contents("http://vimeo.com/api/v2/video/$video_id.xml"); + $xml = new SimpleXMLElement($buffer); + + $videos = $xml->children(); + $video = $videos[0]; + + return array( + 'title' => $video->title, + 'description' => strip_tags($video->description), + 'thumbnail' => $video->thumbnail_medium, + ); + } +} diff --git a/lib/Videolist/Platform/Youtube.php b/lib/Videolist/Platform/Youtube.php new file mode 100644 index 000000000..41c7d1252 --- /dev/null +++ b/lib/Videolist/Platform/Youtube.php @@ -0,0 +1,38 @@ + 'youtube', + 'video_id' => $query['v'], + ); + } + + public function getData($parsed) + { + $video_id = $parsed['video_id']; + + $buffer = file_get_contents('http://gdata.youtube.com/feeds/api/videos/'.$video_id); + $xml = new SimpleXMLElement($buffer); + + return array( + 'title' => $xml->title, + 'description' => strip_tags($xml->content), + 'thumbnail' => "http://img.youtube.com/vi/$video_id/default.jpg", + ); + } +} -- cgit v1.2.3 From 595f87c960f0d0b01ebd386686d522f25fa56b91 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Tue, 10 Apr 2012 09:51:45 -0400 Subject: Handle shortened Youtube URLs --- lib/Videolist/Platform/Youtube.php | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'lib/Videolist/Platform') diff --git a/lib/Videolist/Platform/Youtube.php b/lib/Videolist/Platform/Youtube.php index 41c7d1252..648ac282c 100644 --- a/lib/Videolist/Platform/Youtube.php +++ b/lib/Videolist/Platform/Youtube.php @@ -10,16 +10,28 @@ class Videolist_Platform_Youtube implements Videolist_PlatformInterface public function parseUrl($url) { $parsed = parse_url($url); - parse_str($parsed['query'], $query); - - if ($parsed['host'] != 'www.youtube.com' || $parsed['path'] != '/watch' || !isset($query['v'])) { - return false; + $id = ''; + if (! empty($parsed['host'])) { + if ($parsed['host'] === 'youtu.be') { + // short URLs + $id = substr($parsed['path'], 1); + } elseif ($parsed['host'] === 'www.youtube.com' + && $parsed['path'] === '/watch' + && ! empty($parsed['query'])) { + // long URLs + parse_str($parsed['query'], $query); + if (! empty($query['v'])) { + $id = $query['v']; + } + } } - - return array( - 'videotype' => 'youtube', - 'video_id' => $query['v'], - ); + if ($id) { + return array( + 'videotype' => 'youtube', + 'video_id' => $id, + ); + } + return false; } public function getData($parsed) -- cgit v1.2.3 From d2bb8789a80215708517f4ffc88462382ec601a8 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Tue, 10 Apr 2012 10:44:40 -0400 Subject: Remove redundant videotype from parseUrl return array --- actions/videolist/edit.php | 1 + lib/Videolist/Platform/Bliptv.php | 1 - lib/Videolist/Platform/Gisstv.php | 1 - lib/Videolist/Platform/Metacafe.php | 1 - lib/Videolist/Platform/Vimeo.php | 1 - lib/Videolist/Platform/Youtube.php | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/Videolist/Platform') diff --git a/actions/videolist/edit.php b/actions/videolist/edit.php index 480a3943b..4b96720d8 100644 --- a/actions/videolist/edit.php +++ b/actions/videolist/edit.php @@ -48,6 +48,7 @@ if(!$video_guid) { unset($input['title']); unset($input['description']); $input = array_merge($parsed, $platform->getData($parsed), $input); + $input['videotype'] = $platform->getType(); } else { unset($input['video_url']); diff --git a/lib/Videolist/Platform/Bliptv.php b/lib/Videolist/Platform/Bliptv.php index 6956e060d..aa53032f9 100644 --- a/lib/Videolist/Platform/Bliptv.php +++ b/lib/Videolist/Platform/Bliptv.php @@ -17,7 +17,6 @@ class Videolist_Platform_Bliptv implements Videolist_PlatformInterface } return array( - 'videotype' => 'bliptv', 'video_id' => $parsed['path'], ); } diff --git a/lib/Videolist/Platform/Gisstv.php b/lib/Videolist/Platform/Gisstv.php index f811619a8..b79898449 100644 --- a/lib/Videolist/Platform/Gisstv.php +++ b/lib/Videolist/Platform/Gisstv.php @@ -25,7 +25,6 @@ class Videolist_Platform_Gisstv implements Videolist_PlatformInterface } return array( - 'videotype' => 'gisstv', 'video_id' => $video_id, ); } diff --git a/lib/Videolist/Platform/Metacafe.php b/lib/Videolist/Platform/Metacafe.php index 3cf2fb8ce..7da6d1647 100644 --- a/lib/Videolist/Platform/Metacafe.php +++ b/lib/Videolist/Platform/Metacafe.php @@ -17,7 +17,6 @@ class Videolist_Platform_Metacafe implements Videolist_PlatformInterface } return array( - 'videotype' => 'metacafe', 'video_id' => $path[2], ); } diff --git a/lib/Videolist/Platform/Vimeo.php b/lib/Videolist/Platform/Vimeo.php index 82bd57309..a4a1f275c 100644 --- a/lib/Videolist/Platform/Vimeo.php +++ b/lib/Videolist/Platform/Vimeo.php @@ -17,7 +17,6 @@ class Videolist_Platform_Vimeo implements Videolist_PlatformInterface } return array( - 'videotype' => 'vimeo', 'video_id' => $path[1], ); } diff --git a/lib/Videolist/Platform/Youtube.php b/lib/Videolist/Platform/Youtube.php index 648ac282c..d5a388356 100644 --- a/lib/Videolist/Platform/Youtube.php +++ b/lib/Videolist/Platform/Youtube.php @@ -27,7 +27,6 @@ class Videolist_Platform_Youtube implements Videolist_PlatformInterface } if ($id) { return array( - 'videotype' => 'youtube', 'video_id' => $id, ); } -- cgit v1.2.3