Merge lp:~axlrose112/midori/midori into lp:midori

[axlrose112]

Add coub http://coub.com, improve youtube url

[gue5t gue5t (gue5t)]

Is it supposed to be "coub" or "coud"?

review: Needs Information

[axlrose112 (axlrose112)]

it is COUB, sorry

2015-03-17 12:37 GMT+00:00 gue5t gue5t <email address hidden>:

> Review: Needs Information
>
> Is it supposed to be "coub" or "coud"?
> --
> https://code.launchpad.net/~axlrose112/midori/midori/+merge/245437
> You are the owner of lp:~axlrose112/midori/midori.
>

[axlrose112 (axlrose112)]

it is COUB Thank you

[Cris Dywan (kalikiana)]

This needs updating, some of the code is using coud, other parts are using coub.

[axlrose112 (axlrose112)]

of course i am going to update it now

Unmerged revisions

6859. By axlrose112 on 2014-12-29

Add COUB http://coub.com

=== modified file 'extensions/webmedia-now-playing.vala'
--- extensions/webmedia-now-playing.vala	2014-07-31 13:25:05 +0000
+++ extensions/webmedia-now-playing.vala	2014-12-30 00:49:46 +0000
@@ -33,17 +33,22 @@
             web_media_uri = browser.uri;
             web_media_title = browser.title;
             try { 
-                    var youtube = new Regex("""(http|https)://www.youtube.com/watch\?v=[&=_\-A-Za-z0-9.]+""");
+                    var youtube = new Regex("""(http|https)://www.youtube.com/watch\?v=[&=_\-A-Za-z0-9.\|]+""");
                     var vimeo = new Regex("""(http|https)://vimeo.com/[0-9]+""");
                     var dailymotion = new Regex("""(http|https)://www.dailymotion.com/video/[_\-A-Za-z0-9]+""");
+                    var coud = new Regex("""(http|https)://coub.com/view/[&=_\-A-Za-z0-9.\|]+""");
+                    
                     string website = null;
-                    if (web_media_uri.contains("youtube") || web_media_uri.contains("vimeo") || web_media_uri.contains ("dailymotion")) {
+                    if (web_media_uri.contains("youtube") || web_media_uri.contains("vimeo") || 
+						web_media_uri.contains ("dailymotion") || web_media_uri.contains ("coub")) {
                         if (youtube.match(web_media_uri))
                             website = "Youtube";
                         else if (vimeo.match(web_media_uri))
                             website = "Vimeo";
                         else if (dailymotion.match(web_media_uri))
                             website = "Dailymotion";
+                        else if (coud.match(web_media_uri))
+                            website = "Coud";  
  
                         if (website != null) {
                             dbus_service.video_title = web_media_title;