tivohmo 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d174442bc2cdc54f0c321af10235ca9b7b0cd5e6
-  data.tar.gz: 9879d1b6792705f0838f2f9a12c7fd00f4b1bc1e
+  metadata.gz: 82b98cf908b70108f96047411d32f7e1b7fe4b86
+  data.tar.gz: d78429acd344c4df742e8e849600a71ad5ccbb91
 SHA512:
-  metadata.gz: 82fb8a7e0deb9d7d62be6b8809264dabaf1c23d776d53fa7ea90a0094a99ad354e97ef676663c863b6620ec5a13820b88a8449af865e036f0d7a0e430e4fcd8f
-  data.tar.gz: fdcae9f54909c5122e99fe76528f3690f58f67cbc0853c535b51100faa3a4ff5eb6caf2c3688a84c968ee581e44cc14899d206252351a3764689ff5b88b7c0f7
+  metadata.gz: e1d414df9691878b936744d0ce977806df8b820078876e763b3b116d13167b8fabd71b46c1618c30426ae898152f0105d5b17785b1ff2b8a3642dcbffd925c48
+  data.tar.gz: 31eb7b4f97bc01856f0148f9483ebf1746129dfc9f9f552ecf837a8f02d9923222f0a9f1f823e4e339706c9c1f10eb3095aff035fcd49bcf6323c0e9feb08af9

data/.travis.yml

@@ -4,7 +4,8 @@ rvm:
   - 2.1.3
 
 before_script:
+  - sudo add-apt-repository ppa:djcj/vlc-stable -y
   - sudo apt-get update
-  - sudo apt-get install -y ffmpeg libavcodec-extra-53
+  - sudo apt-get install -y ffmpeg
 
 script: bundle exec rspec

data/CHANGELOG

@@ -1,3 +1,26 @@
+0.2.3 (11/29/2014)
+------------------
+
+add webmock/vcr <98c0a61> [Matt Conway]
+fix transliteration fir ubuntu (replace iconv with unidecoder) <4aa988e> [Matt Conway]
+lookup zap2it series id to enable thumbnails in My Shows UI <b737600> [Matt Conway]
+transliterate for SD UI, xml cleanup <1a80126> [Matt Conway]
+try to fix travis <3efda2a> [Matt Conway]
+try to fix travis <a2c5d08> [Matt Conway]
+warn for expected exceptions <c5e0736> [Matt Conway]
+
+0.2.2 (11/25/2014)
+------------------
+
+decrease default beacon interval to 10s <4fd10c6> [Matt Conway]
+disable recurse for now <c8f0100> [Matt Conway]
+fix sort <33bce77> [Matt Conway]
+handle recurse (no groups) <d2a0019> [Matt Conway]
+improve ordering/sorting <06adca5> [Matt Conway]
+try to prevent beacon thread from erroring out when network temporarily unavailable (e.g. laptop suspend/wake) <73e2ea4> [Matt Conway]
+use movie/episode airdates for sorting if possible <397c50d> [Matt Conway]
+zap2it comment <d5d176d> [Matt Conway]
+
 0.2.1 (11/23/2014)
 ------------------
 

data/lib/tivohmo/adapters/plex/episode.rb

@@ -1,3 +1,5 @@
+require 'tivohmo/tvdb_helper'
+
 module TivoHMO
   module Adapters
     module Plex
@@ -39,15 +41,7 @@ module TivoHMO
             md.episode_title = "%i - %s" % [md.episode_number, title]
             md.title = "%s - %s" % [delegate.grandparent_title, title]
 
-            # group tv shows under same name if we can extract a seriesId
-            guid = delegate.guid
-            if guid =~ /thetvdb:\/\/(\d+)/
-              # TODO: figure out how to get zap2it series IDs into plex
-              # If we had zap2it ids in plex metadata and extracted them
-              # here, tivo would show a relevant thumbnail image for the
-              # series in the My Shows UI.
-              md.series_id = "SH#{$1}"
-            end
+            md.series_id = lookup_series_id
 
           rescue => e
             logger.log_exception e, "Failed to read plex metadata for #{self}"
@@ -56,6 +50,30 @@ module TivoHMO
           md
         end
 
