video_info 2.6.1 → 3.0.0

data/lib/video_info/providers/youtube_api.rb

@@ -1,6 +1,17 @@
 class VideoInfo
   module Providers
     module YoutubeAPI
+      def available?
+        if !data['items'].empty?
+          upload_status = data['items'][0]['status']['uploadStatus']
+          'rejected' != upload_status
+        else
+          false
+        end
+      rescue VideoInfo::HttpError
+        false
+      end
+
       def api_key
         VideoInfo.provider_api_keys[:youtube]
       end
@@ -46,17 +57,6 @@ class VideoInfo
 
       private
 
-      def available?
-        if !data['items'].empty?
-          upload_status = data['items'][0]['status']['uploadStatus']
-          'rejected' != upload_status
-        else
-          false
-        end
-      rescue VideoInfo::HttpError
-        false
-      end
-
       def _api_base
         'www.googleapis.com'
       end
@@ -83,8 +83,7 @@ class VideoInfo
 
       def _channel_info
         channel_url = _channel_api_url(_video_snippet['channelId'])
-        @channel_data ||= open(channel_url)
-        JSON.load(@channel_data.read)
+        @_channel_info ||=  JSON.load(URI.open(channel_url).read)
       end
 
       def _channel_snippet

data/lib/video_info/providers/youtube_scraper.rb

@@ -5,6 +5,14 @@ require 'net_http_timeout_errors'
 class VideoInfo
   module Providers
     module YoutubeScraper
+      BASE_URL = "https://www.youtube.com"
+      CHANNEL_URL = "#{BASE_URL}/channel/"
+      THUMB_DEFAULT_SIZE = 88
+
+      def available?
+        !!title
+      end
+
       def date
         date = itemprop_node_value('datePublished')
 
@@ -12,20 +20,25 @@ class VideoInfo
       end
 
       def author
-        data.css('.yt-user-info')[0].css('a').text
+        meta_node_value(channel_meta_nodes, 'og:title')
       end
 
       def author_thumbnail
-        data.css('.yt-thumb-clip')[0].css('img').attr('data-thumb')[0].value
+        image_hq_url = meta_node_value(channel_meta_nodes, 'og:image')
+
+        resize_thumb(image_hq_url, THUMB_DEFAULT_SIZE)
+      end
+
+      def channel_id
+        itemprop_node_value('channelId')
       end
 
       def author_url
-        path = data.css('.yt-user-info')[0].css('a')[0].attr('href').value
-        'https://www.youtube.com' + path
+        URI.join(CHANNEL_URL, channel_id).to_s
       end
 
       def description
-        meta_node_value('description')
+        meta_node_value(video_meta_nodes, 'og:description')
       end
 
       def duration
@@ -39,7 +52,9 @@ class VideoInfo
       end
 
       def keywords
-        value = meta_node_value('keywords')
+        return unless available?
+
+        value = meta_node_value(video_meta_nodes, 'keywords')
 
         value.split(', ') if value
       end
@@ -49,37 +64,41 @@ class VideoInfo
       end
 
       def view_count
-        data.css('div.watch-view-count').text.gsub(/\D/, '').to_i
+        itemprop_node_value('interactionCount').to_i
       end
 
       private
 
-      def meta_nodes
-        @meta_nodes ||= data.css('meta')
+      def video_meta_nodes
+        @video_meta_nodes ||= data.css('meta')
       end
 
-      def meta_node_value(name)
-        if available?
-          node = meta_nodes.detect { |n| n.attr('name').value == name }
+      def channel_meta_nodes
+        @channel_meta_nodes ||= channel_data.css('meta')
+      end
+
+      def channel_data
+        @channel_data ||= Oga.parse_html(URI.open(author_url).read)
+      end
 
-          node.attr('content').value
+      def meta_node_value(meta_nodes=video_meta_nodes, name)
+        node = meta_nodes.detect do |n|
+          n.attr('name')&.value == name || n.attr('property')&.value == name
         end
+
+        return unless node
+        node && node.attr('content') && node.attr('content').value
       end
 
       def itemprop_node_value(name)
