tablo_connect 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b024f7790404954ac14c778ac0fa9a3831ed8f17
-  data.tar.gz: b90e132e3e0f0315721d14b52a869f4edb291134
+  metadata.gz: 31465bd7d2afd932a492da3cb6dcbceb60aaffda
+  data.tar.gz: e9c2fc111d540a9bcb2794e924ea8f89ec4401c0
 SHA512:
-  metadata.gz: 2aff0b9c2e3590da31dce8801716da909068088af2c0ef07aec62d2632fe4c9784923fabbef5d7b51c3084197e9d64bbaba6cf2f46f1a71fc14beddd946cd184
-  data.tar.gz: 2f6c2c7682dd16603f15a9ad10373c61378c106096307a01ad6c9126b8a25ecc0c9300a117b54af5ddc3473e58128b668bbb3f8424d9c7500042ccca9bc4a985
+  metadata.gz: 1257617683c66a08a877c42b65242755f4a269b13dda133230c478f38ead11b55815076b9d7f9bd0ac4a5fb39be5de530ab7359bb7f367dd1e03fc9e19c3f35b
+  data.tar.gz: 86febfc96596f98239c77dbf14236b2485874c27ada323b74355326a45f545a5a3c1082eae7841ce6d23190ab392bec554f5f8dafea155922ede93722f3077da

data/app/assets/javascripts/tablo_connect/ng_app/controllers/episodes_controller.js

@@ -2,7 +2,7 @@
   'use strict';
 
   angular.module('ac.tabloConnectApp')
