shin 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa172725a9410fbdd651287015ee654f6c08a743
-  data.tar.gz: 628a4f5b3842b823c10b0e26307cfd22e4cabb4f
+  metadata.gz: 8e1e6476cdee7290afe35c4cdea3a3c3d1958e9a
+  data.tar.gz: f71a0824dc344396812052551e8636eb5913fea2
 SHA512:
-  metadata.gz: cfab37ad82695032681cb7e7c4fec316a086c59bc277f0bfea8271b9726c45c26fcbe945001c8940e0efa984103c0b4bbcd0be3f5c980e0bd3ec7f208d6d239c
-  data.tar.gz: e5ae7e5006ea9fa5ac7af09c49347c36c6ad70c05acf20d4aa36740d3ee696d3482786997da664b5e6ad311768edf29b95801d783687d27fffce1744754119d0
+  metadata.gz: d50d60c231a7c44cdc9692e68dfeba2c88ec848e00fb34fc6a0695c7ae8b868fa3f46f704855ab0d8c315195b376f2b09fe02f0a4f557ee454186840110b1870
+  data.tar.gz: 0d06aec1c4f0800074f4df3410532c27e9a24906b1b088fd3f3cbf61933117351058b29ea05bfcc8497891f74e6eb88c1995b39c99a28394f2e35d64366d22ed

data/lib/shin/play/dplay.rb

@@ -59,7 +59,7 @@ module Shin
         domain = before()
 
         # Response
-        response = Base.get(domain + '/api/v2/ajax/shows/" + params[:show_id] + "/seasons?' + URI.encode_www_form(params))
+        response = Base.get(domain + '/api/v2/ajax/shows/' + params[:show_id] + '/seasons?' + URI.encode_www_form(params))
         raise HTTPError, "The response didn't have a 200 HTTP Code. It had #{response.code}." unless response.code == 200
 
         # Data

data/lib/shin/play/svtplay.rb

@@ -5,20 +5,20 @@ require 'time'
 module Shin
   module Play
     class Svtplay
-      
+
       def new
         self
       end
-      
+
       # Get a show
       def show(params={})
         # Response
         response = Base.get('http://www.svtplay.se/' + params[:slug].to_s + '?' + URI.encode_www_form(params))
         raise HTTPError, "The response didn't have a 200 HTTP Code. It had #{response.code}." unless response.code == 200
-        
+
         # Nokogiri parse
         @main_noko = Nokogiri::HTML response.body rescue nil
-        
+
         # Can't be nil
         if @main_noko != nil
           # Title
@@ -26,8 +26,13 @@ module Shin
           @image.scheme = 'http' if !@image.nil?
 
           # Data
