Merge pull request #167 from BuildFire/fix-channel-urls

support new channel urls format

Author: charkhaw

control/content/app.services.js

@@ -41,7 +41,7 @@
         }
       };
     }])
-    .factory("Utils", [function () {
+    .factory("Utils", ["$http", "YOUTUBE_KEYS", function ($http, YOUTUBE_KEYS) {
       return {
         extractSingleVideoId: function (url) {
           var regExp = /^https?:\/\/(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
@@ -52,6 +52,29 @@
             return null;
           }
         },
+        fixChannelIdURL: function (url, callback){
+          let isChannel = this.extractChannelId(url);
+          let isSingle = this.extractSingleVideoId(url);
+          let isPlaylist = this.extractPlaylistId(url);
+          if(isChannel || isSingle || isPlaylist) return callback(null, url);
+          
+          let regex = /((http|https):\/\/|)(www\.)?youtube\.com\/([a-zA-Z0-9_\-@]{1,})/;
+          let res = url.match(regex);
+          if (res && res.length > 2 && res[4]) {
+            $http.get("https://youtube.googleapis.com/youtube/v3/search?part=snippet&q="+res[4]+"&type=channel&key=" + YOUTUBE_KEYS.API_KEY, { cache: true })
+            .success(function (response) {
+              if(response.items[0] && response.items[0].id && response.items[0].id.channelId){
+                callback(null, "https://www.youtube.com/channel/"+response.items[0].id.channelId);
+              }else {
+                callback(null, url);
+              }
+            }).error(function (error) {
+              callback(error);
+            });
+          }else{
+            callback(null, url);
+          }
+        },
         extractChannelId: function (url) {
           var regex = /((http|https):\/\/|)(www\.)?youtube\.com\/(channel|user|c)\/([a-zA-Z0-9_\-]{1,})/;
           var res = url.match(regex);

control/content/controllers/content.home.controller.js

@@ -222,16 +222,28 @@
       $scope.updatedWithDelay = () => {
         $timeout.cancel(validateTimeOut);
         validateTimeOut = $timeout(() => {
-          ContentHome.validateRssLink();
+          ContentHome.fixChannelIdURL();
         }, 700);
       };
 
+      ContentHome.fixChannelIdURL = function(){
+        if(ContentHome.rssLink){
+          Utils.fixChannelIdURL(ContentHome.rssLink, (err,res)=>{
+            if(err) console.error(err);
+            if(res) return ContentHome.validateRssLink(res);
+            
+            return ContentHome.validateRssLink(ContentHome.rssLink);
+          });
+        };
+      };
+
       // Function to validate youtube rss feed link entered by user.
 
-      ContentHome.validateRssLink = function() {        
-        let isChannel = Utils.extractChannelId(ContentHome.rssLink);
-        let isVideo = Utils.extractSingleVideoId(ContentHome.rssLink);
-        let isPlaylist = Utils.extractPlaylistId(ContentHome.rssLink);
+      ContentHome.validateRssLink = function(youtubeUrl){
+        if(!youtubeUrl) return ContentHome.fixChannelIdURL();
+        let isChannel = Utils.extractChannelId(youtubeUrl);
+        let isVideo = Utils.extractSingleVideoId(youtubeUrl);
+        let isPlaylist = Utils.extractPlaylistId(youtubeUrl);
 
         if (isChannel) {
           ContentHome.contentType = CONTENT_TYPE.CHANNEL_FEED;
@@ -257,7 +269,7 @@
 
         switch (ContentHome.contentType) {
           case CONTENT_TYPE.SINGLE_VIDEO:
-            var videoID = Utils.extractSingleVideoId(ContentHome.rssLink);
+            var videoID = Utils.extractSingleVideoId(youtubeUrl);
             if (videoID) {
               $http
                 .get(
@@ -302,7 +314,7 @@
                   if (!$scope.$$phase) $scope.$apply();
                 });
             } else {
-              if (Utils.extractChannelId(ContentHome.rssLink)) {
+              if (Utils.extractChannelId(youtubeUrl)) {
                 ContentHome.failureMessage =
                   "Seems like you have entered feed url. Please choose correct option to validate url.";
               }
@@ -318,7 +330,7 @@
             }
             break;
           case CONTENT_TYPE.CHANNEL_FEED:
-            var feedIdAndType = Utils.extractChannelId(ContentHome.rssLink);
+            var feedIdAndType = Utils.extractChannelId(youtubeUrl);
             var feedApiUrl = null;
             if (feedIdAndType) {
               if (feedIdAndType.channel)
@@ -377,7 +389,7 @@
                   if (!$scope.$$phase) $scope.$apply();
                 });
             } else {
-              if (Utils.extractSingleVideoId(ContentHome.rssLink)) {
+              if (Utils.extractSingleVideoId(youtubeUrl)) {
                 ContentHome.failureMessage =
                   "Seems like you have entered single video url. Please choose correct option to validate url.";
               }
@@ -393,7 +405,7 @@
             }
             break;
           case CONTENT_TYPE.PLAYLIST_FEED:
-            var playlistId = Utils.extractPlaylistId(ContentHome.rssLink);
+            var playlistId = Utils.extractPlaylistId(youtubeUrl);
             if (playlistId) {
               $http
                 .post(PROXY_SERVER.serverUrl + "/videos", {
@@ -437,7 +449,7 @@
                   if (!$scope.$$phase) $scope.$apply();
                 });
             } else {
-              if (Utils.extractSingleVideoId(ContentHome.rssLink)) {
+              if (Utils.extractSingleVideoId(youtubeUrl)) {
                 ContentHome.failureMessage =
                   "Seems like you have entered single video url. Please choose correct option to validate url.";
               }

plugin.json

@@ -20,4 +20,4 @@
   "widget": {},
   "features": [{"name" : "sharing"}],
   "languages": ["en"]
-}
+}