Merge pull request #173 from BuildFire/feat/update-single-video

mas-iota · web-flow · commit b83ce9389fa7 · 2024-04-28T18:24:02.000+03:00
Feat/update single video - PLUG-2315
diff --git a/control/content/app.services.js b/control/content/app.services.js
@@ -41,6 +41,39 @@
         }
       };
     }])
+    .factory('YoutubeApi', ['$q', '$http', 'STATUS_CODE', 'STATUS_MESSAGES', 'PROXY_SERVER',
+    function ($q, $http, STATUS_CODE, STATUS_MESSAGES, PROXY_SERVER) {
+      var getProxyServerUrl = function () {
+        return PROXY_SERVER.serverUrl;
+      };
+      var getSingleVideoDetails = function (videoId) {
+        var deferred = $q.defer();
+        if (!videoId) {
+          deferred.reject(new Error({
+            code: STATUS_CODE.UNDEFINED_VIDEO_ID,
+            message: STATUS_MESSAGES.UNDEFINED_VIDEO_ID
+          }));
+        } else {
+          $http.post(getProxyServerUrl() + '/video', {
+            id: videoId
+          })
+            .success(function (response) {
+              if (response.statusCode == 200)
+                deferred.resolve(response.video);
+              else
+                deferred.resolve(null);
+            })
+            .error(function (error) {
+              deferred.reject(error);
+            });
+        }
+        return deferred.promise;
+      };
+
+      return {
+        getSingleVideoDetails: getSingleVideoDetails,
+      };
+    }])
     .factory("Utils", ["$http", "YOUTUBE_KEYS", function ($http, YOUTUBE_KEYS) {
       return {
         extractSingleVideoId: function (url) {
diff --git a/control/content/controllers/content.home.controller.js b/control/content/controllers/content.home.controller.js
@@ -16,6 +16,7 @@
     "LAYOUTS",
     "$rootScope",
     "PROXY_SERVER",
+    "YoutubeApi",
     function(
       $scope,
       Buildfire,
@@ -30,7 +31,8 @@
       $timeout,
       LAYOUTS,
       $rootScope,
-      PROXY_SERVER
+      PROXY_SERVER,
+      YoutubeApi
     ) {
       var _data = {
         content: {
@@ -123,6 +125,66 @@
         return angular.equals(data, ContentHome.masterData);
       }
 
+      // bind the video data to the scope so it can be used in the search engine
+      function setActiveVideoData(options) {
+        const { id, title, description, keywords, imageUrl } = options;
+        ContentHome.activeVideo = {
+          id,
+          title,
+          description,
+          keywords,
+          imageUrl,
+          data: {
+            feed: {
+              id,
+              title,
+              description,
+              keywords,
+              image_url: imageUrl,
+            }
+          }
+        }
+      }
+
+      ContentHome.updateSingleVideo = () => {
+        $scope.refreshButtonsLoading = true;
+        YoutubeApi.getSingleVideoDetails(ContentHome.data.content.videoID)
+          .then((res) => {
+            const videoOptions = {
+              id: ContentHome.data.content.videoID,
+              title: res.snippet.title,
+              description: res.snippet.description,
+              keywords: res.snippet.tags ? res.snippet.tags.join(',') : "",
+              imageUrl: res.snippet.thumbnails.default.url,
+            }
+            setActiveVideoData(videoOptions);
+            ContentHome.indexFeed((err) => {
+              $scope.refreshButtonsLoading = false;
+              if (!$scope.$$phase) $scope.$digest();
+              if (err) {
+                buildfire.dialog.toast({
+                  message: "Something went wrong, please try again.",
+                  type: "danger",
+                });
+                return console.error(err);
+              } else {
+                buildfire.dialog.toast({
+                  message: "Successfully updated global search.",
+                  type: "success",
+                });
+              }
+            });
+          }).catch((err) => {
+            $scope.refreshButtonsLoading = false;
+            if (!$scope.$$phase) $scope.$digest();
+            console.error(err);
+            buildfire.dialog.toast({
+              message: "Something went wrong, please try again.",
+              type: "danger",
+            });
+          });
+      }
+
       /*
        * Go pull any previously saved data
        * */
@@ -176,7 +238,7 @@
           ContentHome.handleLoaderDialog();
         }
         var success = function(result) {
-            $scope.loading = false;
+            $scope.refreshButtonsLoading = false;
             if (newObj.content.rssUrl && ContentHome.masterData.content.rssUrl !== newObj.content.rssUrl) {
               ContentHome.handleLoaderDialog("Indexing Data", "Indexing data for search results, please wait...", true);
               ContentHome.indexFeed((err) => {
@@ -196,7 +258,7 @@
             }
           },
           error = function(err) {
-            $scope.loading = false;
+            $scope.refreshButtonsLoading = false;
             ContentHome.handleLoaderDialog();
             console.error("Error while saving data : ", err);
           };
@@ -315,12 +377,14 @@
                         return console.error(err);
                       }
 
-                      ContentHome.activeVideo = {
-                        ...response.items[0].snippet,
+                      const videoOptions = {
                         id: response.items[0].id,
+                        title: response.items[0].snippet.title,
+                        description: response.items[0].snippet.description,
                         keywords: response.items[0].snippet.tags ? response.items[0].snippet.tags.join(',') : "",
-                        imageUrl: response.items[0].snippet.thumbnails.medium.url,
+                        imageUrl: response.items[0].snippet.thumbnails.default.url,
                       }
+                      setActiveVideoData(videoOptions);
 
                       ContentHome.data.content.rssUrl = ContentHome.rssLink;
                       ContentHome.data.content.type = ContentHome.contentType;
@@ -575,7 +639,7 @@
       }
 
       ContentHome.updateCachedVideos = function() {
-        $scope.loading = true;
+        $scope.refreshButtonsLoading = true;
         ContentHome.data.content.videoThumbnailVersion = Date.now();
       }
 
diff --git a/control/content/searchEngine.js b/control/content/searchEngine.js
@@ -43,6 +43,7 @@ var searchEngine = {
         description: video.description,
         keywords: video.keywords,
         imageUrl: video.imageUrl,
+        data: video.data ? video.data : {}
       }, callback);
   },
   deleteSingleVideo(videoID, callback) {
diff --git a/control/content/templates/home.html b/control/content/templates/home.html
@@ -24,7 +24,7 @@
     </div>
     <div class="col-md-3 pull-right">
       <button class="btn btn-success pull-right stretch"
-              ng-disabled="loading"
+              ng-disabled="refreshButtonsLoading"
               ng-click="ContentHome.validateRssLink()">
         Save
       </button>
@@ -75,6 +75,26 @@
 
   </div>
 </div>
+<div class="item clearfix row margin-bottom-fifteen" ng-show="(ContentHome.contentType === ContentHome.CONTENT_TYPE.SINGLE_VIDEO)">
+  <div class="labels col-md-4 padding-right-zero pull-left">
+    <span class="tooltip-container">
+      Update Global Search
+      <span class="btn-info-icon btn-primary">
+      	<span class="cp-tooltip">
+          Refresh video details in the global search result if you've updated it on your YouTube channel.
+      	</span>
+    	</span>
+    </span>
+  </div>
+  <div class="main pull-right col-md-8 padding-left-zero row">
+    <div class="col-md-3 pull-right">
+      <button class="stretch btn btn-primary btn-outlined pull-right"
+              ng-disabled="refreshButtonsLoading"
+              ng-click="ContentHome.updateSingleVideo()"> Refresh Now
+      </button>
+    </div>
+  </div>
+</div>
 <div class="item clearfix row margin-bottom-fifteen" ng-show="(ContentHome.contentType == ContentHome.CONTENT_TYPE.CHANNEL_FEED) || (ContentHome.contentType == ContentHome.CONTENT_TYPE.PLAYLIST_FEED)">
   <div class="labels col-md-4 padding-right-zero pull-left">
     <span class="tooltip-container">
@@ -89,7 +109,7 @@
   <div class="main pull-right col-md-8 padding-left-zero row">
     <div class="col-md-3 pull-right">
       <button class="stretch btn btn-primary btn-outlined pull-right"
-              ng-disabled="loading"
+              ng-disabled="refreshButtonsLoading"
               ng-click="ContentHome.updateCachedVideos()"> Refresh Now
       </button>
     </div>
diff --git a/widget/controllers/widget.feed.controller.js b/widget/controllers/widget.feed.controller.js
@@ -55,6 +55,11 @@
         var compareDataFromCacheAndYouTube = function(result){
           var isUnchanged=false;
           if(cache.items && result.items && result.items.length){
+            result.items = result.items.filter(item => (
+              item.snippet && 
+              item.snippet.thumbnails && 
+              Object.keys(item.snippet.thumbnails).length));
+
             if(cache.items.length == result.items.length){
               var flag=false;
               for (let i = 0; i < cache.items.length; i++) {
@@ -96,6 +101,9 @@
        */
       var initData = function(isRefresh) {
         var success = function(result) {
+            if ($scope.deeplinkData && !$scope.isDeeplinkItemOpened) {
+              processDeeplink($scope.deeplinkData, false);
+            }
             cache.getCache(function(err, data) {
               // if the rss feed url has changed, ignore the cache and update when fetched. Also, if forcedCleanupv2 is false, it will skip cache and proceed with fetching.
               if (err || !data || data.rssUrl != result.data.content.rssUrl || !data.forcedCleanupv2) {
@@ -104,7 +112,7 @@
                 getFeedVideosSuccess(data);
                 checkForNewDataFromYouTube(data);
               }
-              if ($scope.deeplinkData) {
+              if ($scope.deeplinkData && !$scope.isDeeplinkItemOpened) {
                 processDeeplink($scope.deeplinkData, false);
               }
               if (!$rootScope.$$phase) $rootScope.$digest();
@@ -190,22 +198,41 @@
       $scope.isDeeplinkItemOpened = false;
       // show the deeplink skeleton if the deeplink is present
       buildfire.deeplink.getData(function (data) {
-        if (data && data.link) {
+        if (data && (data.link || data.feed)) {
           $rootScope.showFeed = false;
           toggleDeeplinkSkeleton(true);
           $scope.deeplinkData = data;
         }
       });
       buildfire.deeplink.onUpdate(function (data) {
-        if (data && data.link) {
+        if (data && (data.link || data.feed)) {
           $scope.deeplinkData = data;
           toggleDeeplinkSkeleton(true);
           processDeeplink(data, true);
         }
       });
 
       function processDeeplink (data, pushToHistory=true) {
-        if (data && data.link) {
+        if (data && data.feed) {
+          let id = data.feed.id;
+          if (id.indexOf("yt:video") > -1) {
+            id = id.slice(id.lastIndexOf(":") + 1, id.length);
+          }
+          if (data.timeIndex) video.seekTo = data.timeIndex;
+          $scope.isDeeplinkItemOpened = true;
+          WidgetFeed.openDetailsPage({
+            ...data.feed, id,
+            snippet: {
+              title: data.feed.title,
+              description:data.feed.description,
+              thumbnails: {
+                default: {
+                  url: data.feed.image_url
+                }
+              }
+            },
+          }, pushToHistory);
+        } else if (data && data.link) {
           let linkD = data.link;
           if (linkD.indexOf("yt:video") > -1) {
             linkD = linkD.slice(linkD.lastIndexOf(":") + 1, linkD.length);
@@ -255,6 +282,11 @@
       var getFeedVideosSuccess = function(result) {
         // double check that result is not null
         if (result && result.items && result.items.length) {
+          result.items = result.items.filter(item => (
+            item.snippet && 
+            item.snippet.thumbnails && 
+            Object.keys(item.snippet.thumbnails).length));
+
           $rootScope.showEmptyState = false;
         } else {
           $rootScope.showEmptyState = true;
@@ -457,7 +489,7 @@
         if (WidgetFeed.screenAnimationInProgress) return;
         WidgetFeed.screenAnimationInProgress = true;
         
-        if (video.snippet.resourceId && video.snippet.resourceId.videoId) {
+        if (video.snippet && video.snippet.resourceId && video.snippet.resourceId.videoId) {
           video.id = video.snippet.resourceId.videoId;
         }
         VideoCache.setCache({...video, pushToHistory});       
@@ -473,7 +505,7 @@
         $rootScope.loading = false;
         WidgetFeed.screenAnimationInProgress = false;
         viewedVideos.markViewed($scope, video);
-        const videoId = (video.snippet.resourceId && video.snippet.resourceId.videoId) ? video.snippet.resourceId.videoId : video.id;
+        const videoId = (video.snippet && video.snippet.resourceId && video.snippet.resourceId.videoId) ? video.snippet.resourceId.videoId : video.id;
         Location.goTo("#/video/" + videoId);
 
         setTimeout(() => {
diff --git a/widget/controllers/widget.single.controller.js b/widget/controllers/widget.single.controller.js
@@ -35,14 +35,16 @@
       WidgetSingle.data = null;
       WidgetSingle.video = null;
       WidgetSingle.viewSource = function(WidgetSingle) {
-        if (
-          WidgetSingle &&
-          WidgetSingle.video &&
-          WidgetSingle.video.snippet &&
-          WidgetSingle.video.snippet.resourceId &&
-          WidgetSingle.video.snippet.resourceId.videoId
-        ) {
-          buildfire.navigation.openWindow(`https://www.youtube.com/watch?v=${WidgetSingle.video.snippet.resourceId.videoId}`, '_system');
+        if (WidgetSingle && WidgetSingle.video) {
+          if (
+            WidgetSingle.video.snippet &&
+            WidgetSingle.video.snippet.resourceId &&
+            WidgetSingle.video.snippet.resourceId.videoId
+          ) {
+            buildfire.navigation.openWindow(`https://www.youtube.com/watch?v=${WidgetSingle.video.snippet.resourceId.videoId}`, '_system');
+          } else if (WidgetSingle.video.id) {
+            buildfire.navigation.openWindow(`https://www.youtube.com/watch?v=${WidgetSingle.video.id}`, '_system');
+          }
         }
       };
 