-        if available?
-          node = meta_nodes.detect do |m|
-            itemprop_attr = m.attr('itemprop')
+        node = video_meta_nodes.detect do |m|
+          itemprop_attr = m.attr('itemprop')
 
-            itemprop_attr.value == name if itemprop_attr
-          end
-
-          node.attr('content').value
+          itemprop_attr.value == name if itemprop_attr
         end
-      end
 
-      def available?
-        data.css('div#unavailable-submessage').text.strip.empty?
+        return unless node
+        node.attr('content').value
       end
 
       def _set_data_from_api_impl(api_url)
@@ -87,9 +106,9 @@ class VideoInfo
         if url.include?('.com/v/')
           video_id = url.split('/v/')[1].split('?')[0]
           new_url = 'https://www.youtube.com/watch?v=' + video_id
-          Oga.parse_html(open(new_url).read)
+          Oga.parse_html(URI.open(new_url).read)
         else
-          Oga.parse_html(open(api_url).read)
+          Oga.parse_html(URI.open(api_url).read)
         end
       end
 

data/lib/video_info/providers/youtubeplaylist_api.rb

@@ -1,5 +1,7 @@
 class VideoInfo
   module YoutubePlaylistAPI
+    ITEMS_MAX_RESULTS = 50
+
     def available?
       !data['items'].empty?
     rescue VideoInfo::HttpError
@@ -28,6 +30,10 @@ class VideoInfo
       nil
     end
 
+    def thumbnail
+      thumbnail_small
+    end
+
     def thumbnail_small
       _video_snippet['thumbnails']['default']['url']
     end
@@ -40,6 +46,14 @@ class VideoInfo
       _video_snippet['thumbnails']['high']['url']
     end
 
+    def thumbnail_large_2x
+      _video_snippet['thumbnails']['standard']['url']
+    end
+
+    def thumbnail_maxres
+      _video_snippet['thumbnails']['maxres']['url']
+    end
+
     private
 
     def _playlist_entry
@@ -56,7 +70,7 @@ class VideoInfo
 
     def _playlist_items_api_path
       '/youtube/v3/playlistItems?part=snippet&' \
-      "playlistId=#{playlist_id}&fields=items&key=#{api_key}"
+      "playlistId=#{playlist_id}&fields=items&maxResults=#{ITEMS_MAX_RESULTS}&key=#{api_key}"
     end
 
     def _playlist_items_api_url

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '2.6.1'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_invalid_video_url/_available_/1_2_2_1_1.yml

@@ -18,12 +18,18 @@ http_interactions:
       code: 404
       message: Not Found
     headers:
+      Content-Security-Policy-Report-Only:
+      - 'default-src https: blob: wss: data: android-webview-video-poster: android-webview:
+        chrome-extension: safari-extension: ''unsafe-eval'' ''unsafe-inline''; report-uri
+        https://www.dailymotion.com/content_security_policy_report_uri'
       Server:
       - DMS/1.0.42
       X-Dm-Api-Object:
       - video
       X-Dm-Backnode:
-      - 10.194.151.108:80
+      - web-118.adm.ix7.dailymotion.com:80
+      Vary:
+      - X-DM-SSL
       X-Dm-Api-Method:
       - info
       Cache-Control:
@@ -33,57 +39,44 @@ http_interactions:
       Access-Control-Expose-Headers:
       - Date, X-DM-BackNode-Response-Time, X-DM-Edge, X-DM-Cache-Status, X-Served-By,
         X-DM-BackNode-Response-Time
+      Content-Security-Policy:
+      - upgrade-insecure-requests
+      Date:
+      - Tue, 27 Oct 2020 10:44:15 GMT
       X-Dm-Lb-Ip:
       - 195.8.215.129
       Expires:
       - Fri, 01 Jan 2010 05:00:00 GMT
       X-Dm-Lb-Name:
-      - lb-09
+      - lb-03
       X-Dm-Random-Number:
-      - '2083301'
+      - '8780791'
       Access-Control-Allow-Origin:
       - "*"
       X-Dm-Backnode-Response-Time:
-      - '22'
+      - '31'
       X-Robots-Tag:
       - noindex
