tivohmo 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1dd209625032c02880d0be351f2455545e10bba
-  data.tar.gz: 37f59ce8d6b891f3205c92a1e2db38b4f4b09fca
+  metadata.gz: d174442bc2cdc54f0c321af10235ca9b7b0cd5e6
+  data.tar.gz: 9879d1b6792705f0838f2f9a12c7fd00f4b1bc1e
 SHA512:
-  metadata.gz: 6594266dc18d59842e0fa8966507094821322fb8325451b01c6d7f7d607a7aab6503ce567fd976a3b579eb663aeaea6bab9990cd44d22992de4445896bc353c9
-  data.tar.gz: 5b1757fa7d5cbd2d4150a1ce93daf2b4c955ecf365264ebcb9bc6176efcc7ed239762541f1e0c4057eb5e7bd1e6dd8f9bb261c3613bdeff5f33abe391eba289f
+  metadata.gz: 82fb8a7e0deb9d7d62be6b8809264dabaf1c23d776d53fa7ea90a0094a99ad354e97ef676663c863b6620ec5a13820b88a8449af865e036f0d7a0e430e4fcd8f
+  data.tar.gz: fdcae9f54909c5122e99fe76528f3690f58f67cbc0853c535b51100faa3a4ff5eb6caf2c3688a84c968ee581e44cc14899d206252351a3764689ff5b88b7c0f7

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

@@ -25,7 +25,12 @@ module TivoHMO
         def children
           synchronize do
             if super.blank?
-              Array(server.library.sections).each do |section|
+              sections = Array(server.library.sections)
+              # Sort by title descending so that creation times are
+              # correct for tivo sort of newest first (Time.now for
+              # created_at in Section)
+              sections = sections.sort_by(&:title).reverse
+              sections.each do |section|
                 add_child(Section.new(section))
               end
             end

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

@@ -26,7 +26,7 @@ module TivoHMO
           end
 
           self.modified_at = Time.at(delegate.updated_at.to_i)
-          self.created_at = Time.at(delegate.updated_at.to_i)
+          self.created_at = Time.now
         end
 
         def children

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

@@ -16,7 +16,8 @@ module TivoHMO
 
           self.title = delegate.title
           self.modified_at = Time.at(delegate.updated_at.to_i)
-          self.created_at = Time.at(delegate.added_at.to_i)
+          self.created_at = Time.parse(delegate.originally_available_at) rescue nil
+          self.created_at ||= Time.at(delegate.added_at.to_i)
         end
 
         def metadata
@@ -41,6 +42,10 @@ module TivoHMO
             # 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
 

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

@@ -16,7 +16,8 @@ module TivoHMO
 
           self.title = delegate.title
           self.modified_at = Time.at(delegate.updated_at.to_i)
-          self.created_at = Time.at(delegate.added_at.to_i)
+          self.created_at = Time.parse(delegate.originally_available_at) rescue nil
+          self.created_at ||= Time.at(delegate.added_at.to_i)
         end
 
         def metadata

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

@@ -20,7 +20,7 @@ module TivoHMO
           self.category_qualifier = category_qualifier
           self.title = category_type.to_s.titleize
           self.modified_at = Time.at(delegate.updated_at.to_i)
-          self.created_at = Time.at(delegate.updated_at.to_i)
+          self.created_at = Time.now
         end
 
         def children
@@ -35,7 +35,12 @@ module TivoHMO
             end
 
             if super.blank?
-              Array(delegate.send(category_qualifier)).each do |category_value|
+              qualified = Array(delegate.send(category_qualifier))
+              # Sort by title descending so that creation times are
+              # correct for tivo sort of newest first (Time.now for
+              # created_at in Category)
+              qualified = qualified.sort_by{|c| c[:title] }.reverse
+              qualified.each do |category_value|
                 add_child(Category.new(delegate, category_type, category_value))
               end
             end

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

@@ -17,24 +17,28 @@ module TivoHMO
 
           self.title = delegate.title
           self.modified_at = Time.at(delegate.updated_at.to_i)
-          self.created_at = Time.at(delegate.updated_at.to_i)
+          self.created_at = Time.now
         end
 
         def children
           synchronize do
             if super.blank?
