program-tv 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 960be2b41388258787bc42008f5d5092628d858e
-  data.tar.gz: 23f84646a0053115aa003df5bca05def2529c70c
+  metadata.gz: cdd826e88236e4397312508d2281c44dbfb4ce78
+  data.tar.gz: 4369235cebee6af25943fe94ccd1cb7b4350d387
 SHA512:
-  metadata.gz: d94970f002742e6be5d4772b88191f7351e29046626de60af7a8c06b8b71dc131cbbb1f9357624e7d2d1173a748f804e841b81955782c86194500c6fd2823f3d
-  data.tar.gz: b2e665e8d7eca5f6590e259b9d985536d0c982302aad4b9684997308631ad371a0c5f784fa61265501b7a41f3daff9bf84e5b23a1ee57e6631cf2a0a3b426401
+  metadata.gz: 415971534ac63f85bf06855d7b34b537f3d6d0978e210767ec63131c3eb10d740b09671a1baf61e60bfba919d8a3b1759c25e0db2e1ef3c66d65f68f4ceb86e7
+  data.tar.gz: 7bc7c87c47261aad47ab497a83c30c42015fcf818a442e8199d352bd55d585079d59072d7631fc75384725c2875cd63784e5e04733b41a5c37baa81139babcef

data/bin/program-tv

@@ -5,29 +5,33 @@ $LOAD_PATH.push File.expand_path("../lib", File.dirname(__FILE__)) # add library
 require 'program-tv'
 require 'optparse'
 
-options   = { layout: 'vertical', selector: 'img.sprite' }
-op        = OptionParser.new
-op.banner = <<-eos
-#{ProgramTV::DESCRIPTION}
+options   = {}
+OptionParser.new do |op|
+  op.banner = <<-eos
+  #{ProgramTV::DESCRIPTION}
 
-Usage: program-tv [options]
+  Usage: program-tv [options]
 
-eos
+  eos
 
-op.on("-h", "--help") do
-  puts op.to_s
-  exit!
-end
+  op.on("-h", "--help") do
+    puts op.to_s
+    exit!
+  end
 
-op.on("-v", "--version") do
-  puts ProgramTV::VERSION
-  exit!
-end
+  op.on("-v", "--version") do
+    puts ProgramTV::VERSION
+    exit!
+  end
+
+  op.on("-c", "--channel-list PATH", "path to yml channel list") do |path|
+    options[:channel_list] = path
+  end
+end.parse!
 
 begin
-  op.parse!(ARGV)
   ARGV.clear
-  ProgramTV.run!
+  ProgramTV.run!(options)
 rescue Exception => ex
   puts ex.message
   exit!

data/channels.yml