+      X-Frame-Options:
+      - DENY
+      Expect-Ct:
+      - max-age=0, report-uri="https://www.dailymotion.com/content_security_policy_report_uri"
+      X-Dm-Cache-Status:
+      - MISS
       Access-Control-Allow-Headers:
       - Content-Type, Authorization
       Access-Control-Allow-Methods:
       - GET, POST, DELETE
-      X-Dm-Page:
-      - us.rest.rest_api
-      Via:
-      - 1.1 varnish
-      - 1.1 varnish
-      Fastly-Debug-Digest:
-      - 1f140405cf79803f1e28a389edd8ca212ce1e285b54a58fb8a17474780cac6a2
-      Content-Length:
-      - '206'
-      Accept-Ranges:
-      - bytes
-      Date:
-      - Thu, 05 May 2016 01:01:43 GMT
-      Age:
-      - '0'
-      Connection:
-      - keep-alive
-      X-Served-By:
-      - cache-fra1232-FRA, cache-sjc3135-SJC
-      X-Cache:
-      - MISS, MISS
-      X-Cache-Hits:
-      - 0, 0
-      Vary:
-      - X-DM-EC-Geo-Country
-      X-Dm-Cache-Status:
-      - MISS
+      Referrer-Policy:
+      - no-referrer-when-downgrade
       X-Dm-Edge:
-      - Fastly
+      - DMParis
+      Content-Length:
+      - '265'
     body:
       encoding: UTF-8
       string: '{"error":{"more_info":"https:\/\/developer.dailymotion.com\/api#error-codes","code":404,"message":"Can''t
-        find object video for `id'' parameter","type":"not_found","error_data":{"reason":"object_not_found"}}}'
-    http_version: 
-  recorded_at: Thu, 05 May 2016 01:01:43 GMT
-recorded_with: VCR 3.0.1
+        find object video for `id'' parameter","type":"not_found","error_data":{"reason":"object_not_found","object_type":"video","object_id":"inValIdiD","param":"id"}}}'
+    http_version:
+  recorded_at: Tue, 27 Oct 2020 10:44:15 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_valid_video/_available_/1_2_1_1_1.yml

@@ -18,12 +18,18 @@ http_interactions:
       code: 200
       message: OK
     headers:
+      Content-Security-Policy-Report-Only:
+      - 'default-src https: blob: wss: data: android-webview-video-poster: android-webview:
+        chrome-extension: safari-extension: ''unsafe-eval'' ''unsafe-inline''; report-uri
+        https://www.dailymotion.com/content_security_policy_report_uri'
       Server:
       - DMS/1.0.42
       X-Dm-Api-Object:
       - video
       X-Dm-Backnode:
-      - 10.190.2.132:80
+      - web-106.adm.ix7.dailymotion.com:80
+      Vary:
+      - X-DM-SSL,Accept-Encoding
       X-Dm-Api-Method:
       - info
       Cache-Control:
@@ -33,60 +39,49 @@ http_interactions:
       Access-Control-Expose-Headers:
       - Date, X-DM-BackNode-Response-Time, X-DM-Edge, X-DM-Cache-Status, X-Served-By,
         X-DM-BackNode-Response-Time
+      Content-Security-Policy:
+      - upgrade-insecure-requests
+      Date:
+      - Tue, 27 Oct 2020 10:44:14 GMT
+      Surrogate-Key:
+      - v-x7lni3
       X-Dm-Lb-Ip:
       - 195.8.215.129
       X-Dm-Tg:
       - v-x7lni3
       X-Dm-Lb-Name:
-      - lb-10
+      - lb-02
       X-Dm-Random-Number:
-      - '5983493'
+      - '9659844'
       Access-Control-Allow-Origin:
       - "*"
       X-Dm-Backnode-Response-Time:
-      - '34'
+      - '30'
       Etag:
       - W/"rQeFNlJ5iMPO8gmsSDhiVw-gzip"
       X-Robots-Tag:
       - noindex
+      X-Frame-Options:
+      - DENY
       Last-Modified:
       - Tue, 19 May 2015 07:03:39 GMT
