tivohmo 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23e9f9103ee58ffb81e0bb0bbd17e8d3362ead11
-  data.tar.gz: 62c368b9bb3d2e760d8fef53a4a309d34c0a14f9
+  metadata.gz: 47cfc66b304a9e2077e46e6aa926b28f71d06b61
+  data.tar.gz: f3472e5e06a6167f772c4f6f6f2b78051673b4cb
 SHA512:
-  metadata.gz: 7e61409326f627087d50ea35a95ec391d74ded1fde2b446f7e67398f063a0219e98e2c6f7daedf689fcb438d8728cee318965317b52e21fce51fddef3cfc2cca
-  data.tar.gz: 641ca50d1d8fc479fc85ebc16d0b4cd9977aa011d930196e92a758bcc7019498c1a88b3fcd03a5a600bbe869138ce758a86c40cb510ae9e3e8b71f8a9744d38f
+  metadata.gz: 526a4da9add7732b54b4579a692e1af98bd3fb7b9d8c8651ac12a461deb52def24a4a71ff2228ca3aab22cf76803b1b3584179f69affc62b0f68744425d581ce
+  data.tar.gz: b8fc08f4828cf93c6021a17b143328c6f5c9cff63199cf24367d0df0a71aa5073dd8bb50e56bfb06542631e99bc35ae3bc93e86934b2f26f540b2e78aa62016b

data/.travis.yml

@@ -1,7 +1,13 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.3
+  - 2.3.0
+  - 2.2.4
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 
 before_script:
   - sudo add-apt-repository ppa:archivematica/externals -y

data/CHANGELOG

@@ -1,3 +1,13 @@
+0.3.2 (01/03/2016)
+------------------
+
+1.9.3 not supported <a2bd4bc> [Matt Conway]
+TiVo Series 3 support: <486fa2e> [Scott Bailey]
+add cli for setting arbitrary config <6171acb> [Matt Conway]
+allow setting plex auth token <abc307a> [Matt Conway]
+fix back after watching movie (anchor) <2737823> [Matt Conway]
+use debug for transcode progress <4aae8d1> [Matt Conway]
+
 0.3.1 (03/08/2015)
 ------------------
 

data/README.md

@@ -25,6 +25,11 @@ This project only supports serving of video resources (for now) as that fills my
 
 ## Installation
 
+Install ffmpeg 2.x:
+
+    # On Mac OS X, use homebrew: http://brew.sh/
+    brew install ffmpeg
+
 Install the gem:
 
     $ gem install tivohmo

data/TODO

@@ -1,5 +1,7 @@
-fix back after watching movie (anchor)
 add audio track support similar to embedded subtitles
 add embedded subtitles to filesystem app
 figure out how to stream/transcode from plex rather than hack to use local files
 figure out a way to embed subtitles in mpeg2 stream for live toggling from tivo ui (EIA-608/CEA-708/line 21)
+Add push capability
+Add html rendering of heirarchy for browsing/pushing
+Add a plex plugin that allows one to trigger a push from plex ui (e.g. mobile plex client)

data/contrib/tivohmo.yml

@@ -35,6 +35,12 @@ applications:
 #    application: TivoHMO::Adapters::Filesystem::Application
 #    identifier: /My/Video
 
+# Adapter specific configuration
+#  adapters:
+#    plex:
+#      # Optional, only needs to be set when plex user profiles have access control
+#      # https://support.plex.tv/hc/en-us/articles/204059436-Finding-your-account-token-X-Plex-Token
+#      auth_token: 'YOUR_TOKEN'
 
 # BEGIN RUNTIME EDITABLE SETTINGS
 #

data/lib/tivohmo/adapters/plex.rb

@@ -1,4 +1,10 @@
 require 'plex-ruby'
+Plex.configure do |config|
+  # TODO: figure out a way to make this instance specific rather than global for all plex apps
+  token = TivoHMO::Config.instance.get(["adapters", "plex", "auth_token"])
+  config.auth_token = token if token.present?
+end
+
 require_relative 'plex/movie'
 require_relative 'plex/episode'
 require_relative 'plex/group'

data/lib/tivohmo/adapters/streamio/transcoder.rb

@@ -248,7 +248,7 @@ module TivoHMO
             begin
               logger.info "Starting transcode of '#{movie.path}' to '#{output_filename}'"
               transcoded_movie = movie.transcode(output_filename, opts, t_opts) do |progress|
-                logger.info ("[%3i%%] Transcoding #{File.basename(movie.path)}" % (progress * 100).to_i)
+                logger.debug ("[%3i%%] Transcoding #{File.basename(movie.path)}" % (progress * 100).to_i)
                 raise "Halted" if Thread.current[:halt]
               end
               logger.info "Transcoding completed, transcoded file size: #{File.size(output_filename)}"

data/lib/tivohmo/cli.rb