-              add_child(Category.new(delegate, :recently_added))
+              # Tivo time sorting is reverse chronological (newest first), so
+              # order it here in reverse order so the creation time cause the
+              # right sorting ("all" is newest and comes first)
+              add_child(QualifiedCategory.new(delegate, :by_collection, :collections))
+              add_child(QualifiedCategory.new(delegate, :by_content_rating, :content_ratings))
+              add_child(QualifiedCategory.new(delegate, :by_folder, :folders))
+              add_child(QualifiedCategory.new(delegate, :by_genre, :genres))
+              add_child(QualifiedCategory.new(delegate, :by_year, :years))
+              add_child(QualifiedCategory.new(delegate, :by_first_character, :first_characters))
+
               #add_child(Category.new(delegate, :unwatched))
-              add_child(Category.new(delegate, :newest))
               add_child(Category.new(delegate, :on_deck))
+              add_child(Category.new(delegate, :newest))
               add_child(Category.new(delegate, :recently_viewed))
+              add_child(Category.new(delegate, :recently_added))
               add_child(Category.new(delegate, :all))
-              add_child(QualifiedCategory.new(delegate, :by_genre, :genres))
-              add_child(QualifiedCategory.new(delegate, :by_year, :years))
-              add_child(QualifiedCategory.new(delegate, :by_first_character, :first_characters))
-              add_child(QualifiedCategory.new(delegate, :by_collection, :collections))
-              add_child(QualifiedCategory.new(delegate, :by_folder, :folders))
-              add_child(QualifiedCategory.new(delegate, :by_content_rating, :content_ratings))
             end
           end
 

data/lib/tivohmo/beacon.rb

@@ -7,7 +7,7 @@ module TivoHMO
   class Beacon
     include GemLogger::LoggerSupport
 
-    def initialize(service_port, limit: -1, interval: 60)
+    def initialize(service_port, limit: -1, interval: 10)
       @interval = interval
       @limit = limit
       @uid = SecureRandom.uuid
@@ -23,7 +23,11 @@ module TivoHMO
         @running = true
         @broadcast_thread = Thread.new do
           while @running
-            broadcast
+            begin
+              broadcast
+            rescue => e
+              logger.log_exception(e, "Ignoring exception in beacon thread")
+            end
             sleep(@interval)
             @limit = @limit - 1
             break if @limit == 0

data/lib/tivohmo/server.rb

@@ -61,6 +61,19 @@ module TivoHMO
         headers['TiVo_TCD_ID']
       end
 
+      def select_all_items(children)
+        just_items = []
+        all = children.dup
+        all.each do |child|
+          if child.is_a?(TivoHMO::API::Container)
+            all.concat(child.children)
+          else
+            just_items << child
+          end
+        end
+        children = just_items.uniq {|node| node.identifier }
+      end
+
       def sort(items, sort_order)
         sort_order = sort_order.split(/\s*,\s*/)
 
@@ -181,7 +194,8 @@ module TivoHMO
       item_count = (params['ItemCount'] || 8).to_i
 
       # Yes or No, default no
-      recurse = (params['Recurse'] == 'Yes')
+      # TODO: fix this when tivo side is fixed or config mechanism added to globally disable recurse
+      recurse = false #(params['Recurse'] == 'Yes')
 
       # csv of Type, Title, CreationDate, LastChangeDate, Random
       # reverse with preceding !
@@ -216,6 +230,9 @@ module TivoHMO
           halt 404, "No container found for #{container_path}" unless container
 
           children = container.children
+
+          children = select_all_items(children) if recurse
+
           children = sort(children, sort_order) if sort_order
 
           if anchor_item

data/lib/tivohmo/version.rb

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

data/spec/adapters/plex/category_spec.rb

@@ -8,15 +8,19 @@ describe TivoHMO::Adapters::Plex::Category do
   describe "#initialize" do
 
     it "should instantiate" do
-      category = described_class.new(plex_delegate, :newest)
-      expect(category).to be_a described_class
-      expect(category).to be_a TivoHMO::API::Container
-      expect(category.category_type).to eq(:newest)
-      expect(category.category_value).to be_nil
-      expect(category.title).to eq('Newest')
-      expect(category.identifier).to eq(plex_delegate.key)
-      expect(category.modified_at).to eq(Time.at(plex_delegate.updated_at))
-      expect(category.created_at).to eq(Time.at(plex_delegate.added_at))
+      now = Time.now
+      Timecop.freeze(now) do
+        category = described_class.new(plex_delegate, :newest)
+        expect(category).to be_a described_class
+        expect(category).to be_a TivoHMO::API::Container
+        expect(category.category_type).to eq(:newest)
+        expect(category.category_value).to be_nil
+        expect(category.title).to eq('Newest')
+        expect(category.identifier).to eq(plex_delegate.key)
+        expect(category.modified_at).to eq(Time.at(plex_delegate.updated_at))
+        expect(category.created_at).to eq(now)
+      end
+
     end
 
     it "should use_category_value for title if present" do