+        # groups tv shows under same name if we can extract a seriesId
+        def lookup_series_id
+          series_id = nil
+
+          guid = delegate.guid
+          if guid =~ /thetvdb:\/\/(\d+)/
+            # zap2it ids allow tivo to show a relevant thumbnail image for the
+            # series in the My Shows UI.
+            tvdb_series_id = $1
+            begin
+              tvdb_series = TVDBHelper.instance.find_by_id(tvdb_series_id)
+              series_id = tvdb_series.zap2it_id
+              series_id = series_id.sub(/^EP/, 'SH')
+              logger.debug "Using zap2it series id: #{series_id}"
+            rescue => e
+              logger.log_exception e, "Failed to get zap2it series id", level: :warn
+            end
+
+            series_id ||= "SH#{tvdb_series_id}"
+          end
+
+          series_id
+        end
+
       end
 
     end

data/lib/tivohmo/beacon.rb

@@ -26,7 +26,7 @@ module TivoHMO
             begin
               broadcast
             rescue => e
-              logger.log_exception(e, "Ignoring exception in beacon thread")
+              logger.log_exception(e, "Ignoring exception in beacon thread", level: :warn)
             end
             sleep(@interval)
             @limit = @limit - 1

data/lib/tivohmo/server/views/unsupported.builder

@@ -0,0 +1,7 @@
+xml.UnsupportedCommand do
+  xml.Query do
+    params.each do |key, value|
+      xml.param(key: key, value: value)
+    end
+  end
+end

data/lib/tivohmo/server.rb

@@ -3,6 +3,7 @@ require 'sinatra/base'
 require 'active_support/core_ext/string'
 require 'zlib'
 require 'time'
+require 'unidecoder'
 
 module TivoHMO
 
@@ -22,6 +23,16 @@ module TivoHMO
       logger.debug "Headers: #{headers.inspect}"
     end
 
+    after do
+      if ! response.body.is_a?(Sinatra::Helpers::Stream)
+        # Try and reduce invalid chars in browse UI (SD UI) by
+        # transliterating from full utf-8 to ascii equivalents
+        # The full utf-8 is still provided in tivo_header for
+        # display by the HD UI in My Shows
+        response.body = response.body.collect{|b| transliterate(b) }
+      end
+    end
+
     after do
       logger.info "Response to #{request.ip} for \"#{request.request_method} #{request.url}\" [#{response.status}]"
       logger.debug "Headers: #{response.header}"
@@ -54,7 +65,7 @@ module TivoHMO
 
       def unsupported
         status 404
-        erb :unsupported, layout: true
+        builder :unsupported, layout: true
       end
 
       def tsn
@@ -179,6 +190,10 @@ module TivoHMO
         data
       end
 
+      def transliterate(s)
+        # unidecoder gem
+        s.to_ascii rescue s
+      end
     end
 
     helpers do
@@ -187,6 +202,8 @@ module TivoHMO
 
     # Get the xml doc describing the active HME applications
     get '/TiVoConnect' do
+      response["Content-Type"] = 'application/xml'
+
       command = params['Command']
 
       # pagination
@@ -293,16 +310,13 @@ module TivoHMO
           builder :server_info, layout: true
 
         when 'QueryItem' then
-          status 200
-          body ""
+          builder(layout: true) {|xml| xml.QueryItem }
 
         when 'FlushServer' then
-          status 200
-          body ""
+          builder(layout: true) {|xml| xml.FlushServer }
 
         when 'ResetServer' then
-          status 200
-          body ""
+          builder(layout: true) {|xml| xml.ResetServer }
 
         else
           unsupported

data/lib/tivohmo/tvdb_helper.rb

@@ -0,0 +1,19 @@
+require 'tvdbr'
+
+module TivoHMO
+
+  class TVDBHelper
+    include GemLogger::LoggerSupport
+    include Singleton
+
+    def initialize
+      @client = Tvdbr::Client.new('4A7C459A8771A96D')
+      @cache = {}
+    end
+
+    def find_by_id(series_id)
+      @cache[series_id] ||= @client.find_series_by_id(series_id) rescue nil
+    end
+
+  end
+end

data/lib/tivohmo/version.rb

@@ -1,3 +1,3 @@
 module TivoHMO
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/server_spec.rb

@@ -123,11 +123,24 @@ describe TivoHMO::Server do
         expect(helpers).to receive(:builder).
                                with(:item_details, layout: true, locals: {item: item}).
                                and_return("<TvBusMarshalledStruct/>")
+
+        # should not translit for header as HD UI handles more utf8 chars
+        expect(helpers).to_not receive(:transliterate)
+
         expect(helpers.tivo_header(item, 'video/x-tivo-mpeg')).to include('TvBusMarshalledStruct')
       end
 
     end
 
+    describe "#transliterate" do
+
+      it "generates ascii safe string" do
+        expect(helpers.transliterate("\u2019")).to eq("'")
+        expect(helpers.transliterate("\u2026")).to eq("...")
+      end
+
+    end
+
   end
 
   describe "TivoConnect" do
