MediaEmbed: updated vidme

s9e · Jun 12, 2017 · 3e32c86 · 3e32c86
1 parent 8102baa
commit 3e32c86
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Bundles/MediaPack.php b/src/Bundles/MediaPack.php
diff --git a/src/Plugins/MediaEmbed/Configurator/Collections/CachedDefinitionCollection.php b/src/Plugins/MediaEmbed/Configurator/Collections/CachedDefinitionCollection.php
@@ -117,7 +117,7 @@ class CachedDefinitionCollection extends SiteDefinitionCollection
 		'viagame'=>['extract'=>'!viagame\\.com/channels/[^/]+/(?\'id\'\\d+)!','host'=>'viagame.com','iframe'=>['height'=>'392','src'=>'//www.viagame.com/embed/{@id}','width'=>'640'],'name'=>'Viagame','tags'=>['gaming']],
 		'videodetective'=>['extract'=>'!videodetective\\.com/\\w+/[-\\w]+/(?:trailer/P0*)?(?\'id\'\\d+)!','host'=>'videodetective.com','iframe'=>['src'=>'//www.videodetective.com/embed/video/?options=false&autostart=false&playlist=none&publishedid={@id}'],'name'=>'Video Detective'],
 		'videomega'=>['extract'=>'!videomega\\.tv/\\?ref=(?\'id\'\\w+)!','host'=>'videomega.tv','iframe'=>['src'=>'//videomega.tv/iframe.php?ref={@id}'],'name'=>'Videomega','tags'=>['videos']],
-		'vidme'=>['attributes'=>['height'=>['defaultValue'=>'360'],'width'=>['defaultValue'=>'640']],'host'=>'vid.me','iframe'=>['height'=>'{@height}','src'=>'https://vid.me/e/{@id}','width'=>'{@width}'],'name'=>'vidme','scrape'=>['extract'=>['!meta property="og:video:type" content="video/\\w+">\\s*<meta property="og:video:height" content="(?\'height\'\\d+)">\\s*<meta property="og:video:width" content="(?\'width\'\\d+)!','!meta property="og:video:url" content="[^"]*vid\\.me/e/(?\'id\'\\w+)!']],'tags'=>['videos']],
+		'vidme'=>['attributes'=>['height'=>['defaultValue'=>'360'],'width'=>['defaultValue'=>'640']],'host'=>'vid.me','iframe'=>['height'=>'{@height}','src'=>'https://vid.me/e/{@id}','width'=>'{@width}'],'name'=>'vidme','scrape'=>['extract'=>['!maxwidth=(?\'width\'\\d+).*?maxheight=(?\'height\'\\d+)!','!vid\\.me/e/(?\'id\'\\w+)!']],'tags'=>['videos']],
 		'vimeo'=>['extract'=>'!vimeo\\.com/(?:channels/[^/]+/|video/)?(?\'id\'\\d+)!','host'=>'vimeo.com','iframe'=>['src'=>'//player.vimeo.com/video/{@id}'],'name'=>'Vimeo','tags'=>['videos']],
 		'vine'=>['extract'=>'!vine\\.co/v/(?\'id\'[^/]+)!','host'=>'vine.co','iframe'=>['height'=>'480','src'=>'https://vine.co/v/{@id}/embed/simple?audio=1','width'=>'480'],'name'=>'Vine','tags'=>['social','videos']],
 		'vk'=>['extract'=>['!vk(?:\\.com|ontakte\\.ru)/(?:[\\w.]+\\?z=)?video(?\'oid\'-?\\d+)_(?\'vid\'\\d+)!','!vk(?:\\.com|ontakte\\.ru)/video_ext\\.php\\?oid=(?\'oid\'-?\\d+)&id=(?\'vid\'\\d+)&hash=(?\'hash\'[0-9a-f]+)!'],'host'=>['vk.com','vkontakte.ru'],'iframe'=>['height'=>'360','src'=>'//vk.com/video_ext.php?oid={@oid}&id={@vid}&hash={@hash}&hd=1','width'=>'607'],'name'=>'VK','scrape'=>['extract'=>'!embed_hash=(?\'hash\'[0-9a-f]+)!','match'=>'!vk.*?video-?\\d+_\\d+!','url'=>'http://vk.com/video{@oid}_{@vid}'],'tags'=>['.ru']],

diff --git a/src/Plugins/MediaEmbed/Configurator/sites/vidme.xml b/src/Plugins/MediaEmbed/Configurator/sites/vidme.xml
@@ -10,8 +10,8 @@
 
 	<host>vid.me</host>
 	<scrape>
-		<extract>!meta property="og:video:type" content="video/\w+"&gt;\s*&lt;meta property="og:video:height" content="(?'height'\d+)"&gt;\s*&lt;meta property="og:video:width" content="(?'width'\d+)!</extract>
-		<extract>!meta property="og:video:url" content="[^"]*vid\.me/e/(?'id'\w+)!</extract>
+		<extract>!maxwidth=(?'width'\d+).*?maxheight=(?'height'\d+)!</extract>
+		<extract>!vid\.me/e/(?'id'\w+)!</extract>
 	</scrape>
 	<iframe width="{@width}" height="{@height}" src="https://vid.me/e/{@id}"></iframe>
 </site>