+      Expect-Ct:
+      - max-age=0, report-uri="https://www.dailymotion.com/content_security_policy_report_uri"
+      X-Dm-Cache-Status:
+      - MISS
       Access-Control-Allow-Headers:
       - Content-Type, Authorization
       Access-Control-Allow-Methods:
       - GET, POST, DELETE
-      X-Dm-Page:
-      - us.rest.rest_api
-      Via:
-      - 1.1 varnish
-      - 1.1 varnish
-      Fastly-Debug-Digest:
-      - 5156934e90466ffd0e4642c50195b7206345d38887e9d445fa00692b2f902722
+      Referrer-Policy:
+      - no-referrer-when-downgrade
+      X-Dm-Edge:
+      - DMParis
       Content-Length:
       - '103'
-      Accept-Ranges:
-      - bytes
-      Date:
-      - Thu, 05 May 2016 01:01:43 GMT
-      Age:
-      - '0'
-      Connection:
-      - keep-alive
-      X-Served-By:
-      - cache-fra1249-FRA, cache-sjc3125-SJC
-      X-Cache:
-      - MISS, MISS
-      X-Cache-Hits:
-      - 0, 0
-      Vary:
-      - X-DM-EC-Geo-Country, Accept-Encoding
-      X-Dm-Cache-Status:
-      - MISS
-      X-Dm-Edge:
-      - Fastly
     body:
       encoding: ASCII-8BIT
       string: '{"id":"x7lni3","title":"Mario Kart (R\u00e9mi Gaillard)","channel":"fun","owner":"x4r137"}'
-    http_version: 
-  recorded_at: Thu, 05 May 2016 01:01:43 GMT
-recorded_with: VCR 3.0.1
+    http_version:
+  recorded_at: Tue, 27 Oct 2020 10:44:14 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/with_video_x7lni3/{_description → _author}/1_3_7_1.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.dailymotion.com/video/x7lni3?fields=id,title,description,duration,created_time,url,views_total,tags,thumbnail_url,thumbnail_720_url,thumbnail_240_url,thumbnail_60_url
+    uri: https://api.dailymotion.com/video/x7lni3?fields=id,title,description,duration,created_time,url,views_total,tags,thumbnail_url,thumbnail_720_url,owner.url,owner.screenname,owner.avatar_60_url,thumbnail_240_url,thumbnail_60_url
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - VideoInfo/2.6.0
+      - VideoInfo/2.8.0
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -18,12 +18,18 @@ http_interactions:
       code: 200
       message: OK
     headers:
+      Content-Security-Policy-Report-Only:
+      - 'default-src https: blob: wss: data: android-webview-video-poster: android-webview:
+        chrome-extension: safari-extension: ''unsafe-eval'' ''unsafe-inline''; report-uri
+        https://www.dailymotion.com/content_security_policy_report_uri'
       Server:
       - DMS/1.0.42
       X-Dm-Api-Object:
       - video
       X-Dm-Backnode:
-      - 10.190.2.38:80
+      - web-071.adm.ix7.dailymotion.com:80
+      Vary:
+      - X-DM-SSL,Accept-Encoding
       X-Dm-Api-Method:
       - info
       Cache-Control:
@@ -33,63 +39,53 @@ http_interactions:
       Access-Control-Expose-Headers:
       - Date, X-DM-BackNode-Response-Time, X-DM-Edge, X-DM-Cache-Status, X-Served-By,
         X-DM-BackNode-Response-Time
+      Content-Security-Policy:
+      - upgrade-insecure-requests
+      Date:
+      - Tue, 27 Oct 2020 10:44:17 GMT
+      Surrogate-Key:
+      - v-x7lni3
       X-Dm-Lb-Ip:
       - 195.8.215.129
       X-Dm-Tg:
       - v-x7lni3
       X-Dm-Lb-Name:
-      - lb-10
+      - lb-01
       X-Dm-Random-Number:
-      - '7329818'
+      - '7637990'
       Access-Control-Allow-Origin:
       - "*"
+      X-Dm-Backnode-Response-Time:
+      - '31'
       Etag:
       - W/"rQeFNlJ5iMPO8gmsSDhiVw-gzip"
       X-Robots-Tag:
       - noindex
