tidy vimeo plugin and add test links

garc33 · Oct 30, 2011 · d21db29 · d21db29
1 parent f7198ca
commit d21db29
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/plugin.video.t0mm0.test/default.py b/plugin.video.t0mm0.test/default.py
@@ -98,6 +98,10 @@
                          {'title': 'vidxden url'})
     addon.add_video_item({'host': 'vidxden.com', 'media_id': 'rn3h4gbh5se7'}, 
                          {'title': 'vidxden media id'})
+    addon.add_video_item({'url': 'http://www.vimeo.com/30081785'}, 
+                         {'title': 'vimeo url'})
+    addon.add_video_item({'host': 'vimeo.com', 'media_id': '30081785'}, 
+                         {'title': 'vimeo media id'})
     addon.add_video_item({'url': 'http://www.youtube.com/watch?v=Q3VJOl_XeGs'}, 
                          {'title': 'youtube url'})
     addon.add_video_item({'host': 'youtube.com', 'media_id': 'Q3VJOl_XeGs'}, 

diff --git a/script.module.urlresolver/lib/urlresolver/plugins/vimeo.py b/script.module.urlresolver/lib/urlresolver/plugins/vimeo.py
@@ -55,8 +55,8 @@ def get_host_and_id(self, url):
 
 
     def valid_url(self, url, host):
-        return re.match('http://(www.)?vimeo.com/[0-9]+',
-                        url)
+        return re.match('http://(.+)?vimeo.com/[0-9]+',
+                        url) or 'vimeo' in host
 
     def get_settings_xml(self):
         xml = PluginSettings.get_settings_xml(self)