-          @array = {image: @image.to_s, episodes: []}
-          
+          @array = {title: @main_noko.css('header.play_title-page-info__header > h1.play_title-page-info__header-title').text.strip, description: @main_noko.css('p.play_title-page-info__description').last.text.strip, image: @image.to_s, genres: [], episodes: []}
+
+          # Genres
+          @main_noko.css('header.play_title-page-info__header > ul.play_tag-list > li').map do |e|
+            @array[:genres] << e.text.strip
+          end
+
           # Episodes
           @main_noko.css('div#play_js-tabpanel-more-episodes > ul > li').map do |e|
             @video_id = e.css('a.play_vertical-list__video-element-thumbnail')[0]['href'][/\/video\/(\d+)\//, 1].to_i rescue nil
@@ -35,6 +40,17 @@ 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
+
+            # Try to match in description
+            if @episode == 0 or @episode == nil or @episode == ""
+              @episode = @desc.strip[/^Del\s+(\d+)/, 1] rescue nil
+
+              # If that doesn't work try url
+              if @episode == 0 or @episode == nil or @episode == ""
+                @episode = @url.strip[/avsnitt-(\d+)/, 1] rescue nil
+              end
+            end
+
             @image = URI(e.css('img.play_vertical-list__image')[0]['src'].gsub("ALTERNATES/small", "ALTERNATES/extralarge")) rescue nil
             @image.scheme = 'http' if !@image.nil?
 
@@ -43,28 +59,28 @@ module Shin
         else
           raise NotValid, "Nokogiri failed to parse the HTML."
         end
-        
+
         @array.to_hashugar
       end
-      
+
       # Get episodes for a slug
       def episodes(params={})
         # Response
         response = Base.get('http://www.svtplay.se/' + params[:slug].to_s + '/hela-program?' + URI.encode_www_form(params))
         raise HTTPError, "The response didn't have a 200 HTTP Code. It had #{response.code}." unless response.code == 200
-        
+
         # Nokogiri parse
         @main_noko = Nokogiri::HTML response.body rescue nil
-        
+
         # Can't be nil
         if @main_noko != nil
           # Title
           @title = @main_noko.css('div.play_gridpage__header-wrapper > h1 > a.play_link.play_link--discreet').text.strip rescue nil
           @next_page = @main_noko.css('div.play_gridpage__pagination').css('a')[0]['href'][/\?sida\=(\d+)/, 1].to_i rescue nil
-          
+
           # Data
           @array = {next_page: @next_page, results: []}
-          
+
           # Multiple episodes
           @main_noko.css('div#gridpage-content > article').map do |e|
             @video_id = e.css('a')[0]['href'][/\/video\/(\d+)\//, 1].to_i rescue nil
@@ -84,36 +100,46 @@ module Shin
                 @published_to = nil
               end
             end
-              
-      
+
+
             # subtitle
             if @episode > 0
               @subtitle = e['data-title'].gsub(@title + " - ", '').gsub("Avsnitt " + @episode.to_s + ':', '').gsub("Avsnitt " + @episode.to_s, '').strip
             else
               @subtitle = e['data-title'].gsub(@title + " - ", '').strip
             end
-            
+
+            # Try to match in description
+            if @episode == 0 or @episode == nil or @episode == ""
+              @episode = @desc.strip[/^Del\s+(\d+)/, 1] rescue nil
+
+              # If that doesn't work try url
+              if @episode == 0 or @episode == nil or @episode == ""
+                @episode = @url.strip[/avsnitt-(\d+)/, 1] rescue nil
+              end
+            end
+
             @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."
         end
-        
+
         @array.to_hashugar
       end
-      
+
       # Programs
       def programs
         # Response
         response = Base.get('http://www.svtplay.se/program')
         raise HTTPError, "The response didn't have a 200 HTTP Code. It had #{response.code}." unless response.code == 200
-        
+
         # Nokogiri parse
         @main_noko = Nokogiri::HTML response.body rescue nil
-        
+
         # Foreach programs
         @array = []
-        
+
         # Cant be nil
         if @main_noko != nil
           @main_noko.css('ul.play_alphabetic-list > li > ul > li').map do |p|
@@ -121,38 +147,44 @@ module Shin
             titlee = p.css('a').text
             @array << {slug: sluge, title: titlee}
           end
-          
+
         else
           raise NotValid, "Nokogiri failed to parse the HTML."
         end
 
         @array.to_hashugar
       end
-      
+
       # Video
       def video(params={})
         # Response
         response = Base.get('http://www.svtplay.se/video/' + params[:id].to_s)
         raise HTTPError, "The response didn't have a 200 HTTP Code. It had #{response.code}." unless response.code == 200
-        
+
         # Nokogiri parse
         @main_noko = Nokogiri::HTML response.body rescue nil
-        
+
         # Cant be nil
         if @main_noko != nil
           # Title
           @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
           if !submeta.nil?
             @season = submeta[/S.song\s+(\d+)/, 1].to_i rescue nil
             @episode = submeta[/Avsnitt\s+(\d+)/, 1].to_i rescue nil
           end
-          
+
           # Desc
           @desc = @main_noko.css('p.play_video-area-aside__info-text')[0].text.strip rescue nil
-          
+
+          # Genres
+          @genres = []
+          @main_noko.css('div.play_video-area-aside__info > ul.play_tag-list > li').map do |e|
+            @genres << e.text.strip
+          end
+
           # 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
@@ -171,20 +203,30 @@ module Shin
           # 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
-            
+
             @subtitle = nil if @subtitle == ""
           else
             @subtitle = playerdata['data-title'].gsub(@title + " - ", '').strip
             @subtitle = nil if @subtitle == ""
           end
-          
-          { 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
+
+          # Try to match in description
+          if @episode == 0 or @episode == nil or @episode == ""
+            @episode = @desc.strip[/^Del\s+(\d+)/, 1] rescue nil
+
+            # If that doesn't work try url
+            if @episode == 0 or @episode == nil or @episode == ""
+              @episode = @url.strip[/avsnitt-(\d+)/, 1] rescue nil
+            end
+          end
+
+          { 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, genres: @genres }.to_hashugar
         else
           raise NotValid, "Nokogiri failed to parse the HTML."
         end
       end
-      
-      
+
+
       # Errors
       class NotValid         < StandardError; end
       class HTTPError        < StandardError; end

data/lib/shin/version.rb

@@ -1,3 +1,3 @@
 module Shin
-  VERSION = "1.3.3"
+  VERSION = "1.4.0"
 end

metadata

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