hktv 1.0.1 → 1.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/hktv.rb +7 -15
- data/lib/hktv/command.rb +6 -1
- data/lib/hktv/version.rb +1 -1
- data/spec/spec_helper.rb +5 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a2c34f24b4c46d0c380d837409d3f7d27780a880
|
4
|
+
data.tar.gz: 000e23229b54648023fdf792cdd3c9563fde8b68
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bd45546215d8d851721bd3f4f8892164981d212dd3833ee82c3e9072e566906c7598df4693be9b99c20d89626f4ecc27083022208ef0ef6b58dca0540e6165e3
|
7
|
+
data.tar.gz: d2d062538db56b4922a90ec2b0e6bb9c39c3f203f73b35daa22aa5b0831156aeb1f5650bcba0f7682c4d5ce11d0d13a7b1ba0d5cf46b554bc25c47845fcdffde
|
data/README.md
CHANGED
data/lib/hktv.rb
CHANGED
@@ -53,7 +53,7 @@ class HKTV
|
|
53
53
|
|
54
54
|
# return true if client has authenticated, false otherwise
|
55
55
|
def authenticated?
|
56
|
-
if
|
56
|
+
if expired?
|
57
57
|
@access_token = nil
|
58
58
|
@expires_date = nil
|
59
59
|
@refresh_token = nil
|
@@ -62,6 +62,10 @@ class HKTV
|
|
62
62
|
!@access_token.nil?
|
63
63
|
end
|
64
64
|
|
65
|
+
def expired?
|
66
|
+
!@expires_date || Time.now > @expires_date
|
67
|
+
end
|
68
|
+
|
65
69
|
# return true if client needs ott token
|
66
70
|
def needs_ott_token?
|
67
71
|
return @ott_token.nil? || (@ott_expires_date && Time.now > @ott_expires_date)
|
@@ -76,7 +80,7 @@ class HKTV
|
|
76
80
|
"password" => password
|
77
81
|
}
|
78
82
|
|
79
|
-
auth =
|
83
|
+
auth = self.class.post("https://www.hktvmall.com:443/hktvwebservices/oauth/token?rand=#{Time.now.to_i}", body: options, basic_auth: {username: API_USERNAME, password: API_PASSWORD})
|
80
84
|
@access_token = auth["access_token"]
|
81
85
|
@expires_date = Time.now + auth["expires_in"]
|
82
86
|
@refresh_token = auth["refresh_token"]
|
@@ -90,7 +94,7 @@ class HKTV
|
|
90
94
|
# hktv api just fail for unknown reason, retry to workaround it
|
91
95
|
Retriable.retriable(tries: 20, base_interval: 1.0) do
|
92
96
|
if authenticated?
|
93
|
-
result =
|
97
|
+
result = self.class.get("https://www.hktvmall.com:443/hktvwebservices/v1/hktv/ott/token?rand=#{Time.now.to_i}", headers: headers)
|
94
98
|
else
|
95
99
|
ts = Time.now.to_i
|
96
100
|
options = {
|
@@ -223,18 +227,6 @@ class HKTV
|
|
223
227
|
end
|
224
228
|
end
|
225
229
|
|
226
|
-
def post_json(path, options={})
|
227
|
-
response = self.class.post(path, options)
|
228
|
-
data = response.body
|
229
|
-
JSON.parse(data)
|
230
|
-
end
|
231
|
-
|
232
|
-
def get_json(path, options={})
|
233
|
-
response = self.class.get(path, options)
|
234
|
-
data = response.body
|
235
|
-
JSON.parse(data)
|
236
|
-
end
|
237
|
-
|
238
230
|
def sign_request(path, timestamp, params=[])
|
239
231
|
return Digest::MD5.hexdigest(path + params.join("") + API_SECRET + timestamp.to_s)
|
240
232
|
end
|
data/lib/hktv/command.rb
CHANGED
@@ -106,6 +106,11 @@ class HKTV
|
|
106
106
|
|
107
107
|
c.action do |args, options|
|
108
108
|
hktv = self.load
|
109
|
+
|
110
|
+
if hktv.expired?
|
111
|
+
puts "Login expired! Run \"hktv login\" first."
|
112
|
+
raise "Login Expired"
|
113
|
+
end
|
109
114
|
|
110
115
|
unless hktv.authenticated?
|
111
116
|
puts "You have not login! Try \"hktv login\""
|
@@ -118,7 +123,7 @@ class HKTV
|
|
118
123
|
|
119
124
|
filename = filename_with_title(title, ".mp4") if filename.nil?
|
120
125
|
programs = extract_root_videos(hktv.programs)
|
121
|
-
programs = programs.select {|program| program["title"].include?(title) }
|
126
|
+
programs = programs.select {|program| program["title"].start_with?(title) } || programs.select {|program| program["title"].include?(title) }
|
122
127
|
|
123
128
|
if programs.size == 0
|
124
129
|
puts "No video matching \"#{title}\""
|
data/lib/hktv/version.rb
CHANGED
data/spec/spec_helper.rb
CHANGED
@@ -14,12 +14,15 @@ VCR.configure do |c|
|
|
14
14
|
i.request.uri.sub!(/:\/\/.*#{Regexp.escape(u.host)}/, "://#{u.host}" )
|
15
15
|
end
|
16
16
|
|
17
|
+
username = ENV["HKTV_USER_NAME"] ? ENV["HKTV_USER_NAME"] : "<username>"
|
18
|
+
password = ENV["HKTV_PASSWORD"] ? ENV["HKTV_PASSWORD"] : "<password>"
|
19
|
+
|
17
20
|
c.filter_sensitive_data('<HKTV_PASSWORD>') do
|
18
|
-
CGI.escape
|
21
|
+
CGI.escape password
|
19
22
|
end
|
20
23
|
|
21
24
|
c.filter_sensitive_data('<HKTV_USER_NAME>') do
|
22
|
-
CGI.escape
|
25
|
+
CGI.escape username
|
23
26
|
end
|
24
27
|
|
25
28
|
# Matches authenticated requests regardless of their Basic auth string (https://user:pass@domain.tld)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hktv
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Francis Chong
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-04-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|