@@ -70,6 +70,10 @@ module TivoHMO
     option ["-f", "--configuration"],
            "FILE", "load configuration from given filename\n"
 
+    option ["-c", "--configitem"],
+           "ITEM", "set configuration from given key=value item\n",
+            multivalued: true
+
     option ["-s", "--settings"],
            "FILE", "a writable file for storing runtime settings\n"
 
@@ -117,6 +121,12 @@ module TivoHMO
 
       logger.info "TivoHMO #{TivoHMO::VERSION} starting up"
 
+      # set any config items passed in on cli
+      configitem_list.each do |item|
+        key, value = item.split('=')
+        Config.instance.set(key, value)
+      end
+
       # allow cli option to override config file
       set_if_default(:port, TivoHMO::Config.instance.get(:port).try(:to_i))
 

data/lib/tivohmo/server.rb

@@ -249,36 +249,41 @@ module TivoHMO
           container = server.find(container_path)
           halt 404, "No container found for #{container_path}" unless container
 
+          if anchor_item
+            anchor = server.find(anchor_item)
+            if anchor
+              container = anchor.parent
+            else
+              logger.warn "Anchor not found: #{anchor_item}"
+            end
+          end
+
           children = container.children
 
           children = select_all_items(children) if recurse
 
           children = sort(children, sort_order) if sort_order && ! container.presorted
 
-          if anchor_item
-            anchor = server.find(anchor_item)
-            if anchor
-              idx = children.index(anchor)
-              if idx
-                # -1 means show starting at the anchor item
-                # ItemStart should be the index of the anchor
-                anchor_offset = anchor_offset + 1 if anchor_offset < 0
-                item_start = idx + anchor_offset
-                item_start = 0 if item_start < 0
-                locals[:item_start] = item_start
-              else
-                logger.warn "Anchor not in container: #{container}, #{anchor_item}"
-              end
+          if anchor
+            idx = children.index(anchor)
+            if idx
+              # negative anchor means start N items before the anchor
+              # positive means start N items after the anchor
+              # ItemStart should be the index of the anchor with offset applied
+              anchor_offset = anchor_offset + 1 if anchor_offset < 0
+              item_start = idx + anchor_offset
+              item_start = 0 if item_start < 0
+              locals[:item_start] = item_start
             else
-              logger.warn "Anchor not found: #{anchor_item}"
-            end
-          else
-            if item_count < 0
-              locals[:item_start] = children.size + item_count
-              locals[:item_count] = - item_count
+              logger.warn "Anchor not in container: #{container}, #{anchor_item}"
             end
           end
 
+          if item_count < 0
+            locals[:item_start] = children.size + item_count
+            locals[:item_count] = - item_count
+          end
+
           if container.root?
             builder :server, layout: true,
                     locals: locals.merge(container: container, children: children)
@@ -313,7 +318,9 @@ module TivoHMO
           builder :server_info, layout: true
 
         when 'QueryItem' then
-          builder(layout: true) {|xml| xml.QueryItem }
+	  # pyTivo returns 404 when we try this (and doesn't crash the TiVo)
+          # builder(layout: true) {|xml| xml.QueryItem }
+	  unsupported
 
         when 'FlushServer' then
           builder(layout: true) {|xml| xml.FlushServer }
@@ -337,6 +344,7 @@ module TivoHMO
       response["Content-Type"] = format
 
       stream do |out|
+        # Pulling h.264 ts fails if we include tivo_header, so it seems header is only needed for mpeg2 ts
         out << tivo_header(item, format)
         item.transcoder.transcode(out, format)
       end

data/lib/tivohmo/subtitles_util.rb

@@ -79,7 +79,7 @@ module TivoHMO
       logger.debug "Setting up change listener on #{dir}"
 
       listener = Listen.to(dir) do |modified, added, removed|
-        logger.debug "Detected filesystem change on #{dir}"
+        logger.debug "Detected filesystem change (#{added.size}/#{removed.size}) on #{dir}"
 
         dirs = (added + removed).flatten.collect do |path|
           logger.debug "Inspecting filesystem change: #{path}"

data/lib/tivohmo/version.rb

@@ -1,3 +1,3 @@
 module TivoHMO
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/cli_spec.rb

@@ -163,6 +163,17 @@ describe TivoHMO::CLI do
 
   end
 
+  describe "--configitem" do
+
+    it "sets a config item" do
+      expect(TivoHMO::Server).to receive(:start)
+      cli.run(argv(minimal_args.merge(configitem: "adapters.plex.auth_token=abc123")))
+      expect(TivoHMO::Config.instance.get("adapters.plex.auth_token")).to eq('abc123')
+    end
+
+  end
+
+
   describe "--port" do
 
     it "has a default port" do
@@ -180,7 +191,7 @@ describe TivoHMO::CLI do
   describe "--beacon" do
 
     it "works with defaults" do