@@ -1,57 +1,51 @@
-- "ATM Rozrywka"
-- "4fun TV"
-- "Belsat TV"
-- "Bloomberg"
-- "CANAL+"
-- "CANAL+ Film"
-- "CANAL+ Film2"
-- "Deutsches Musik Fernsehen"
-- "Edusat"
-- "Edusat HD"
-- "Eska TV"
-- "Filmbox"
-- "France 24"
-- "France 23 - EN"
-- "HBO"
-- "HBO2"
-- "hbocomedy"
-- "itv"
-- "kinopolska"
-- "mango24"
-- "novelatv"
-- "polonia1"
-- "polotv"
-- "polsat"
-- "polsatjimjam"
-- "polsatsport"
-- "polsatsportnews"
-- "puls"
-- "puls2"
-- "rbltv"
-- "russiatoday"
-- "starstv"
-- "tele5"
-- "ttv"
-- "tv4"
-- "tv6"
-- "tvdisco"
-- "tvn"
-- "tvn24"
-- "tvn7"
-- "tvncnbc"
-- "tvnmeteo"
-- "tvnstyle"
-- "tvnturbo"
-- "tvp1"
-- "tvp2"
-- "tvphistoria"
-- "tvpinfo"
-- "tvpkultura"
-- "tvppolonia"
-- "tvprozrywka"
-- "tvr"
-- "tvs"
-- "tvtrwam"
-- "viasatexplorer"
-- "viasathistory"
-- "viasatnature"
+atm-rozrywka : atmrozrywka
+4fun-tv : 4funtv
+belsat-tv : belsat
+bloomberg-(ang.) : bloomberg
+deutsches-musik-fernsehen : deutschesmusik
+edusat : edusat
+eska-tv : eskatv
+filmbox : filmbox
+france-24 : france24
+france-24-en : france24en
+itv : itv
+kino-polska : kinopolska
+mango-24 : mango24
+novela-tv : novelatv
+polonia-1 : polonia1
+polo-tv : polotv
+polsat : polsat
+polsat-biznes : polsatbiznes
+jim-jam-polsat : polsatjimjam
+polsat-sport : polsatsport
+polsat-sport-news : polsatsportnews
+puls : puls
+puls-2 : puls2
+rbl.tv : rbltv
+russia-today : russiatoday
+stars-tv : starstv
+tele-5 : tele5
+ttv : ttv
+tv-4 : tv4
+tv-6 : tv6
+tv.disco : tvdisco
+tvn : tvn
+tvn-24 : tvn24
+tvn-7 : tvn7
+tvn-cnbc : tvncnbc
+tvn-meteo : tvnmeteo
+tvn-style : tvnstyle
+tvn-turbo : tvnturbo
+tvp-1 : tvp1
+tvp-2 : tvp2
+tvp-historia : tvphistoria
+tvp-info : tvpinfo
+tvp-kultura : tvpkultura
+tvp-polonia : tvppolonia
+tvp-rozrywka : tvprozrywka
+tvr : tvr
+tvs : tvs
+tv-trwam : tvtrwam
+polsat-viasat-explorer : viasatexplorer
+polsat-viasat-history : viasathistory
+polsat-viasat-nature : viasatnature

data/lib/program-tv/parser.rb

@@ -3,39 +3,32 @@ module ProgramTV
 
     def initialize
       @agent = Mechanize.new
-      @channel_list_url = "http://www.cyfrowypolsat.pl/program-tv/lista-kanalow/"
     end
 
     # Runs dynamic-sprites command.
     #
     def run
-      channel_urls.map do |url|
-        schedule(url)
+      ProgramTV.selected_channels.map do |url_name, epg_name|
+        schedule(epg_name, "http://www.cyfrowypolsat.pl/program-tv/#{url_name}")
       end
     end
 
     private
 
-    def schedule(url)
+    def schedule(epg_name, url)
       page = Nokogiri::HTML(@agent.get(url).body)
       data = page.css(".main.col > table:last > tbody > tr").map do |e|
         {
           start:   running_time(e),
-          channel: url.match(/([^\/]+)\/;/)[1].to_s,
+          channel: epg_name,
           title:   e.css('.name').text
         }
       end
       data[0..-2].each_with_index{ |element, i| element[:end] = data[i+1][:start] }
-      data.last[:end] = data.first[:start]
+      data.pop
       data
     end
 
-    # Fetches page with channel list and returns Array of urls to subpages with channel schedule
-    def channel_urls
-      page = Nokogiri::HTML(@agent.get(@channel_list_url).body)
-      page.css('.rowChannel a').select{ |c| ProgramTV.selected_channels.include?(c.text.to_s.strip) }.map{ |c| c.attr('href') }
-    end
-
     # Methods to retrieve channel attributes
     def running_time(element)
       time = element.css('.time').text.match(/([0-9]+):([0-9]+)/)

data/lib/program-tv.rb

@@ -2,7 +2,7 @@ module ProgramTV
 
   #----------------------------------------------------------------------------
 
-  VERSION     = "0.0.1"
+  VERSION     = "0.0.3"
   SUMMARY     = "TV Channel parser"
   DESCRIPTION = "Downloads TV channel list in XML format"
 
@@ -16,6 +16,7 @@ module ProgramTV
   # Initilizes Runner which controls all the magic stuff.
   #
   def self.run!(options = {})
+    @@options = options
     data = Parser.new.run
     puts Writer.new(data).run
   end
@@ -27,6 +28,6 @@ module ProgramTV
   end
 
   def self.selected_channels
-    @channels ||= YAML::load(File.open(File.join(gem_root, 'channels.yml')))
+    @channels ||= YAML::load(File.open(@@options[:channel_list] || File.join(gem_root, 'channels.yml')))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: program-tv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Maciej Walusiak