ripdiru 0.1.1 → 0.1.2

data/README.md

@@ -35,12 +35,11 @@ Recommended to install the following:
 
 - Ruby 1.9
 - Nokogiri
-- rtmpdump
 - ffmpeg
 
 ## Special thanks to
 
-- [matchy2 (MACHIDA Hideki)](https://github.com/matchy2), for the shell script to rip Radiru\*Radiru https://gist.github.com/5310409.git
+- [matchy2 (MACHIDA Hideki)](https://github.com/matchy2), for the shell script to rip Radiru\*Radiru https://gist.github.com/matchy2/5310409
 
 - [miyagawa (Tatsuhiko Miyagawa)](https://github.com/miyagawa/), for [ripdiko](https://github.com/miyagawa/ripdiko), from which I shamelessly copy-pasted most of the code.
 

data/lib/ripdiru/version.rb

@@ -1,3 +1,3 @@
 module Ripdiru
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/ripdiru.rb

@@ -2,7 +2,7 @@
 
 require "ripdiru/version"
 require 'net/https'
-require 'nokogiri'
+require 'rexml/document'
 require 'uri'
 require 'pathname'
 require 'base64'
@@ -14,6 +14,7 @@ module Ripdiru
   class DownloadTask
   
     TMPDIR = ENV['TMPDIR'] || '/tmp'
+    SCHEDULE_URL = "http://www2.nhk.or.jp/hensei/api/noa.cgi?c=3&wide=1&mode=json"
   
     attr_accessor :station, :cache, :buffer, :outdir, :bitrate
   
@@ -33,21 +34,21 @@ module Ripdiru
     def channel
       case station
         when "NHK1"
-          @xmlpath="http://cgi4.nhk.or.jp/hensei/api/sche-nr.cgi?tz=all&ch=netr1"
           @aspx="http://mfile.akamai.com/129931/live/reflector:46032.asx"
+          @mms_ch="netr1"
         when "NHK2"
-          @xmlpath="http://cgi4.nhk.or.jp/hensei/api/sche-nr.cgi?tz=all&ch=netr2"
           @aspx="http://mfile.akamai.com/129932/live/reflector:46056.asx"
+          @mms_ch="netr2"
         when "FM"
-          @xmlpath="http://cgi4.nhk.or.jp/hensei/api/sche-nr.cgi?tz=all&ch=netfm"
           @aspx="http://mfile.akamai.com/129933/live/reflector:46051.asx"
+          @mms_ch="netfm"
         else
           puts "invalid channel"
       end
     end
   
-    def val(node, xpath)
-      node.xpath(".//#{xpath}").text
+    def val(element, path)
+      element.get_text(path)
     end
   
     def parse_time(str)
@@ -57,13 +58,14 @@ module Ripdiru
     def now_playing(station)
       today = Date.today
       now = Time.now
-      doc = Nokogiri::XML(open(@xmlpath))
+
+      f = open(SCHEDULE_URL)
+      xml = REXML::Document.new(f)
   
-      node = doc.xpath("//program").first
-      node.xpath(".//item").each do |item|
-        from, to = parse_time(val(item, "starttime")), parse_time(val(item, "endtime"))
-        start_time = now.to_i + buffer
-        if from.to_i <= start_time && start_time < to.to_i
+      REXML::XPath.each(xml, "//item") do |item|
+        if val(item, "ch") == @mms_ch && val(item, "index") == '0'
+          from, to = parse_time(val(item, "starttime")), parse_time(val(item, "endtime"))
+          start_time = now.to_i + buffer
           return Program.new(
             id: now.strftime("%Y%m%d%H%M%S") + "-#{station}",
             station: station,
@@ -76,10 +78,12 @@ module Ripdiru
         end
       end
     end
-  
+
     def mms_url
-      doc = Nokogiri::HTML(open(@aspx))
-      mms_url = doc.xpath(".//ref").attribute("href").text
+      f = open(@aspx)
+      doc = REXML::Document.new(f)
+    
+      mms_url =  REXML::XPath.first(doc, "//ENTRY/REF").attribute("HREF").to_s
       mms_url.sub!("mms://", "mmsh://")
     end
 

data/ripdiru.gemspec

@@ -18,8 +18,4 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'nokogiri'
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripdiru
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
-dependencies:
-- !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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-10-25 00:00:00.000000000 Z
+dependencies: []
 description: Radiru*Radiru ripper
 email:
 - harupong@gmail.com