feat: added possibility to receive videos by id

JohnnyTheTank · Feb 3, 2016 · 29e3483 · 29e3483
1 parent af7c30e
commit 29e3483
Show file tree

Hide file tree

Showing 8 changed files with 164 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -120,6 +120,15 @@ Supported apiNG models
 ### II. Requests
 Every **apiNG plugin** expects an array of **requests** as html attribute.
 
+#### Requests by Video
+|  parameter  | sample | default | description | optional |
+|----------|---------|---------|---------|---------|
+| **`videoId`** | `cBLulx9f9vc` |  | Youtube `videoId` (comma seperated list) | no |
+
+Sample requests:
+* `[{'videoId':'cBLulx9f9vc'}, {'videoId':'tC76tIp0kBk'}]`
+* `[{'videoId':'cBLulx9f9vc,tC76tIp0kBk'}]`
+
 #### Requests by Channel
 |  parameter  | sample | default | description | optional |
 |----------|---------|---------|---------|---------|

diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Jonathan Hornung <jonathan.hornung@gmail.com>"
   ],
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "Youtube plugin for apiNG",
   "main": "dist/angular-plugin-youtube.min.js",
   "moduleType": [],

diff --git a/demo/index.html b/demo/index.html
@@ -11,11 +11,15 @@
     <script src="../dist/aping-plugin-youtube.js"></script>
 </head>
 <body ng-app="app">
+
+    <h1>[{'videoId':'cBLulx9f9vc,tC76tIp0kBk'}]</h1>
+    <aping template-url="template.html" model="video" get-native-data="false" aping-youtube="[{'videoId':'cBLulx9f9vc,tC76tIp0kBk'}]"></aping>
+    <hr>
     <h1>[{'channelId':'UCoxMr8CYaJY-om5eJ2RA_4g'}]</h1>
-    <aping template-url="template.html" model="video" get-native-data="false" aping-youtube="[{'channelId':'UCoxMr8CYaJY-om5eJ2RA_4g'}]"></aping>
+    <aping template-url="template.html" model="social" get-native-data="false" aping-youtube="[{'channelId':'UCoxMr8CYaJY-om5eJ2RA_4g'}]"></aping>
     <hr>
     <h1>[{'lat':'48.2187997', 'lng':'11.6247072', 'distance':'1000m'}]</h1>
-    <aping template-url="template.html" model="social" aping-youtube="[{'lat':'48.2187997', 'lng':'11.6247072', 'distance':'1000m'}]"></aping>
+    <aping template-url="template.html" model="video" aping-youtube="[{'lat':'48.2187997', 'lng':'11.6247072', 'distance':'1000m'}]"></aping>
     <hr>
     <h1>[{'search':'fcbayern'}]</h1>
     <aping template-url="template.html" model="social" aping-youtube="[{'search':'fcbayern', 'order':'rating'}]"></aping>

diff --git a/dist/aping-plugin-youtube.js b/dist/aping-plugin-youtube.js
@@ -1,6 +1,6 @@
 /**
     @name: aping-plugin-youtube 
-    @version: 0.7.9 (03-02-2016) 
+    @version: 0.7.10 (03-02-2016) 
     @author: Jonathan Hornung <jonathan.hornung@gmail.com> 
     @url: https://github.com/JohnnyTheTank/apiNG-plugin-youtube 
     @license: MIT
@@ -57,7 +57,18 @@ angular.module("jtt_aping_youtube", ['jtt_youtube'])
                     }
 
 
-                    if (request.channelId) { //search for channelID (and optional searchterm)
+                    if (request.videoId) {
+                        requestObject.videoId = request.videoId;
+
+                        youtubeFactory.getVideoById(requestObject)
+                            .then(function (_videosData) {
+                                if (_videosData) {
+                                    apingController.concatToResults(apingYoutubeHelper.getObjectByJsonData(_videosData, helperObject));
+                                }
+                            });
+
+                    } else if (request.channelId) { //search for channelID (and optional searchterm)
+
                         requestObject.channelId = request.channelId;
                         if (request.search) {
                             requestObject.q = request.search;
@@ -118,6 +129,39 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
         return "https://www.youtube.com/";
     };
 
+    this.convertYoutubeDurationToSeconds = function (duration) {
+        var a = duration.match(/\d+/g);
+
+        if (duration.indexOf('M') >= 0 && duration.indexOf('H') == -1 && duration.indexOf('S') == -1) {
+            a = [0, a[0], 0];
+        }
+
+        if (duration.indexOf('H') >= 0 && duration.indexOf('M') == -1) {
+            a = [a[0], 0, a[1]];
+        }
+        if (duration.indexOf('H') >= 0 && duration.indexOf('M') == -1 && duration.indexOf('S') == -1) {
+            a = [a[0], 0, 0];
+        }
+
+        duration = 0;
+
+        if (a.length == 3) {
+            duration = duration + parseInt(a[0]) * 3600;
+            duration = duration + parseInt(a[1]) * 60;
+            duration = duration + parseInt(a[2]);
+        }
+
+        if (a.length == 2) {
+            duration = duration + parseInt(a[0]) * 60;
+            duration = duration + parseInt(a[1]);
+        }
+
+        if (a.length == 1) {
+            duration = duration + parseInt(a[0]);
+        }
+        return duration
+    };
+
     this.getYoutubeIdFromUrl = function (_url) {
         var rx = /^.*(?:(?:youtu\.be\/|v\/|vi\/|u\/\w\/|embed\/)|(?:(?:watch)?\?v(?:i)?=|\&v(?:i)?=))([^#\&\?]*).*/;
         return _url.match(rx)[1] || false;
