sportsflix 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e3e233081098b65b21bb857b18eb53df61d411a
-  data.tar.gz: ce3371af4684c13aa6683d3076cac432ba8d8288
+  metadata.gz: bb9a1d07859f608240f1103490fdadda1b3264d6
+  data.tar.gz: f4d4da2073a805ee660b4f3fa9d0cd5c5fa761c4
 SHA512:
-  metadata.gz: aa25bff4c1a9453b2e141ba51d6822e5a2c8720abae410847430240b5b5a1cbf9117640bd31ad0dc45873de4317ecd875b4f0414f54f9382d98eabd06b7e9aae
-  data.tar.gz: b7d0d6a433bc54813c8bb29c399643bb9481b87e1e5f3b4d6a428ab14c79bc378a7d41784e9a59b5e414c51527b4342aaa7f559ab8dd218fbe8cce31f05c6d77
+  metadata.gz: 0bdd20c98fd01ad244033484b65bfca56d05b57f327d7f907fc0e6f65654ad86cab3f26f9137521587cbab03d7f4836b824084f4837aedbe5f7c8140cad02e70
+  data.tar.gz: ffb138a5d9ed0865b7844b08f451e561b1d8169cd9372c4c48a41386fce22a40ad413765fc50144c138815cc115ea754e8b6a8ab09ae8c878f36f4cd12ed1ee3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sportsflix (1.2.4)
+    sportsflix (1.2.5)
       execjs-fastnode (~> 0.2.0)
       oga (~> 2.8)
       thor (~> 0.19.4)

data/lib/sportsflix/cli.rb

@@ -13,6 +13,7 @@ module Sportsflix
     DEFAULT_VIDEO_PLAYER      = 'vlc'
     DEFAULT_VIDEO_PLAYER_PATH = DEFAULT_VIDEO_PLAYER
     DEFAULT_PROXY_DELAY       = 10
+    ACESTREAM_PROXY_IMAGES    = ['rtfpessoa/aceproxy:latest', 'ikatson/aceproxy:latest', 'zveronline/aceproxy:latest']
 
     class_option('verbose', {:type => :boolean, :default => false})
     class_option('offset', {:aliases => :o, :type => :numeric, :default => DEFAULT_OFFSET})
@@ -24,6 +25,7 @@ module Sportsflix
     class_option('server-only', {:aliases => :s, :type => :boolean, :default => false})
     class_option('proxy-delay', {:type => :numeric, :default => DEFAULT_PROXY_DELAY})
     class_option('server-ip', {:type => :string})
+    class_option('acestream-proxy-image', {:type => :string, :default => ACESTREAM_PROXY_IMAGES[0], :enum => ACESTREAM_PROXY_IMAGES})
 
     desc('watch', 'watch stream in the chosen player')
 

data/lib/sportsflix/players/proxies/acestream.rb

@@ -6,22 +6,21 @@ module Sportsflix
       module Acestream
         class Client
 
-          ACESTREAM_STREAM_URI_PREFIX    = 'acestream://'
-          ACESTREAM_PROXY_IMAGE_NAME     = ['ikatson/aceproxy', 'zveronline/aceproxy']
-          ACESTREAM_PROXY_IMAGE_NAME_IDX = 0
-          ACESTREAM_PROXY_DOCKER_NAME    = 'acestream'
+          ACESTREAM_STREAM_URI_PREFIX = 'acestream://'
+          ACESTREAM_PROXY_DOCKER_NAME = 'acestream'
 
           def initialize(options)
             @verbose      = options[:verbose]
             @video_format = options['video-format']
             @server_ip    = options['server-ip']
+            @proxy_image  = options['acestream-proxy-image']
 
             @executor = Sportsflix::Utils::Executor.new(options)
           end
 
           def start
-            @executor.run %{docker pull #{ACESTREAM_PROXY_IMAGE_NAME[ACESTREAM_PROXY_IMAGE_NAME_IDX]}}
-            @executor.run %{docker run -d -t -p 8000:8000 --name #{ACESTREAM_PROXY_DOCKER_NAME} #{ACESTREAM_PROXY_IMAGE_NAME[ACESTREAM_PROXY_IMAGE_NAME_IDX]}}
+            @executor.run %{docker pull #{@proxy_image}}
+            @executor.run %{docker run -d -t -p 8000:8000 --name #{ACESTREAM_PROXY_DOCKER_NAME} #{@proxy_image}}
           end
 
           def stop
@@ -36,7 +35,7 @@ module Sportsflix
 
           private
           def get_ip_from_host
-            ENV['DOCKER_HOST'].gsub(/tcp:\/\/(\S+?):.+/,'\1') if ENV['DOCKER_HOST']
+            ENV['DOCKER_HOST'].gsub(/tcp:\/\/(\S+?):.+/, '\1') if ENV['DOCKER_HOST']
           end
 
           def local_ip

data/lib/sportsflix/version.rb

@@ -1,3 +1,3 @@
 module Sportsflix
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportsflix
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Rodrigo Fernandes