@@ -32,7 +36,7 @@ describe TivoHMO::Adapters::Plex::Category do
   describe "#children" do
 
     it "should memoize" do
-      listing = [plex_stub(::Plex::Movie)]
+      listing = [plex_stub(::Plex::Movie, originally_available_at: "2013-01-02")]
       allow(plex_delegate).to receive(:newest).and_return(listing)
       section = described_class.new(plex_delegate, :newest)
       expect(section.children.object_id).to eq(section.children.object_id)
@@ -40,8 +44,8 @@ describe TivoHMO::Adapters::Plex::Category do
 
     it "should have children" do
       listing = [
-          plex_stub(::Plex::Movie),
-          plex_stub(::Plex::Episode),
+          plex_stub(::Plex::Movie, originally_available_at: "2013-01-02"),
+          plex_stub(::Plex::Episode, originally_available_at: "2013-01-02"),
           plex_stub(::Plex::Show)
       ]
       allow(plex_delegate).to receive(:newest).and_return(listing)
@@ -51,8 +55,8 @@ describe TivoHMO::Adapters::Plex::Category do
 
     it "should use category_value for children" do
       listing = [
-          plex_stub(::Plex::Movie),
-          plex_stub(::Plex::Episode),
+          plex_stub(::Plex::Movie, originally_available_at: "2013-01-02"),
+          plex_stub(::Plex::Episode, originally_available_at: "2013-01-02"),
           plex_stub(::Plex::Show)
       ]
       cval = {title: 'Title', key: 'key'}

data/spec/adapters/plex/episode_spec.rb

@@ -20,7 +20,7 @@ describe TivoHMO::Adapters::Plex::Episode do
       expect(episode.title).to eq(plex_delegate.title)
       expect(episode.identifier).to eq(plex_delegate.key)
       expect(episode.modified_at).to eq(Time.at(plex_delegate.updated_at))
-      expect(episode.created_at).to eq(Time.at(plex_delegate.added_at))
+      expect(episode.created_at).to eq(Time.parse(plex_delegate.originally_available_at))
     end
 
   end

data/spec/adapters/plex/movie_spec.rb

@@ -16,7 +16,7 @@ describe TivoHMO::Adapters::Plex::Movie do
       expect(movie.title).to eq(plex_delegate.title)
       expect(movie.identifier).to eq(plex_delegate.key)
       expect(movie.modified_at).to eq(Time.at(plex_delegate.updated_at))
-      expect(movie.created_at).to eq(Time.at(plex_delegate.added_at))
+      expect(movie.created_at).to eq(Time.parse(plex_delegate.originally_available_at))
     end
 
   end

data/spec/adapters/plex/qualified_category_spec.rb

@@ -9,15 +9,18 @@ describe TivoHMO::Adapters::Plex::QualifiedCategory do
   describe "#initialize" do
 
     it "should instantiate" do
-      qcat = described_class.new(plex_delegate, :by_year, '2000')
-      expect(qcat).to be_a described_class
-      expect(qcat).to be_a TivoHMO::API::Container
-      expect(qcat.title).to eq("By Year")
-      expect(qcat.category_qualifier).to eq('2000')
-      expect(qcat.title).to eq("By Year")
-      expect(qcat.identifier).to eq(plex_delegate.key)
-      expect(qcat.modified_at).to eq(Time.at(plex_delegate.updated_at))
-      expect(qcat.created_at).to eq(Time.at(plex_delegate.added_at))
+      now = Time.now
+      Timecop.freeze(now) do
+        qcat = described_class.new(plex_delegate, :by_year, '2000')
+        expect(qcat).to be_a described_class
+        expect(qcat).to be_a TivoHMO::API::Container
+        expect(qcat.title).to eq("By Year")
+        expect(qcat.category_qualifier).to eq('2000')
+        expect(qcat.title).to eq("By Year")
+        expect(qcat.identifier).to eq(plex_delegate.key)
+        expect(qcat.modified_at).to eq(Time.at(plex_delegate.updated_at))
+        expect(qcat.created_at).to eq(now)
+      end
     end
 
   end
