program-tv 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 69f10a915324a9025ca1d2fb6a7289e22e841222
+  data.tar.gz: a32ad77616dd2facf6dc59d167098780092862f0
+SHA512:
+  metadata.gz: 1ae69d2a160eecd3f503891b005ae4af7a1d90429e076c5c955a851709b11054d86e44679c03dc22ac5fb990e782e7b828d6b7396dd6f43983f25e802982dbb4
+  data.tar.gz: 726dd9a2d566065a5fb9291f941d97a4f0a7fefc3ecd5d1590bcdb56dd9199166f4d08d738abbdc4f1420d62ce3d7cc3d0fe8d13bcc1181b038d0a79808485a6

data/lib/program-tv/parser.rb

@@ -16,25 +16,28 @@ module ProgramTV
     private
 
     def schedule(epg_name, url)
-      @additional_day = false
       page = Nokogiri::HTML(@agent.get(url).body)
-      data = page.css(".main.col > table:last > tbody > tr").map do |e|
+      data = build_hash epg_name, page.css(".main.col > table:first > tbody > tr")
+      data += build_hash epg_name, page.css(".main.col > table:last > tbody > tr"), 1
+      puts "Missing schedule for channel #{epg_name}" and return if data.empty?
+    end
+
+    # convert nokogiri html data to handy hash structure
+    def build_hash(epg_name, data, offset = 0)
+      additional_day = false
+      data = data.map do |e|
         {
-          start:   running_time(e),
+          start:   running_time(e, offset),
           channel: epg_name,
           title:   e.css('.name').text
         }
       end
-      if data.empty?
-        puts "Missing schedule for channel #{epg_name}"
-        return
-      end
       data[0..-2].each_with_index do |element, i|
         element[:stop] = data[i+1][:start]
         if element[:stop] < element[:start]
-          @additional_day = true
+          additional_day = true
           element[:stop] += 86400
-        elsif @additional_day
+        elsif additional_day
           element[:start] += 86400
           element[:stop] += 86400
         end
@@ -42,16 +45,16 @@ module ProgramTV
         element[:stop] = element[:stop].strftime("%Y%m%d%H%M%S %z")
       end
       data.pop
-      data
+      return data
     end
 
     # Methods to retrieve channel attributes
-    def running_time(element)
+    def running_time(element, offset = 0)
       time = element.css('.time').text.match(/([0-9]+):([0-9]+)/)
       return nil unless time
       Time.new(Time.new.year,
                Time.new.month,
-               Time.new.day + 1,
+               Time.new.day + offset,
                time[1],
                time[2])
     end

data/lib/program-tv/writer.rb

@@ -20,7 +20,10 @@ module ProgramTV
             end
           end
         end
-        new_schedule = (today_schedule + schedule).select{ |p| p[:start] > Time.now.strftime("%Y%m%d000000 %z") } 
+        new_schedule = (today_schedule + schedule).
+            select{ |p| p[:start] > Time.now.strftime("%Y%m%d000000 %z") }.
+            uniq.
+            sort{ |a,b| a[:start] <=> b[:start] }
         File.open(xml_path(schedule), "w+") do |file|
           file.write(build_xml(new_schedule))
         end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: program-tv
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Maciej Walusiak
@@ -14,49 +13,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Downloads TV channel schedule in XML format
@@ -75,26 +68,25 @@ files:
 homepage: https://github.com/Rabsztok/program-tv
 licenses:
 - GPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: TV Channel parser
 test_files: []