-      .controller('EpisodesCtrl', ['$scope', '$stateParams', 'tabloBaseUrl', 'tabloService', 'alertsService', function ($scope, $stateParams, tabloBaseUrl, tabloService, alertsService) {
+      .controller('EpisodesCtrl', ['$scope', '$stateParams', 'tabloService', 'alertsService', function ($scope, $stateParams, tabloService, alertsService) {
         $scope.episodes = tabloService.episodeData();
         $scope.showTitle = $stateParams.showName;
         $scope.alerts = alertsService.getAlerts();

data/app/assets/javascripts/tablo_connect/ng_app/controllers/movies_controller.js

@@ -2,10 +2,9 @@
   'use strict';
 
   angular.module('ac.tabloConnectApp')
-      .controller('MoviesCtrl', ['$scope', 'tabloService', 'tabloBaseUrl', 'alertsService', function ($scope, tabloService, tabloBaseUrl, alertsService) {
+      .controller('MoviesCtrl', ['$scope', 'tabloService', 'alertsService', function ($scope, tabloService, alertsService) {
         $scope.movies = tabloService.movieData();
         $scope.alerts = alertsService.getAlerts();
-        $scope.tabloBaseUrl = tabloBaseUrl;
 
         $scope.copyRecording = function (movie) {
           alertsService.clearAlerts();

data/app/assets/javascripts/tablo_connect/ng_app/controllers/shows_controller.js

@@ -2,8 +2,7 @@
   'use strict';
 
   angular.module('ac.tabloConnectApp')
-      .controller('ShowsCtrl', ['$scope', 'tabloBaseUrl', 'tabloService', function ($scope, tabloBaseUrl, tabloService) {
+      .controller('ShowsCtrl', ['$scope', 'tabloService', function ($scope, tabloService) {
         $scope.shows = tabloService.showData();
-        $scope.tabloBaseUrl = tabloBaseUrl;
       }]);
 })(window.angular);

data/app/assets/javascripts/tablo_connect/ng_app/filters/url_filter.js

@@ -1,19 +1,27 @@
-(function(angular) {
-  'use strict';
+(function (angular) {
+    'use strict';
 
-  angular.module('ac.url', [])
-      .filter('urlencode', [function () {
-        return function (string) {
-          if (!!string) {
-            return encodeURIComponent(string);
-          }
-        };
-      }]).filter('urldecode', [function () {
-        return function (string) {
-          if (!!string) {
-            return decodeURIComponent(string);
-          }
-        };
-      }]);
+    angular.module('ac.url', [])
+        .filter('urlencode', [function () {
+            return function (string) {
+                if (!!string) {
+                    return encodeURIComponent(string);
+                }
+            };
+        }])
+        .filter('urldecode', [function () {
+            return function (string) {
+                if (!!string) {
+                    return decodeURIComponent(string);
+                }
+            };
+        }])
+        .filter('tabloBaseUrl', [function () {
+            return function (tabloIp) {
+                if (!!tabloIp) {
+                    return 'http://' + tabloIp + ':18080';
+                }
+            };
+        }]);
 
 })(window.angular);

data/app/assets/javascripts/tablo_connect/ng_app/services/tablo_service.js

@@ -41,22 +41,22 @@
           episodeData: function() {
             return episodeData;
           },
-          copyRecording: function (tabloId, type) {
+          copyRecording: function (recording, type) {
             return $http({
-              url: '/tablo/copy/' + tabloId + '/' + type,
+              url: '/tablo/copy/' + recording.tablo_id + '/' + type + '?tablo_ip=' + recording.tablo_ip,
               method: 'GET'
             });
           },
-          copyStatus: function (tabloId, type) {
+          copyStatus: function (recording, type) {
             return $http({
-              url: '/tablo/copy/' + tabloId + '/' + type + '/status',
+              url: '/tablo/copy/' + recording.tablo_id + '/' + type + '/status?tablo_ip=' + recording.tablo_ip,
               method: 'GET'
             });
           },
           initCopy: function (recording, type) {
             var self = this;
 
-            self.copyRecording(recording.tablo_id, type)
+            self.copyRecording(recording, type)
                 .success(function () {
                   recording.copy_status = 'in_progress';
                   $timeout(function () {
@@ -70,7 +70,7 @@
           pollStatus: function (recording, type) {
             var self = this;
 
-            self.copyStatus(recording.tablo_id, type)
+            self.copyStatus(recording, type)
                 .success(function (res) {
                   if (res.copy_status === 'in_progress') {
                     $timeout(function () {

data/app/assets/javascripts/tablo_connect/ng_app/templates/movies.html

@@ -14,7 +14,7 @@
         </thead>
         <tbody>
         <tr ng-repeat="movie in movies track by $index">
-            <td class="thumb"><img ng-src="{{tabloBaseUrl}}/stream/thumb?id={{movie.image_id}}"></td>
+            <td class="thumb"><img ng-src="{{movie.tablo_ip|tabloBaseUrl}}/stream/thumb?id={{movie.image_id}}"></td>
             <td ng-bind="movie.title"></td>
             <td ng-bind="movie.description"></td>
             <td ng-bind="movie.release_year"></td>

data/app/assets/javascripts/tablo_connect/ng_app/templates/shows.html

@@ -4,7 +4,7 @@
     <div ng-switch="!!shows">
         <div ng-switch-when="true">
             <a class="show-cell" ng-repeat="show in shows track by $index" ui-sref="episodes({showName: (show.show|urlencode)})">
-                <img ng-src="{{tabloBaseUrl}}/stream/thumb?id={{show.image_id}}" alt="{{show.show}}">
+                <img ng-src="{{show.tablo_ip|tabloBaseUrl}}/stream/thumb?id={{show.image_id}}" alt="{{show.show}}">
                 <div class="episode-count" ng-bind="show.count"></div>
             </a>
         </div>

data/app/controllers/tablo_connect/copy_controller.rb

@@ -29,12 +29,12 @@ module TabloConnect
                   return head :not_found if @item.nil?
               end
 
-      @item = model.find_by_tablo_id(params[:tablo_id])
+      @item = model.find_by_tablo_ip(params[:tablo_ip]).find_by_tablo_id(params[:tablo_id])
       head :not_found if @item.nil?
     end
 
     def source_path
-      "#{TabloConnect.tablo_base_url}/pvr/#{@item.tablo_id}/pl/playlist.m3u8"
+      "#{TabloConnect.tablo_base_url(@item.tablo_ip)}/pvr/#{@item.tablo_id}/pl/playlist.m3u8"
     end
 
     def destination_path

data/app/controllers/tablo_connect/sync_controller.rb

@@ -5,9 +5,12 @@ module TabloConnect
   class SyncController < ApplicationController
     def index
       begin
-        item_ids = parse_items
-        delete_removed item_ids
-        update_items(item_ids)
+        TabloConnect.tablo_ips.each do |ip|
+          item_ids = parse_items(ip)
+          delete_removed(ip, item_ids)
+          update_items(ip, item_ids)
+        end
+
         head :ok
       rescue => e
         render json: {error: e.to_s}, status: :internal_server_error
@@ -16,35 +19,35 @@ module TabloConnect
 
     private
 
-    def parse_items
-      page = Nokogiri::HTML(open("#{TabloConnect.tablo_base_url}/pvr/"))
+    def parse_items(tablo_ip)
+      page = Nokogiri::HTML(open("#{TabloConnect.tablo_base_url(tablo_ip)}/pvr/"))
       page.css('tbody a').map { |row|
         row[:href].gsub('/', '').to_i if row[:href].gsub('/', '') =~ /\A\d+\z/
       }.compact
     end
 
-    def delete_removed(new_ids)
-      old_ids = TabloConnect::Movie.select(:tablo_id).all + TabloConnect::Show.select(:tablo_id).all
-      delete_ids = old_ids.map {|i| i.tablo_id } - new_ids
+    def delete_removed(tablo_ip, new_ids)
+      old_ids = TabloConnect::Movie.find_by_tablo_ip(tablo_ip) + TabloConnect::Show.find_by_tablo_ip(tablo_ip)
+      delete_ids = old_ids.map { |i| i.tablo_id } - new_ids
 
-      TabloConnect::Movie.delete_by_tablo_id(delete_ids)
-      TabloConnect::Show.delete_by_tablo_id(delete_ids)
+      TabloConnect::Movie.find_by_tablo_ip(tablo_ip).delete_by_tablo_id(delete_ids)
+      TabloConnect::Show.find_by_tablo_ip(tablo_ip).delete_by_tablo_id(delete_ids)
     end
 
-    def update_items(tablo_ids)
+    def update_items(tablo_ip, tablo_ids)
       tablo_ids.each do |tablo_id|
-        details = recording_details tablo_id
+        details = recording_details(tablo_ip, tablo_id)
 
         if details[:recMovie].present?
-          update_movie(tablo_id, details)
+          update_movie(tablo_ip, tablo_id, details)
         elsif details[:recEpisode].present?
-          update_show(tablo_id, details)
+          update_show(tablo_ip, tablo_id, details)
         end
       end
     end
 
-    def update_movie(tablo_id, details)
-      item = TabloConnect::Movie.find_or_create_by(tablo_id: tablo_id)
+    def update_movie(tablo_ip, tablo_id, details)
+      item = TabloConnect::Movie.find_or_create_by(tablo_ip: tablo_ip, tablo_id: tablo_id)
       item.title = details.try(:[], :recMovie).try(:[], :jsonForClient).try(:[], :title)
       item.description = details.try(:[], :recMovie).try(:[], :jsonForClient).try(:[], :plot)
       item.release_year = details.try(:[], :recMovie).try(:[], :jsonForClient).try(:[], :releaseYear)
@@ -53,8 +56,8 @@ module TabloConnect
       item.save!
     end
 
-    def update_show(tablo_id, details)
-      item = TabloConnect::Show.find_or_create_by(tablo_id: tablo_id)
+    def update_show(tablo_ip, tablo_id, details)
+      item = TabloConnect::Show.find_or_create_by(tablo_ip: tablo_ip, tablo_id: tablo_id)
       item.show = details.try(:[], :recEpisode).try(:[], :jsonFromTribune).try(:[], :program).try(:[], :title)
       item.title = details.try(:[], :recEpisode).try(:[], :jsonFromTribune).try(:[], :program).try(:[], :episodeTitle)
       item.description = details.try(:[], :recEpisode).try(:[], :jsonFromTribune).try(:[], :program).try(:[], :longDescription)
@@ -66,8 +69,8 @@ module TabloConnect
       item.save!
     end
 
-    def recording_details(tablo_id)
-      JSON.parse(RestClient.get("#{TabloConnect.tablo_base_url}/pvr/#{tablo_id}/meta.txt")).with_indifferent_access
+    def recording_details(tablo_ip, tablo_id)
+      JSON.parse(RestClient.get("#{TabloConnect.tablo_base_url(tablo_ip)}/pvr/#{tablo_id}/meta.txt")).with_indifferent_access
     end
   end
 end

data/app/models/tablo_connect/movie.rb

@@ -1,11 +1,12 @@
 module TabloConnect
   class Movie < ActiveRecord::Base
-    validates_presence_of :tablo_id
-    validates_uniqueness_of :tablo_id
+    validates_presence_of :tablo_ip, :tablo_id
+    validates_uniqueness_of :tablo_ip, scope: :tablo_id
 
     enum copy_status: [:idle, :in_progress, :complete]
 
     scope :all_order_title, -> { self.all.order(:title) }
+    scope :find_by_tablo_ip, -> (tablo_ip) { where(tablo_ip: tablo_ip) }
 
     def self.delete_by_tablo_id(delete_ids)
       self.where(tablo_id: delete_ids).delete_all

data/app/models/tablo_connect/show.rb

@@ -1,18 +1,18 @@
 module TabloConnect
   class Show < ActiveRecord::Base
-    validates_presence_of :tablo_id
-    validates_uniqueness_of :tablo_id
+    validates_presence_of :tablo_ip, :tablo_id
+    validates_uniqueness_of :tablo_ip, scope: :tablo_id
 
     enum copy_status: [:idle, :in_progress, :complete]
 
     scope :shows, -> { group(:show).order(:show).count }
     scope :show_episodes, ->(show) { where(show: show).order(:season, :episode, :rec_date, :title) }
+    scope :find_by_tablo_ip, -> (tablo_ip) { where(tablo_ip: tablo_ip) }
 
     def self.shows_with_image_id
       self.shows.map { |show|
-        image_id = self.select(:image_id).distinct(:image_id).where({show: show[0]}).order(image_id: :desc).limit(1)[0].try(:[], :image_id)
-
-        {show: show[0], count: show[1], image_id: image_id}
+        image_data = self.select(:image_id, :tablo_ip).distinct(:image_id).where({show: show[0]}).order(image_id: :desc).limit(1).first
+        {show: show[0], count: show[1], image_id: image_data.try(:[], :image_id), tablo_ip: image_data.try(:[], :tablo_ip)}
       }
     end
 

data/app/views/layouts/tablo_connect/application.html.erb

@@ -10,10 +10,6 @@
 <div class="container-fluid">
   <%= yield %>
 </div>
-
 <%= javascript_include_tag "tablo_connect/application" %>
-<script>
-  angular.module('ac.tabloConnectApp').constant('tabloBaseUrl', '<%= "http://#{TabloConnect.tablo_ip}:#{TabloConnect.tablo_port}" %>')
-</script>
 </body>
 </html>

data/db/migrate/20151109173418_add_tablo_ip_to_tablo_connect_shows.rb

@@ -0,0 +1,7 @@
+class AddTabloIpToTabloConnectShows < ActiveRecord::Migration
+  def change
+    add_column :tablo_connect_shows, :tablo_ip, :string
+    remove_index :tablo_connect_shows, :tablo_id
+    add_index :tablo_connect_shows, [:tablo_ip, :tablo_id], :unique => true
+  end
+end

data/db/migrate/20151109173427_add_tablo_ip_to_tablo_connect_movies.rb

@@ -0,0 +1,7 @@
+class AddTabloIpToTabloConnectMovies < ActiveRecord::Migration
+  def change
+    add_column :tablo_connect_movies, :tablo_ip, :string
+    remove_index :tablo_connect_movies, :tablo_id
+    add_index :tablo_connect_movies, [:tablo_ip, :tablo_id], :unique => true
+  end
+end

data/lib/tablo_connect.rb

@@ -1,7 +1,7 @@
 require "tablo_connect/engine"
 
 module TabloConnect
-  def self.tablo_base_url
-    "http://#{TabloConnect.tablo_ip}:#{TabloConnect.tablo_port}"
+  def self.tablo_base_url(tablo_ip)
+    "http://#{tablo_ip}:#{TabloConnect.tablo_port}"
   end
 end

data/lib/tablo_connect/engine.rb

@@ -9,8 +9,8 @@ module TabloConnect
   end
 
   class << self
-    mattr_accessor :tablo_ip
-    self.tablo_ip = '192.168.1.99'
+    mattr_accessor :tablo_ips
+    self.tablo_ips = ['127.0.0.1']
 
     mattr_accessor :tablo_port
     self.tablo_port = '180809'

data/lib/tablo_connect/version.rb

@@ -1,3 +1,3 @@
 module TabloConnect
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/controllers/tablo_connect/copy_controller_spec.rb

@@ -15,32 +15,32 @@ module TabloConnect
 
       context "when the item is not found" do
         it "returns a 404" do
-          get :index, {tablo_id: 99999, type: 'some_type'}
+          get :index, {tablo_ip: show.tablo_ip, tablo_id: 99999, type: 'some_type'}
           expect(response.status).to eq 404
         end
       end
 
       context "when the item is found" do
         it "returns a 200" do
-          get :index, {tablo_id: show.tablo_id, type: 'show'}
+          get :index, {tablo_ip: TabloConnect.tablo_ips[0], tablo_id: show.tablo_id, type: 'show'}
           expect(response.status).to eq 200
         end
 
         it "calls spawn" do
           expect(controller).to receive(:spawn)
-          get :index, {tablo_id: show.tablo_id, type: 'show'}
+          get :index, {tablo_ip: TabloConnect.tablo_ips[0], tablo_id: show.tablo_id, type: 'show'}
         end
 
         it "sets the copy_status to in_progress" do
           item = TabloConnect::Show.find_by_tablo_id show.tablo_id
           expect(item.copy_status).to eq('idle')
-          get :index, {tablo_id: show.tablo_id, type: 'show'}
+          get :index, {tablo_ip: TabloConnect.tablo_ips[0], tablo_id: show.tablo_id, type: 'show'}
           item.reload
           expect(item.copy_status).to eq('in_progress')
         end
 
         it "returns an object with a shows array" do
-          get :index, {tablo_id: show.tablo_id, type: 'show'}
+          get :index, {tablo_ip: TabloConnect.tablo_ips[0], tablo_id: show.tablo_id, type: 'show'}
           json_body = JSON.parse(response.body).with_indifferent_access
           expect(json_body).to match({pid: 1234, destination: '/tmp/output.mp4'})
         end
@@ -50,16 +50,16 @@ module TabloConnect
     describe "GET status" do
       it "calls file_copy_status" do
         expect(controller).to receive(:file_copy_status)
-        get :status, {tablo_id: show.tablo_id, type: 'show'}
+        get :status, {tablo_ip: TabloConnect.tablo_ips[0], tablo_id: show.tablo_id, type: 'show'}
       end
 
       it "returns a 200 status code" do
-        get :status, {tablo_id: show.tablo_id, type: 'show'}
+        get :status, {tablo_ip: TabloConnect.tablo_ips[0], tablo_id: show.tablo_id, type: 'show'}
         expect(response.status).to eq 200
       end
 
       it "returns a JSON object with the copy_status" do
-        get :status, {tablo_id: show.tablo_id, type: 'show'}
+        get :status, {tablo_ip: TabloConnect.tablo_ips[0], tablo_id: show.tablo_id, type: 'show'}
         json_body = JSON.parse(response.body).with_indifferent_access
         expect(json_body[:copy_status]).to eq show.copy_status
       end
@@ -72,7 +72,7 @@ module TabloConnect
 
       context "when the type is not show or movie" do
         it "returns a 404" do
-          allow(controller).to receive(:params).and_return({tablo_id: show.tablo_id, type: 'invalid_type'})
+          allow(controller).to receive(:params).and_return({tablo_ip: TabloConnect.tablo_ips[0], tablo_id: show.tablo_id, type: 'invalid_type'})
           expect(controller).to receive(:head).with(:not_found)
           controller.send(:set_item)
         end
@@ -81,7 +81,7 @@ module TabloConnect
       context "when the type is 'show' or 'movie'" do
         context "when the type is 'movie'" do
           it "uses the Movie model" do
-            allow(controller).to receive(:params).and_return({tablo_id: show.tablo_id, type: 'movie'})
+            allow(controller).to receive(:params).and_return({tablo_ip: show.tablo_ip, tablo_id: show.tablo_id, type: 'movie'})
             expect(TabloConnect::Movie).to receive(:find_by_tablo_id).with(show.tablo_id)
             controller.send(:set_item)
           end
@@ -89,7 +89,7 @@ module TabloConnect
 
         context "when the type is 'show'" do
           it "uses the Show model" do
-            allow(controller).to receive(:params).and_return({tablo_id: show.tablo_id, type: 'show'})
+            allow(controller).to receive(:params).and_return({tablo_ip: show.tablo_ip, tablo_id: show.tablo_id, type: 'show'})
             expect(TabloConnect::Show).to receive(:find_by_tablo_id).with(show.tablo_id)
             controller.send(:set_item)
           end
@@ -97,14 +97,14 @@ module TabloConnect
 
         context "when the item is not found" do
           it "returns a 404" do
-            allow(controller).to receive(:params).and_return({tablo_id: 99999, type: 'show'})
+            allow(controller).to receive(:params).and_return({tablo_ip: show.tablo_ip, tablo_id: 99999, type: 'show'})
             controller.send(:set_item)
           end
         end
 
         context "when the item is found" do
           it "sets the @item instance variable" do
-            allow(controller).to receive(:params).and_return({tablo_id: show.tablo_id, type: 'show'})
+            allow(controller).to receive(:params).and_return({tablo_ip: show.tablo_ip, tablo_id: show.tablo_id, type: 'show'})
             controller.send(:set_item)
             item = controller.instance_variable_get(:@item)
             expect(item).to match(show)
@@ -117,7 +117,7 @@ module TabloConnect
       it "builds the source_path with the tablo_id" do
         controller.instance_variable_set(:@item, show)
         path = controller.send(:source_path)
-        expect(path).to eq "#{TabloConnect.tablo_base_url}/pvr/#{show.tablo_id}/pl/playlist.m3u8"
+        expect(path).to eq "#{TabloConnect.tablo_base_url(show.tablo_ip)}/pvr/#{show.tablo_id}/pl/playlist.m3u8"
       end
     end