+      X-Frame-Options:
+      - DENY
       Last-Modified:
       - Tue, 19 May 2015 07:03:39 GMT
+      Expect-Ct:
+      - max-age=0, report-uri="https://www.dailymotion.com/content_security_policy_report_uri"
+      X-Dm-Cache-Status:
+      - MISS
       Access-Control-Allow-Headers:
       - Content-Type, Authorization
       Access-Control-Allow-Methods:
       - GET, POST, DELETE
-      X-Dm-Page:
-      - us.rest.rest_api
-      Via:
-      - 1.1 varnish
-      - 1.1 varnish
-      Fastly-Debug-Digest:
-      - 3553012804c358303689e11ec92c5f0012bb9c79e3360e85b4454ccedf666ef9
-      Content-Length:
-      - '441'
-      Accept-Ranges:
-      - bytes
-      Date:
-      - Thu, 05 May 2016 01:01:44 GMT
-      Age:
-      - '0'
-      Connection:
-      - keep-alive
-      X-Served-By:
-      - cache-fra1238-FRA, cache-sjc3128-SJC
-      X-Cache:
-      - MISS, HIT
-      X-Cache-Hits:
-      - 0, 1
-      Vary:
-      - X-DM-EC-Geo-Country, Accept-Encoding
-      X-Dm-Backnode-Response-Time:
-      - '0'
-      X-Dm-Cache-Status:
-      - HIT
+      Referrer-Policy:
+      - no-referrer-when-downgrade
       X-Dm-Edge:
-      - Fastly
+      - DMParis
+      Content-Length:
+      - '502'
     body:
       encoding: ASCII-8BIT
       string: '{"id":"x7lni3","title":"Mario Kart (R\u00e9mi Gaillard)","description":"Super
         R\u00e9mi Kart est un jeu vid\u00e9o de course d\u00e9velopp\u00e9 et \u00e9dit\u00e9
         par N''Importe Quoi TV. Sa principale originalit\u00e9 vient de sa r\u00e9alit\u00e9...<br
-        \/>L''aventure continue sur www.nimportequi.com","duration":136,"created_time":1228321771,"url":"http:\/\/www.dailymotion.com\/video\/x7lni3_mario-kart-remi-gaillard_fun","views_total":10300359,"tags":["r\u00e9mi","remi","gaillard","imposteur","imposture","mario","bros","kart","nintendo","jeux"],"thumbnail_url":"http:\/\/s2.dmcdn.net\/BgWxI.jpg","thumbnail_720_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x720-YcV.jpg","thumbnail_240_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x240-b83.jpg","thumbnail_60_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x60-kbf.jpg"}'
-    http_version: 
-  recorded_at: Thu, 05 May 2016 01:01:43 GMT
-recorded_with: VCR 3.0.1
+        \/>L''aventure continue sur www.nimportequi.com","duration":136,"created_time":1228321771,"url":"https:\/\/www.dailymotion.com\/video\/x7lni3","views_total":10339941,"tags":["r\u00e9mi","remi","gaillard","imposteur","imposture","mario","bros","kart","nintendo","jeux"],"thumbnail_url":"https:\/\/s1.dmcdn.net\/v\/mj4x1VaO59zYd5Qm","thumbnail_720_url":"https:\/\/s1.dmcdn.net\/v\/mj4x1VaO59VyFzJt\/x720","owner.url":"https:\/\/www.dailymotion.com\/nqtv","owner.screenname":"R\u00e9mi
+        Gaillard","owner.avatar_60_url":"https:\/\/s2.dmcdn.net\/u\/US931VO3V-24wNr1\/60x60","thumbnail_240_url":"https:\/\/s2.dmcdn.net\/v\/mj4x1VaO59Vm42lt\/x240","thumbnail_60_url":"https:\/\/s1.dmcdn.net\/v\/mj4x1VaO59OF6TK6\/x60"}'
+    http_version:
+  recorded_at: Tue, 27 Oct 2020 10:44:17 GMT
+recorded_with: VCR 3.0.3