@@ -185,7 +229,7 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
             blog_id: _item.snippet.channelId || undefined,
             blog_link: this.getThisPlatformLink() + "channel/" + _item.snippet.channelId,
             intern_type: _item.id.kind,
-            intern_id: _item.id.videoId || _item.snippet.resourceId.videoId,
+            intern_id: _item.id.videoId || ((_item.snippet.resourceId && _item.snippet.resourceId.videoId) ? _item.snippet.resourceId.videoId : _item.id),
             timestamp: apingTimeHelper.getTimestampFromDateString(_item.snippet.publishedAt, 1000, 7200),
         });
         socialObject.date_time = new Date(socialObject.timestamp);
@@ -212,6 +256,17 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
         socialObject.thumb_url = this.getYoutubeImageFromId(socialObject.intern_id, 'default');
         socialObject.native_url = this.getYoutubeImageFromId(socialObject.intern_id);
         socialObject.post_url = this.getThisPlatformLink() + "watch?v=" + socialObject.intern_id;
+
+        if (_item.statistics) {
+            if (_item.statistics.commentCount && _item.statistics.commentCount > 0) {
+                socialObject.comments = _item.statistics.commentCount;
+            }
+
+            if (_item.statistics.likeCount && _item.statistics.likeCount > 0) {
+                socialObject.likes = _item.statistics.likeCount;
+            }
+        }
+
         return socialObject;
     };
 
@@ -222,7 +277,7 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
             blog_id: _item.snippet.channelId || undefined,
             blog_link: this.getThisPlatformLink() + "channel/" + _item.snippet.channelId,
             intern_type: _item.id.kind,
-            intern_id: _item.id.videoId || _item.snippet.resourceId.videoId,
+            intern_id: _item.id.videoId || ((_item.snippet.resourceId && _item.snippet.resourceId.videoId) ? _item.snippet.resourceId.videoId : _item.id),
             timestamp: apingTimeHelper.getTimestampFromDateString(_item.snippet.publishedAt, 1000, 7200),
         });
         videoObject.date_time = new Date(videoObject.timestamp);
@@ -243,6 +298,20 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
         videoObject.position = _item.snippet.position;
         videoObject.markup = '<iframe width="1280" height="720" src="https://www.youtube.com/embed/' + videoObject.intern_id + '?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>';
 
+        if (_item.statistics) {
+            if (_item.statistics.commentCount && _item.statistics.commentCount > 0) {
+                videoObject.comments = _item.statistics.commentCount;
+            }
+
+            if (_item.statistics.likeCount && _item.statistics.likeCount > 0) {
+                videoObject.likes = _item.statistics.likeCount;
+            }
+        }
+
+        if (_item.contentDetails && _item.contentDetails.duration) {
+            videoObject.duration = this.convertYoutubeDurationToSeconds(_item.contentDetails.duration);
+        }
+
         return videoObject;
     };
 }]);;"use strict";

diff --git a/dist/aping-plugin-youtube.min.js b/dist/aping-plugin-youtube.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aping-plugin-youtube",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "Youtube plugin for apiNG",
   "main": "dist/angular-plugin-youtube.min.js",
   "scripts": {

diff --git a/src/aping-youtube-directive.js b/src/aping-youtube-directive.js
@@ -50,7 +50,18 @@ angular.module("jtt_aping_youtube", ['jtt_youtube'])
                     }
 
 