-      expect(TivoHMO::Beacon).to receive(:new).with(9032, **{})
+      expect(TivoHMO::Beacon).to receive(:new).with(9032, {})
       cli.run(argv(minimal_args))
     end
 

data/spec/server_spec.rb

@@ -162,7 +162,8 @@ describe TivoHMO::Server do
 
     it "should have a stub response for QueryItem" do
       get '/TiVoConnect?Command=QueryItem'
-      expect(last_response.status).to eq(200)
+      # but make this 404 (like pyTivo) instead of 200
+      expect(last_response.status).to eq(404)
     end
 
     it "should have a response for QueryServer" do
@@ -516,17 +517,24 @@ describe TivoHMO::Server do
           child_titles = doc.xpath("/TiVoContainer/Item/Details/Title").collect(&:content)
           expect(child_titles).to match_array(["i1", "i2", "i3", "i4", "i5", "i6", "i7", "i8"])
         end
-        
-# [2014-12-07 21:23:00] INFO  TivoHMO::Server Request from 192.168.1.12 "GET http:
-# //192.168.1.188:9033/TiVoConnect?Command=QueryContainer&Container=%2FMatts%20Lap
-# top%20(Plex)&Recurse=Yes&SortOrder=Title&ItemCount=8&AnchorItem=%2FMatts%20Lapto
-# p%20(Plex)%2FAdult%20TV%20Shows%2FAll%2FMarvel's%20Agents%20of%20S.H.I.E.L.D.%2F
-# Season%201%2FEye%20Spy&AnchorOffset=-5&Filter=x-tivo-container%2Ftivo-videos,x-t
-# ivo-container%2Ffolder,video%2Fx-tivo-mpeg,video%2F*&SerialNum=848000190292CC9"
-# [2014-12-07 21:23:00] DEBUG TivoHMO::Server Headers: {"Content-Type"=>nil}
-# [2014-12-07 21:23:00] WARN  TivoHMO::Server Anchor not in container: <TivoHMO::Adapters::Plex::Application: Plex[localhost:32400]>, /Matts Laptop (Plex)/Adult TV Shows/All/Marvel's Agents of S.H.I.E.L.D./Season 1/Eye Spy
-# [2014-12-07 21:23:00] INFO  TivoHMO::Server Response to 192.168.1.12 for "GET http://192.168.1.188:9033/TiVoConnect?Command=QueryContainer&Container=%2FMatts%20Laptop%20(Plex)&Recurse=Yes&SortOrder=Title&ItemCount=8&AnchorItem=%2FMatts%20Laptop%20(Plex)%2FAdult%20TV%20Shows%2FAll%2FMarvel's%20Agents%20of%20S.H.I.E.L.D.%2FSeason%201%2FEye%20Spy&AnchorOffset=-5&Filter=x-tivo-container%2Ftivo-videos,x-tivo-container%2Ffolder,video%2Fx-tivo-mpeg,video%2F*&SerialNum=848000190292CC9" [200]
 
+        it "overrides container with the one from anchor" do
+          get "/TiVoConnect?Command=QueryContainer&Container=/a1&AnchorItem=/a1/c1/i8&AnchorOffset=-1"
+          expect(last_response.status).to eq(200)
+          doc = Nokogiri::XML(last_response.body)
+
+          expect(doc.at_xpath("/TiVoContainer/Details/Title").content).to eq("/a1/c1")
+
+          expect(doc.at_xpath("/TiVoContainer/ItemStart").content).to eq("7")
+          expect(doc.at_xpath("/TiVoContainer/ItemCount").content).to eq("8")
+
+          expect(doc.at_xpath("/TiVoContainer/Details/TotalItems").content).to eq("20")
+
+          expect(doc.xpath("/TiVoContainer/Item").size).to eq (8)
+
+          child_titles = doc.xpath("/TiVoContainer/Item/Details/Title").collect(&:content)
+          expect(child_titles).to match_array(["i8", "i9", "i10", "i11", "i12", "i13", "i14", "i15"])
+        end
 
       end
 

data/spec/subtitles_util_spec.rb

@@ -41,6 +41,7 @@ describe TivoHMO::SubtitlesUtil do
         subs = subject.subtitles_for_media_file("#{dir}/1.avi")
         expect(subs.size).to eq(0)
 
+        sleep 0.1
         FileUtils.touch("#{dir}/1.en.srt")
         sleep 0.5
 
@@ -55,6 +56,7 @@ describe TivoHMO::SubtitlesUtil do
         subs = subject.subtitles_for_media_file("#{dir}/1.avi")
         expect(subs.size).to eq(1)
 
+        sleep 0.1
         FileUtils.rm("#{dir}/1.en.srt")
         sleep 0.5
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tivohmo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -525,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for Tivo Home Media Option