shin 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 659233c01df303c6bd476c1158172857a04093de
-  data.tar.gz: 72f02861b885bcfc1e5aadb8106f5a53f3e94a10
+  metadata.gz: f88b245d536e37f994db96a834b9f90c688e939c
+  data.tar.gz: 2dfb8fc4d27962af60c827275cc8fda74052bb8a
 SHA512:
-  metadata.gz: 8558a6d8dcc4415d8f39fc63b576769c31ff2d30f52e3bc755f0e61fcb1d0147bba6b88af26cb64f5a6bc89ae32d8289bdfb59c0ba31ff9c2e548a21e463a361
-  data.tar.gz: ccee6a02fa66ba02b441f40eaea2d58f49f1dbda9360a9fe67bbad4826c2b73783a7d4c03af6502d8bb0f25a3532960f27b898863a61c18eb5ddba1ce6e26acf
+  metadata.gz: 824c39e0be5f1d42a1f5cb152e71458cabe8ab2d66957d8a2e73fc791704eb39a3dd0b5845b65ca77229ab91a3b853f350a6244e2851e07642c02dfc3b504126
+  data.tar.gz: 9235d0207ee2a5bbac1bfe3e208f66c8d53e73a82615290aeef67a637d30bfa0820e41f1b4bbaeb0da465a74ba7e19131b6f21b8ae480f97be2d0f12e53b415a

data/lib/shin/play/svtplay.rb

@@ -22,10 +22,11 @@ module Shin
         # Can't be nil
         if @main_noko != nil
           # Title
-          @image = @main_noko.css('img.play_title-page-trailer__image')[0]['src'].strip rescue nil
-          
+          @image = URI(@main_noko.css('img.play_title-page-trailer__image')[0]['src'].strip) rescue nil
+          @image.scheme = 'http' if !@image.nil?
+
           # Data
-          @array = {image: @image, episodes: []}
+          @array = {image: @image.to_s, episodes: []}
           
           # Episodes
           @main_noko.css('div#play_js-tabpanel-more-episodes > ul > li').map do |e|
@@ -34,9 +35,10 @@ module Shin
             @desc = e.css('p.play_vertical-list__description-text').text.strip rescue nil
             @season = e.css('h2.play_vertical-list__header > a').text.strip[/S.song\s+(\d+)/, 1].to_i rescue nil
             @episode = e.css('h2.play_vertical-list__header > a').text.strip[/Avsnitt\s+(\d+)/, 1].to_i rescue nil
-            @image = e.css('img.play_vertical-list__image')[0]['src'].gsub("ALTERNATES/small", "ALTERNATES/extralarge") rescue nil
-            
-            @array[:episodes] << {id: @video_id, image: @image, season: @season, episode: @episode, subtitle: @subtitle, url: @url, description: @desc}
+            @image = URI(e.css('img.play_vertical-list__image')[0]['src'].gsub("ALTERNATES/small", "ALTERNATES/extralarge")) rescue nil
+            @image.scheme = 'http' if !@image.nil?
+
+            @array[:episodes] << {id: @video_id, image: @image.to_s, season: @season, episode: @episode, subtitle: @subtitle, url: @url, description: @desc}
           end
         else
           raise NotValid, "Nokogiri failed to parse the HTML."
@@ -70,8 +72,9 @@ module Shin
             @desc = e.css('a')[0]['title'] rescue nil
             @season = e['data-season'].to_i rescue nil
             @episode = e['data-title'][/Avsnitt\s+(\d+)/, 1].to_i rescue nil
-            @image = e.css('a img')[0]['src'].gsub("ALTERNATES/small", "ALTERNATES/extralarge") rescue nil
-            
+            @image = URI(e.css('a img')[0]['src'].gsub("ALTERNATES/small", "ALTERNATES/extralarge")) rescue nil
+            @image.scheme = 'http' if !@image.nil?
+
             # Parse published_to
             if pto = e['data-available']
               # Days
@@ -90,7 +93,7 @@ module Shin
               @subtitle = e['data-title'].gsub(@title + " - ", '').strip
             end
             
-            @array[:results] << {id: @video_id, image: @image, season: @season, episode: @episode, subtitle: @subtitle, url: @url, description: @desc, published_to: @published_to}
+            @array[:results] << {id: @video_id, image: @image.to_s, season: @season, episode: @episode, subtitle: @subtitle, url: @url, description: @desc, published_to: @published_to}
           end
         else
           raise NotValid, "Nokogiri failed to parse the HTML."
@@ -138,7 +141,7 @@ module Shin
         # Cant be nil
         if @main_noko != nil
           # Title
-          @title = @main_noko.css("h1.play_video-area-aside__title")[0].text.strip
+          @title = @main_noko.css("a.play_video-area-aside__linked-title")[0].text.strip
           
           # Subtitle data
           submeta = @main_noko.css("h2.play_video-area-aside__sub-title")[0].text.strip.gsub("\n", ' ').squeeze(' ') rescue nil
@@ -153,15 +156,18 @@ module Shin
           # Player data
           playerdata = @main_noko.css("a.play_js-svtplayer")[0]
           @published_on = Time.at(playerdata['data-popularity-publish-date'].to_i/1000) rescue nil
-          if playerdata['data-expires-timestamp'] != nil
-            @published_to = Time.at(playerdata['data-expires-timestamp'].to_i/1000) rescue nil
+          pub_to = @main_noko.css('p.play_video-area-aside__info-text').last.text.strip rescue nil
+
+          if !pub_to.nil? and dayz = pub_to[/(\d+) dag/, 1].to_i
+            @published_to = Time.parse("23:59", (Date.today + dayz).to_time) rescue nil
           else
             @published_to = nil
           end
           @url = playerdata['data-popularity-url'] rescue nil
           @length = (playerdata['data-length'].to_i)/60 rescue nil
-          @image = @main_noko.css('meta[property="og:image"]')[0]['content'].gsub("ALTERNATES/medium", "ALTERNATES/extralarge") rescue nil
-          
+          @image = URI(@main_noko.css('meta[property="og:image"]')[0]['content'].gsub("ALTERNATES/medium", "ALTERNATES/extralarge")) rescue nil
+          @image.scheme = 'http' if !@image.nil?
+
           # Add subtitle from playerdata
           if submeta != nil and @episode > 0
             @subtitle = playerdata['data-title'].gsub(@title + " - ", '').gsub("Avsnitt " + @episode.to_s + ':', '').gsub("Avsnitt " + @episode.to_s, '').strip
@@ -172,7 +178,7 @@ module Shin
             @subtitle = nil if @subtitle == ""
           end
           
-          { id: params[:id].to_i, title: @title, image: @image, season: @season, episode: @episode, subtitle: @subtitle, length: @length, published_on: @published_on, published_to: @published_to, url: @url, description: @desc }.to_hashugar
+          { id: params[:id].to_i, title: @title, image: @image.to_s, season: @season, episode: @episode, subtitle: @subtitle, length: @length, published_on: @published_on, published_to: @published_to, url: @url, description: @desc }.to_hashugar
         else
           raise NotValid, "Nokogiri failed to parse the HTML."
         end
@@ -184,4 +190,4 @@ module Shin
       class HTTPError        < StandardError; end
     end
   end
-end
+end

data/lib/shin/version.rb

@@ -1,3 +1,3 @@
 module Shin
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shin
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Joakim Nylen