sportsflix 1.2.4 → 1.2.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/sportsflix/cli.rb +2 -0
- data/lib/sportsflix/players/proxies/acestream.rb +6 -7
- data/lib/sportsflix/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bb9a1d07859f608240f1103490fdadda1b3264d6
|
4
|
+
data.tar.gz: f4d4da2073a805ee660b4f3fa9d0cd5c5fa761c4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0bdd20c98fd01ad244033484b65bfca56d05b57f327d7f907fc0e6f65654ad86cab3f26f9137521587cbab03d7f4836b824084f4837aedbe5f7c8140cad02e70
|
7
|
+
data.tar.gz: ffb138a5d9ed0865b7844b08f451e561b1d8169cd9372c4c48a41386fce22a40ad413765fc50144c138815cc115ea754e8b6a8ab09ae8c878f36f4cd12ed1ee3
|
data/Gemfile.lock
CHANGED
data/lib/sportsflix/cli.rb
CHANGED
@@ -13,6 +13,7 @@ module Sportsflix
|
|
13
13
|
DEFAULT_VIDEO_PLAYER = 'vlc'
|
14
14
|
DEFAULT_VIDEO_PLAYER_PATH = DEFAULT_VIDEO_PLAYER
|
15
15
|
DEFAULT_PROXY_DELAY = 10
|
16
|
+
ACESTREAM_PROXY_IMAGES = ['rtfpessoa/aceproxy:latest', 'ikatson/aceproxy:latest', 'zveronline/aceproxy:latest']
|
16
17
|
|
17
18
|
class_option('verbose', {:type => :boolean, :default => false})
|
18
19
|
class_option('offset', {:aliases => :o, :type => :numeric, :default => DEFAULT_OFFSET})
|
@@ -24,6 +25,7 @@ module Sportsflix
|
|
24
25
|
class_option('server-only', {:aliases => :s, :type => :boolean, :default => false})
|
25
26
|
class_option('proxy-delay', {:type => :numeric, :default => DEFAULT_PROXY_DELAY})
|
26
27
|
class_option('server-ip', {:type => :string})
|
28
|
+
class_option('acestream-proxy-image', {:type => :string, :default => ACESTREAM_PROXY_IMAGES[0], :enum => ACESTREAM_PROXY_IMAGES})
|
27
29
|
|
28
30
|
desc('watch', 'watch stream in the chosen player')
|
29
31
|
|
@@ -6,22 +6,21 @@ module Sportsflix
|
|
6
6
|
module Acestream
|
7
7
|
class Client
|
8
8
|
|
9
|
-
ACESTREAM_STREAM_URI_PREFIX
|
10
|
-
|
11
|
-
ACESTREAM_PROXY_IMAGE_NAME_IDX = 0
|
12
|
-
ACESTREAM_PROXY_DOCKER_NAME = 'acestream'
|
9
|
+
ACESTREAM_STREAM_URI_PREFIX = 'acestream://'
|
10
|
+
ACESTREAM_PROXY_DOCKER_NAME = 'acestream'
|
13
11
|
|
14
12
|
def initialize(options)
|
15
13
|
@verbose = options[:verbose]
|
16
14
|
@video_format = options['video-format']
|
17
15
|
@server_ip = options['server-ip']
|
16
|
+
@proxy_image = options['acestream-proxy-image']
|
18
17
|
|
19
18
|
@executor = Sportsflix::Utils::Executor.new(options)
|
20
19
|
end
|
21
20
|
|
22
21
|
def start
|
23
|
-
@executor.run %{docker pull #{
|
24
|
-
@executor.run %{docker run -d -t -p 8000:8000 --name #{ACESTREAM_PROXY_DOCKER_NAME} #{
|
22
|
+
@executor.run %{docker pull #{@proxy_image}}
|
23
|
+
@executor.run %{docker run -d -t -p 8000:8000 --name #{ACESTREAM_PROXY_DOCKER_NAME} #{@proxy_image}}
|
25
24
|
end
|
26
25
|
|
27
26
|
def stop
|
@@ -36,7 +35,7 @@ module Sportsflix
|
|
36
35
|
|
37
36
|
private
|
38
37
|
def get_ip_from_host
|
39
|
-
ENV['DOCKER_HOST'].gsub(/tcp:\/\/(\S+?):.+/,'\1') if ENV['DOCKER_HOST']
|
38
|
+
ENV['DOCKER_HOST'].gsub(/tcp:\/\/(\S+?):.+/, '\1') if ENV['DOCKER_HOST']
|
40
39
|
end
|
41
40
|
|
42
41
|
def local_ip
|
data/lib/sportsflix/version.rb
CHANGED