Clean up classes/VideoService.php

Author: winstonsung

classes/VideoService.php

@@ -65,17 +65,16 @@ class VideoService {
 				'#^([\d\w\-\+]+)$#is'
 			]
 		],
-		'disclose' => [
-			'embed'			=> '<iframe title="%4$s" src="//www.disclose.tv/embed/%1$s" width="%2$d" height="%3$d" frameborder="0" allowfullscreen="true"></iframe>',
+		'bing' => [
+			'embed'			=> '<iframe title="%4$s" src="//hub.video.msn.com/embed/%1$s" width="%2$d" height="%3$d" frameborder="0" scrolling="no" noscroll allowfullscreen="true"></iframe>',
 			'default_width'	=> 640,
-			'default_ratio'	=> 1.77777777777778, // (640 / 360)
+			'default_ratio'	=> 1.77777777777778, // (16 / 9)
 			'https_enabled'	=> true,
 			'url_regex'		=> [
-				'#disclose.tv/embed/([\d]+)/([\w-]+)#is',
-				'#disclose.tv/action/viewvideo/([\d]+)/([\w-]+)/#is'
+				'#bing.com/videos/watch/video/[\w\d\-]+?/([a-zA-Z0-9]+)(?:/\S+?)?#is'
 			],
 			'id_regex'		=> [
-				'#^([\d]+)$#is'
+				'#^([a-zA-Z0-9]+)$#is'
 			]
 		],
 		'blip' => [
@@ -87,18 +86,6 @@ class VideoService {
 			],
 			'oembed'		=> 'http://blip.tv/oembed/?url=%1$s&width=%2$d&maxwidth=%2$d'
 		],
-		'bing' => [
-			'embed'			=> '<iframe title="%4$s" src="//hub.video.msn.com/embed/%1$s" width="%2$d" height="%3$d" frameborder="0" scrolling="no" noscroll allowfullscreen="true"></iframe>',
-			'default_width'	=> 640,
-			'default_ratio'	=> 1.77777777777778, // (16 / 9)
-			'https_enabled'	=> true,
-			'url_regex'		=> [
-				'#bing.com/videos/watch/video/[\w\d\-]+?/([a-zA-Z0-9]+)(?:/\S+?)?#is'
-			],
-			'id_regex'		=> [
-				'#^([a-zA-Z0-9]+)$#is'
-			]
-		],
 		'collegehumor' => [
 			'embed'			=> '<iframe title="%4$s" src="//www.collegehumor.com/e/%1$s" width="%2$d" height="%3$d" frameborder="0" allowFullScreen="true"></iframe>',
 			'default_width'	=> 640,
@@ -123,6 +110,19 @@ class VideoService {
 				'#^([a-zA-Z0-9]+)(?:_\S+?)?#is'
 			]
 		],
+		'disclose' => [
+			'embed'			=> '<iframe title="%4$s" src="//www.disclose.tv/embed/%1$s" width="%2$d" height="%3$d" frameborder="0" allowfullscreen="true"></iframe>',
+			'default_width'	=> 640,
+			'default_ratio'	=> 1.77777777777778, // (640 / 360)
+			'https_enabled'	=> true,
+			'url_regex'		=> [
+				'#disclose.tv/embed/([\d]+)/([\w-]+)#is',
+				'#disclose.tv/action/viewvideo/([\d]+)/([\w-]+)/#is'
+			],
+			'id_regex'		=> [
+				'#^([\d]+)$#is'
+			]
+		],
 		'divshare' => [
 			'embed'			=> '<iframe title="%4$s" src="//www.divshare.com/flash/video2?myId=%1$s" width="%2$d" height="%3$d" frameborder="0" allowfullscreen="true"></iframe>',
 			'default_width'	=> 640,
@@ -518,8 +518,8 @@ class VideoService {
 		'archive.org'				=> 'archiveorg',
 		'embed.bambuser.com'		=> ['bambuser', 'bambuser_channel'],
 		'beam.pro' 					=> 'beam',
-		'blip.tv'					=> 'blip',
 		'bing.com'					=> 'bing',
+		'blip.tv'					=> 'blip',
 		'collegehumor.com'			=> 'collegehumor',
 		'dailymotion.com'			=> 'dailymotion',
 		'divshare.com'				=> 'divshare',
@@ -528,7 +528,7 @@ class VideoService {
 		'gfycat.com'				=> 'gfycat',
 		'content.jwplatform.com'	=> 'jwplayer',
 		'kickstarter.com'			=> 'kickstarter',
-		'media.ccc.de'				=> 'mideacccde',
+		'media.ccc.de'				=> 'mediacccde',
 		'metacafe.com'				=> 'metacafe',
 		'microsoftstream.com'		=> 'microsoftstream',
 		'mixer.com'					=> 'mixer',
@@ -540,7 +540,7 @@ class VideoService {
 		'teachertube.com'			=> 'teachertube',
 		'ted.com'					=> 'ted',
 		'tubitv.com'				=> 'tubitv',
-		'tudou.com'					=> 'todou',
+		'tudou.com'					=> 'tudou',
 		'tvpot.daum.net'			=> 'tvpot',
 		'twitch.tv'					=> ['twitch', 'twitchclip', 'twitchvod'],
 		'89.160.51.62'				=> 'videomaten',