@@ -209,6 +222,16 @@ describe TivoHMO::Server do
         expect(title).to eq(server.title)
       end
 
+      it "should transliterate" do
+        server.title = "\u2026"
+        get "/TiVoConnect?Command=QueryContainer"
+        expect(last_response.status).to eq(200)
+        doc = Nokogiri::XML(last_response.body)
+        title = doc.at_xpath("/TiVoContainer/Details/Title").content
+        expect(title).to_not eq(server.title)
+        expect(title).to eq('...')
+      end
+
       it "uses server as root" do
         get "/TiVoConnect?Command=QueryContainer&Container=/"
         expect(last_response.status).to eq(200)

data/spec/spec_helper.rb

@@ -14,6 +14,29 @@ Logging.logger.root.level = :error
 require 'tivohmo'
 require 'open-uri'
 
+require 'webmock/rspec'
+WebMock.disable_net_connect!(allow: 'samples.mplayerhq.hu')
+
+# require 'vcr'
+# VCR.configure do |c|
+#   c.cassette_library_dir = File.expand_path('../fixtures/vcr', __FILE__)
+#   c.hook_into :webmock
+#   c.default_cassette_options = { :record => :none, :allow_playback_repeats => true }
+#   # Uncomment this line to see more information about VCR when running tests
+#   #c.debug_logger = $stderr
+# end
+#
+# def setup_vcr
+#   fixture_name = self.to_s.gsub(/[:#]+/, '-').gsub(/\s+/, '_').gsub(/^[_-]*/, '')
+#   fixture_location = __FILE__.gsub(/.*\/test\//, '').gsub(/\.[^\/]*/, '')
+#   @cassette_name = "#{fixture_location}/#{fixture_name}"
+#   VCR.insert_cassette(@cassette_name, :record => :once)
+# end
+#
+# def teardown_vcr
+#   VCR.eject_cassette(@cassette_name)
+# end
+
 def video_fixture(name)
   fixture_names = {
       tiny: 'MPEG4 by philips.mp4',
@@ -30,7 +53,7 @@ def video_fixture(name)
   video_file = "#{cache_dir}/#{file_name}"
 
   if ! File.exist?(video_file)
-    puts "Downloading video fixture #{name} from #{video_url}"
+    Logging.logger.root.info "Downloading video fixture #{name} from #{video_url}"
     FileUtils.mkdir_p(cache_dir)
     File.write(video_file, open(video_url).read)
   end

data/tivohmo.gemspec

@@ -27,9 +27,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "nokogiri"
   spec.add_development_dependency "timecop"
+  spec.add_development_dependency "webmock"
+  # spec.add_development_dependency "vcr"
 
   # core dependencies
   spec.add_dependency "activesupport"
+  spec.add_dependency "unidecoder"
   spec.add_dependency "gem_logger"
   spec.add_dependency "logging"
   spec.add_dependency "sigdump"
@@ -37,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra"
   spec.add_dependency "builder"
   spec.add_dependency "puma"
+  spec.add_dependency "tvdbr"
 
   # filesystem adapter dependencies, make optional?
   spec.add_dependency "listen"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tivohmo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unidecoder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gem_logger
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tvdbr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -345,11 +387,11 @@ files:
 - lib/tivohmo/server/views/container.builder
 - lib/tivohmo/server/views/item_details.builder
 - lib/tivohmo/server/views/layout.builder
-- lib/tivohmo/server/views/layout.erb
 - lib/tivohmo/server/views/server.builder
 - lib/tivohmo/server/views/server_info.builder
-- lib/tivohmo/server/views/unsupported.erb
+- lib/tivohmo/server/views/unsupported.builder
 - lib/tivohmo/server/views/video_formats.builder
+- lib/tivohmo/tvdb_helper.rb
 - lib/tivohmo/version.rb
 - spec/adapters/filesystem/application_spec.rb
 - spec/adapters/filesystem/file_item_spec.rb
@@ -429,4 +471,3 @@ test_files:
 - spec/cli_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/tivohmo/server/views/layout.erb

@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <title>TivoHMO</title>
-    <link rel="stylesheet" type="text/css" href="/main.css">
-  </head>
-  <body>
-    <%= yield %>
-  </body>
-</html>

data/lib/tivohmo/server/views/unsupported.erb

@@ -1,7 +0,0 @@
-<h3>Unsupported Command</h3>
-<p>Query:</p>
-<ul>
-  <% params.each do |key, value| %>
-    <li><%= key %>: <%= value %></li>
-  <% end %>
-</ul>