@@ -43,7 +46,9 @@ describe TivoHMO::Adapters::Plex::QualifiedCategory do
       expect(section.children.size).to eq(2)
       expect(section.children[0]).to be_instance_of(TivoHMO::Adapters::Plex::Category)
       expect(section.children[0].category_type).to be(:by_year)
-      expect(section.children[0].category_value).to eq(listing[0])
+      # reverse order due to sorting by title reversed to work with tivo newest first sorting
+      expect(section.children[0].category_value).to eq(listing[1])
+      expect(section.children[1].category_value).to eq(listing[0])
     end
 
   end

data/spec/adapters/plex/section_spec.rb

@@ -8,13 +8,16 @@ describe TivoHMO::Adapters::Plex::Section do
   describe "#initialize" do
 
     it "should instantiate" do
-      section = described_class.new(plex_delegate)
-      expect(section).to be_a described_class
-      expect(section).to be_a TivoHMO::API::Container
-      expect(section.title).to eq(plex_delegate.title)
-      expect(section.identifier).to eq(plex_delegate.key)
-      expect(section.modified_at).to eq(Time.at(plex_delegate.updated_at))
-      expect(section.created_at).to eq(Time.at(plex_delegate.added_at))
+      now = Time.now
+      Timecop.freeze(now) do
+        section = described_class.new(plex_delegate)
+        expect(section).to be_a described_class
+        expect(section).to be_a TivoHMO::API::Container
+        expect(section.title).to eq(plex_delegate.title)
+        expect(section.identifier).to eq(plex_delegate.key)
+        expect(section.modified_at).to eq(Time.at(plex_delegate.updated_at))
+        expect(section.created_at).to eq(now)
+      end
     end
 
   end
@@ -30,7 +33,7 @@ describe TivoHMO::Adapters::Plex::Section do
       section = described_class.new(plex_delegate)
       expect(section.children.size).to eq(11)
       classes = [TivoHMO::Adapters::Plex::Category, TivoHMO::Adapters::Plex::QualifiedCategory]
-      expect(section.children.collect(&:class).uniq).to eq(classes)
+      expect(section.children.collect(&:class).uniq.sort_by(&:name)).to eq(classes.sort_by(&:name))
     end
 
   end

data/spec/beacon_spec.rb

@@ -9,7 +9,7 @@ describe TivoHMO::Beacon do
       beacon = described_class.new(1234)
       expect(beacon).to be_a described_class
       expect(beacon.instance_variable_get(:@limit)).to eq(-1)
-      expect(beacon.instance_variable_get(:@interval)).to eq(60)
+      expect(beacon.instance_variable_get(:@interval)).to eq(10)
       expect(beacon.instance_variable_get(:@services)).to eq(['TiVoMediaServer:1234/http'])
     end
 

data/spec/server_spec.rb

@@ -288,6 +288,33 @@ describe TivoHMO::Server do
 
       end
 
+      describe "recursing" do
+
+        before(:each) do
+          other_container = container.add_child(TestAPI::Container.new("c2"))
+          other_container.add_child(TestAPI::Item.new("i2")) # dupe child
+          other_container.add_child(TestAPI::Item.new("i98")) # unique child
+
+          third_container = other_container.add_child(TestAPI::Container.new("c3"))
+          other_container.add_child(TestAPI::Item.new("i99")) # unique child
+          other_container.add_child(TestAPI::Item.new("i3")) # dupe child
+
+          3.times do |i|
+            container.add_child(TestAPI::Item.new("i#{i + 2}"))
+          end
+        end
+
+        it "recurses all items uniquely" do
+          skip "recurse disabled because tivo forces it on initially (no memory)"
+          get "/TiVoConnect?Command=QueryContainer&Container=/a1/c1&Recurse=Yes"
+          expect(last_response.status).to eq(200)
+          doc = Nokogiri::XML(last_response.body)
+          child_titles = doc.xpath("/TiVoContainer/Item/Details/Title").collect(&:content)
+          expect(child_titles).to eq(["i1", "i2", "i3", "i4", "i98", "i99"])
+        end
+
+      end
+
       describe "sorting" do
 
         before(:each) do

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ require 'rspec'
 RSpec.configure do |config|
 end
 
+require 'timecop'
+
 require 'coveralls'
 Coveralls.wear!
 

data/tivohmo.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "timecop"
 
   # core dependencies
   spec.add_dependency "activesupport"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tivohmo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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