-                    if (request.channelId) { //search for channelID (and optional searchterm)
+                    if (request.videoId) {
+                        requestObject.videoId = request.videoId;
+
+                        youtubeFactory.getVideoById(requestObject)
+                            .then(function (_videosData) {
+                                if (_videosData) {
+                                    apingController.concatToResults(apingYoutubeHelper.getObjectByJsonData(_videosData, helperObject));
+                                }
+                            });
+
+                    } else if (request.channelId) { //search for channelID (and optional searchterm)
+
                         requestObject.channelId = request.channelId;
                         if (request.search) {
                             requestObject.q = request.search;

diff --git a/src/aping-youtube-helper.js b/src/aping-youtube-helper.js
@@ -9,6 +9,39 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
         return "https://www.youtube.com/";
     };
 
+    this.convertYoutubeDurationToSeconds = function (duration) {
+        var a = duration.match(/\d+/g);
+
+        if (duration.indexOf('M') >= 0 && duration.indexOf('H') == -1 && duration.indexOf('S') == -1) {
+            a = [0, a[0], 0];
+        }
+
+        if (duration.indexOf('H') >= 0 && duration.indexOf('M') == -1) {
+            a = [a[0], 0, a[1]];
+        }
+        if (duration.indexOf('H') >= 0 && duration.indexOf('M') == -1 && duration.indexOf('S') == -1) {
+            a = [a[0], 0, 0];
+        }
+
+        duration = 0;
+
+        if (a.length == 3) {
+            duration = duration + parseInt(a[0]) * 3600;
+            duration = duration + parseInt(a[1]) * 60;
+            duration = duration + parseInt(a[2]);
+        }
+
+        if (a.length == 2) {
+            duration = duration + parseInt(a[0]) * 60;
+            duration = duration + parseInt(a[1]);
+        }
+
+        if (a.length == 1) {
+            duration = duration + parseInt(a[0]);
+        }
+        return duration
+    };
+
     this.getYoutubeIdFromUrl = function (_url) {
         var rx = /^.*(?:(?:youtu\.be\/|v\/|vi\/|u\/\w\/|embed\/)|(?:(?:watch)?\?v(?:i)?=|\&v(?:i)?=))([^#\&\?]*).*/;
         return _url.match(rx)[1] || false;
@@ -76,7 +109,7 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
             blog_id: _item.snippet.channelId || undefined,
             blog_link: this.getThisPlatformLink() + "channel/" + _item.snippet.channelId,
             intern_type: _item.id.kind,
-            intern_id: _item.id.videoId || _item.snippet.resourceId.videoId,
+            intern_id: _item.id.videoId || ((_item.snippet.resourceId && _item.snippet.resourceId.videoId) ? _item.snippet.resourceId.videoId : _item.id),
             timestamp: apingTimeHelper.getTimestampFromDateString(_item.snippet.publishedAt, 1000, 7200),
         });
         socialObject.date_time = new Date(socialObject.timestamp);
@@ -103,6 +136,17 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
         socialObject.thumb_url = this.getYoutubeImageFromId(socialObject.intern_id, 'default');
         socialObject.native_url = this.getYoutubeImageFromId(socialObject.intern_id);
         socialObject.post_url = this.getThisPlatformLink() + "watch?v=" + socialObject.intern_id;
+
+        if (_item.statistics) {
+            if (_item.statistics.commentCount && _item.statistics.commentCount > 0) {
+                socialObject.comments = _item.statistics.commentCount;
+            }
+
+            if (_item.statistics.likeCount && _item.statistics.likeCount > 0) {
+                socialObject.likes = _item.statistics.likeCount;
+            }
+        }
+
         return socialObject;
     };
 
@@ -113,7 +157,7 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
             blog_id: _item.snippet.channelId || undefined,
             blog_link: this.getThisPlatformLink() + "channel/" + _item.snippet.channelId,
             intern_type: _item.id.kind,
-            intern_id: _item.id.videoId || _item.snippet.resourceId.videoId,
+            intern_id: _item.id.videoId || ((_item.snippet.resourceId && _item.snippet.resourceId.videoId) ? _item.snippet.resourceId.videoId : _item.id),
             timestamp: apingTimeHelper.getTimestampFromDateString(_item.snippet.publishedAt, 1000, 7200),
         });
         videoObject.date_time = new Date(videoObject.timestamp);
@@ -134,6 +178,20 @@ angular.module("jtt_aping_youtube").service('apingYoutubeHelper', ['apingModels'
         videoObject.position = _item.snippet.position;
         videoObject.markup = '<iframe width="1280" height="720" src="https://www.youtube.com/embed/' + videoObject.intern_id + '?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>';
 
+        if (_item.statistics) {
+            if (_item.statistics.commentCount && _item.statistics.commentCount > 0) {
+                videoObject.comments = _item.statistics.commentCount;
+            }
+
+            if (_item.statistics.likeCount && _item.statistics.likeCount > 0) {
+                videoObject.likes = _item.statistics.likeCount;
+            }
+        }
+
+        if (_item.contentDetails && _item.contentDetails.duration) {
+            videoObject.duration = this.convertYoutubeDurationToSeconds(_item.contentDetails.duration);
+        }
+
         return videoObject;
     };
 }]);