From ecd4e7d440514ebf0901778a70174ea911f5e092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Hangst=C3=B6rfer?= <jhangstoerfer@gmail.com>
Date: Sun, 21 Feb 2016 16:53:29 +0100
Subject: [PATCH] v0.1.6

---
 bower.json                   |  2 +-
 dist/jsVideoUrlParser.js     | 58 ++++++++++++++++++++++++++----------
 dist/jsVideoUrlParser.min.js |  2 +-
 package.json                 |  2 +-
 tests/test.js                | 16 +++++++++-
 5 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/bower.json b/bower.json
index 9456c15..21c44a9 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jsVideoUrlParser",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "homepage": "https://github.com/Zod-/jsVideoUrlParser",
   "authors": [{
     "name": "Julian Hangstörfer",
diff --git a/dist/jsVideoUrlParser.js b/dist/jsVideoUrlParser.js
index dec39af..1871db5 100644
--- a/dist/jsVideoUrlParser.js
+++ b/dist/jsVideoUrlParser.js
@@ -272,29 +272,57 @@ urlParser.bind({
 urlParser.bind({
   provider: 'vimeo',
   alternatives: ['vimeopro'],
-  parse: function (url) {
+  parse: function (url, params) {
     "use strict";
-    var match,
-      id;
-    match = url.match(/(?:\/(?:channels\/[\w]+|(?:album\/\d+\/)?videos?))?\/(\d+)/i);
-    id = match ? match[1] : undefined;
-    if (!id) {
+    var match;
+    var result = {
+      mediaType: 'video',
+      params: params
+    };
+
+    match = url.match(
+      /(?:\/(?:channels\/[\w]+|(?:(?:album\/\d+|groups\/[\w]+)\/)?videos?))?\/(\d+)/i
+    );
+    result.id = match ? match[1] : undefined;
+
+    if (!result.id) {
       return undefined;
     }
-    return {
-      'mediaType': 'video',
-      'id': id
-    };
+
+    if (params.hasOwnProperty('t')) {
+      params.start = getTime(params.t);
+      delete params.t;
+    }
+
+    return result;
   },
   defaultFormat: 'long',
-  formats:{
-    long: function(vi, params){
+  formats: {
+    long: function (vi, params) {
       "use strict";
-      return 'https://vimeo.com/' + vi.id + combineParams({params: params});
+      var url = 'https://vimeo.com/' + vi.id;
+      var startTime = params.start;
+      delete params.start;
+      url += combineParams({
+        params: params
+      });
+      if (startTime) {
+        url += '#t=' + startTime;
+      }
+      return url;
     },
-    embed: function(vi, params){
+    embed: function (vi, params) {
       "use strict";
-      return '//player.vimeo.com/video/' + vi.id + combineParams({params: params});
+      var url = '//player.vimeo.com/video/' + vi.id;
+      var startTime = params.start;
+      delete params.start;
+      url += combineParams({
+        params: params
+      });
+      if (startTime) {
+        url += '#t=' + startTime;
+      }
+      return url;
     }
   }
 });
diff --git a/dist/jsVideoUrlParser.min.js b/dist/jsVideoUrlParser.min.js
index 7491d25..2f1bf0d 100644
--- a/dist/jsVideoUrlParser.min.js
+++ b/dist/jsVideoUrlParser.min.js
@@ -1 +1 @@
-function URLParser(){"use strict";this.plugins={}}function cloneObject(a){"use strict";if(null===a||"object"!=typeof a)return a;var b=a.constructor();for(var c in a)b[c]=cloneObject(a[c]);return b}function getQueryParams(a){"use strict";if("string"!=typeof a)return{};a=a.split("+").join(" ");var b,c={},d=a.match(/(?:[\?](?:[^=]+)=(?:[^&#]*)(?:[&](?:[^=]+)=(?:[^&#]*))*(?:[#].*)?)|(?:[#].*)/);if(null===d)return{};b=d[0].substr(1).split(/[&#=]/);for(var e=0;e<b.length;e+=2)c[decodeURIComponent(b[e])]=decodeURIComponent(b[e+1]||"");return c}function combineParams(a){"use strict";if("object"!=typeof a)return"";a.params=a.params||{};var b="",c=0,d=Object.keys(a.params);if(0===d.length)return"";for(d.sort(),a.hasParams||(b+="?"+d[0]+"="+a.params[d[0]],c+=1);c<d.length;c+=1)b+="&"+d[c]+"="+a.params[d[c]];return b}function getTime(a){"use strict";var b,c=0,d={s:1,m:60,h:3600,d:86400,w:604800};if(!a.match(/^(\d+[smhdw]?)+$/))return 0;a=a.replace(/([smhdw])/g," $1 ").trim(),b=a.split(" ");for(var e=0;e<b.length;e+=2)c+=parseInt(b[e],10)*d[b[e+1]||"s"];return c}URLParser.prototype.parse=function(a){"use strict";var b,c=this,d=a.match(/(?:(?:https?:)?\/\/)?(?:[^\.]+\.)?(\w+)\./i),e=d?d[1]:void 0;return d&&e&&c.plugins[e]&&c.plugins[e].parse&&(b=c.plugins[e].parse.call(this,a,getQueryParams(a)))?(b.params&&0===Object.keys(b.params).length&&delete b.params,b.provider=c.plugins[e].provider,b):void 0},URLParser.prototype.bind=function(a){"use strict";var b=this;if(b.plugins[a.provider]=a,a.alternatives)for(var c=0;c<a.alternatives.length;c+=1)b.plugins[a.alternatives[c]]=a},URLParser.prototype.create=function(a){"use strict";var b=this,c=a.videoInfo,d=a.params,e=b.plugins[c.provider];return d="internal"===d?c.params:d||{},e&&(a.format=a.format||e.defaultFormat,e.formats.hasOwnProperty(a.format))?e.formats[a.format](c,cloneObject(d)):void 0};var urlParser=new URLParser;"undefined"!=typeof module&&"undefined"!=typeof module.exports&&(module.exports=urlParser),urlParser.bind({provider:"dailymotion",alternatives:["dai"],parse:function(a,b){"use strict";var c,d,e={params:b};return c=a.match(/(?:\/video|ly)\/([A-Za-z0-9]+)/i),d=c?c[1]:void 0,b.hasOwnProperty("start")&&(b.start=getTime(b.start)),d?(e.mediaType="video",e.id=d,e):void 0},defaultFormat:"long",formats:{"short":function(a){"use strict";return"https://dai.ly/"+a.id},"long":function(a,b){"use strict";return"https://dailymotion.com/video/"+a.id+combineParams({params:b})},embed:function(a,b){"use strict";return"//www.dailymotion.com/embed/video/"+a.id+combineParams({params:b})}}}),urlParser.bind({provider:"twitch",parse:function(a,b){"use strict";var c,d,e,f,g={};return c=a.match(/twitch\.tv\/(\w+)(?:\/(.)\/(\d+))?/i),e=c?c[1]:void 0,f=c?c[2]:void 0,d=c?c[3]:void 0,(e=b.channel||b.utm_content||e)?(d?(g.mediaType="video",g.id=d,g.idPrefix=f):g.mediaType="stream",g.channel=e,g):void 0},defaultFormat:"long",formats:{"long":function(a,b){"use strict";var c="";return"stream"===a.mediaType?c="https://twitch.tv/"+a.channel:"video"===a.mediaType&&(c="https://twitch.tv/"+a.channel+"/"+a.idPrefix+"/"+a.id),c+=combineParams({params:b})},embed:function(a,b){"use strict";return"//www.twitch.tv/"+a.channel+"/embed"+combineParams({params:b})}}}),urlParser.bind({provider:"vimeo",alternatives:["vimeopro"],parse:function(a){"use strict";var b,c;return b=a.match(/(?:\/(?:channels\/[\w]+|(?:album\/\d+\/)?videos?))?\/(\d+)/i),c=b?b[1]:void 0,c?{mediaType:"video",id:c}:void 0},defaultFormat:"long",formats:{"long":function(a,b){"use strict";return"https://vimeo.com/"+a.id+combineParams({params:b})},embed:function(a,b){"use strict";return"//player.vimeo.com/video/"+a.id+combineParams({params:b})}}}),urlParser.bind({provider:"youtube",alternatives:["youtu"],parse:function(a,b){"use strict";var c,d,e,f={params:b};if(c=a.match(/(?:(?:v|be|videos|embed)\/(?!videoseries)|v=)([\w\-]{11})/i),d=c?c[1]:void 0,b.v===d&&delete b.v,b.list===d?delete b.list:e=b.list,b.hasOwnProperty("start")&&(b.start=getTime(b.start)),b.hasOwnProperty("t")&&(b.start=getTime(b.t),delete b.t),d)f.mediaType="video",f.id=d,e&&(f.list=e);else{if(!e)return void 0;f.mediaType="playlist",f.list=e}return f},defaultFormat:"long",formats:{"short":function(a,b){"use strict";var c="https://youtu.be/"+a.id;return b.start&&(c+="#t="+b.start),c},embed:function(a,b){"use strict";var c="//youtube.com/embed";return"playlist"===a.mediaType?b.listType="playlist":(c+="/"+a.id,1==b.loop&&(b.playlist=a.id)),c+=combineParams({params:b})},"long":function(a,b){"use strict";var c="",d=b.start;return delete b.start,"playlist"===a.mediaType?(b.feature="share",c+="https://youtube.com/playlist"):(b.v=a.id,c+="https://youtube.com/watch"),c+=combineParams({params:b}),"playlist"!==a.mediaType&&d&&(c+="#t="+d),c},"default":"long"}});
\ No newline at end of file
+function URLParser(){"use strict";this.plugins={}}function cloneObject(a){"use strict";if(null===a||"object"!=typeof a)return a;var b=a.constructor();for(var c in a)b[c]=cloneObject(a[c]);return b}function getQueryParams(a){"use strict";if("string"!=typeof a)return{};a=a.split("+").join(" ");var b,c={},d=a.match(/(?:[\?](?:[^=]+)=(?:[^&#]*)(?:[&](?:[^=]+)=(?:[^&#]*))*(?:[#].*)?)|(?:[#].*)/);if(null===d)return{};b=d[0].substr(1).split(/[&#=]/);for(var e=0;e<b.length;e+=2)c[decodeURIComponent(b[e])]=decodeURIComponent(b[e+1]||"");return c}function combineParams(a){"use strict";if("object"!=typeof a)return"";a.params=a.params||{};var b="",c=0,d=Object.keys(a.params);if(0===d.length)return"";for(d.sort(),a.hasParams||(b+="?"+d[0]+"="+a.params[d[0]],c+=1);c<d.length;c+=1)b+="&"+d[c]+"="+a.params[d[c]];return b}function getTime(a){"use strict";var b,c=0,d={s:1,m:60,h:3600,d:86400,w:604800};if(!a.match(/^(\d+[smhdw]?)+$/))return 0;a=a.replace(/([smhdw])/g," $1 ").trim(),b=a.split(" ");for(var e=0;e<b.length;e+=2)c+=parseInt(b[e],10)*d[b[e+1]||"s"];return c}URLParser.prototype.parse=function(a){"use strict";var b,c=this,d=a.match(/(?:(?:https?:)?\/\/)?(?:[^\.]+\.)?(\w+)\./i),e=d?d[1]:void 0;return d&&e&&c.plugins[e]&&c.plugins[e].parse&&(b=c.plugins[e].parse.call(this,a,getQueryParams(a)))?(b.params&&0===Object.keys(b.params).length&&delete b.params,b.provider=c.plugins[e].provider,b):void 0},URLParser.prototype.bind=function(a){"use strict";var b=this;if(b.plugins[a.provider]=a,a.alternatives)for(var c=0;c<a.alternatives.length;c+=1)b.plugins[a.alternatives[c]]=a},URLParser.prototype.create=function(a){"use strict";var b=this,c=a.videoInfo,d=a.params,e=b.plugins[c.provider];return d="internal"===d?c.params:d||{},e&&(a.format=a.format||e.defaultFormat,e.formats.hasOwnProperty(a.format))?e.formats[a.format](c,cloneObject(d)):void 0};var urlParser=new URLParser;"undefined"!=typeof module&&"undefined"!=typeof module.exports&&(module.exports=urlParser),urlParser.bind({provider:"dailymotion",alternatives:["dai"],parse:function(a,b){"use strict";var c,d,e={params:b};return c=a.match(/(?:\/video|ly)\/([A-Za-z0-9]+)/i),d=c?c[1]:void 0,b.hasOwnProperty("start")&&(b.start=getTime(b.start)),d?(e.mediaType="video",e.id=d,e):void 0},defaultFormat:"long",formats:{"short":function(a){"use strict";return"https://dai.ly/"+a.id},"long":function(a,b){"use strict";return"https://dailymotion.com/video/"+a.id+combineParams({params:b})},embed:function(a,b){"use strict";return"//www.dailymotion.com/embed/video/"+a.id+combineParams({params:b})}}}),urlParser.bind({provider:"twitch",parse:function(a,b){"use strict";var c,d,e,f,g={};return c=a.match(/twitch\.tv\/(\w+)(?:\/(.)\/(\d+))?/i),e=c?c[1]:void 0,f=c?c[2]:void 0,d=c?c[3]:void 0,(e=b.channel||b.utm_content||e)?(d?(g.mediaType="video",g.id=d,g.idPrefix=f):g.mediaType="stream",g.channel=e,g):void 0},defaultFormat:"long",formats:{"long":function(a,b){"use strict";var c="";return"stream"===a.mediaType?c="https://twitch.tv/"+a.channel:"video"===a.mediaType&&(c="https://twitch.tv/"+a.channel+"/"+a.idPrefix+"/"+a.id),c+=combineParams({params:b})},embed:function(a,b){"use strict";return"//www.twitch.tv/"+a.channel+"/embed"+combineParams({params:b})}}}),urlParser.bind({provider:"vimeo",alternatives:["vimeopro"],parse:function(a,b){"use strict";var c,d={mediaType:"video",params:b};return c=a.match(/(?:\/(?:channels\/[\w]+|(?:(?:album\/\d+|groups\/[\w]+)\/)?videos?))?\/(\d+)/i),d.id=c?c[1]:void 0,d.id?(b.hasOwnProperty("t")&&(b.start=getTime(b.t),delete b.t),d):void 0},defaultFormat:"long",formats:{"long":function(a,b){"use strict";var c="https://vimeo.com/"+a.id,d=b.start;return delete b.start,c+=combineParams({params:b}),d&&(c+="#t="+d),c},embed:function(a,b){"use strict";var c="//player.vimeo.com/video/"+a.id,d=b.start;return delete b.start,c+=combineParams({params:b}),d&&(c+="#t="+d),c}}}),urlParser.bind({provider:"youtube",alternatives:["youtu"],parse:function(a,b){"use strict";var c,d,e,f={params:b};if(c=a.match(/(?:(?:v|be|videos|embed)\/(?!videoseries)|v=)([\w\-]{11})/i),d=c?c[1]:void 0,b.v===d&&delete b.v,b.list===d?delete b.list:e=b.list,b.hasOwnProperty("start")&&(b.start=getTime(b.start)),b.hasOwnProperty("t")&&(b.start=getTime(b.t),delete b.t),d)f.mediaType="video",f.id=d,e&&(f.list=e);else{if(!e)return void 0;f.mediaType="playlist",f.list=e}return f},defaultFormat:"long",formats:{"short":function(a,b){"use strict";var c="https://youtu.be/"+a.id;return b.start&&(c+="#t="+b.start),c},embed:function(a,b){"use strict";var c="//youtube.com/embed";return"playlist"===a.mediaType?b.listType="playlist":(c+="/"+a.id,1==b.loop&&(b.playlist=a.id)),c+=combineParams({params:b})},"long":function(a,b){"use strict";var c="",d=b.start;return delete b.start,"playlist"===a.mediaType?(b.feature="share",c+="https://youtube.com/playlist"):(b.v=a.id,c+="https://youtube.com/watch"),c+=combineParams({params:b}),"playlist"!==a.mediaType&&d&&(c+="#t="+d),c},"default":"long"}});
\ No newline at end of file
diff --git a/package.json b/package.json
index e8559a9..34a9d4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-video-url-parser",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A parser to extract provider, video id, starttime and others from YouTube, Vimeo, ... urls",
   "main": "dist/jsVideoUrlParser.js",
   "repository": {
diff --git a/tests/test.js b/tests/test.js
index 14afa75..230dd44 100644
--- a/tests/test.js
+++ b/tests/test.js
@@ -311,7 +311,8 @@ QUnit.test("Vimeo URLs", function (assert) {
         embed: '//player.vimeo.com/video/97688625'
       },
       urls: ['https://vimeo.com/groups/shortfilms/videos/97688625',
-        '//player.vimeo.com/video/97688625'
+        '//player.vimeo.com/video/97688625',
+        'https://vimeo.com/groups/1minute/videos/97688625'
       ]
     }, {
       videoInfo: cloneObject(vi),
@@ -322,11 +323,24 @@ QUnit.test("Vimeo URLs", function (assert) {
       urls: ['http://vimeopro.com/staff/frame/video/24069938',
         '//player.vimeo.com/video/24069938'
       ]
+    }, {
+      videoInfo: cloneObject(vi),
+      formats: {
+        long: 'https://vimeo.com/36881035#t=208',
+        embed: '//player.vimeo.com/video/36881035#t=208'
+      },
+      urls: ['https://vimeo.com/36881035#t=3m28s',
+        '//player.vimeo.com/video/36881035#t=3m28s'
+      ]
     }];
 
   tests[1].videoInfo.id = '96186586';
   tests[2].videoInfo.id = '97688625';
   tests[3].videoInfo.id = '24069938';
+  tests[4].videoInfo.id = '36881035';
+  tests[4].videoInfo.params = {
+    start: 208
+  };
   assertUrlTest(assert, tests);
 });