mirror of
https://github.com/cyberarm/w3d_hub_linux_launcher.git
synced 2026-03-22 20:26:16 +00:00
Compare commits
4 Commits
44483117d8
...
46dece0479
| Author | SHA1 | Date | |
|---|---|---|---|
| 46dece0479 | |||
| 68af00bd2f | |||
| 208f2b8a39 | |||
| b5d975761c |
12
Gemfile.lock
12
Gemfile.lock
@@ -1,13 +1,13 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
async (2.35.2)
|
async (2.36.0)
|
||||||
console (~> 1.29)
|
console (~> 1.29)
|
||||||
fiber-annotation
|
fiber-annotation
|
||||||
io-event (~> 1.11)
|
io-event (~> 1.11)
|
||||||
metrics (~> 0.12)
|
metrics (~> 0.12)
|
||||||
traces (~> 0.18)
|
traces (~> 0.18)
|
||||||
async-http (0.94.0)
|
async-http (0.94.2)
|
||||||
async (>= 2.10.2)
|
async (>= 2.10.2)
|
||||||
async-pool (~> 0.11)
|
async-pool (~> 0.11)
|
||||||
io-endpoint (~> 0.14)
|
io-endpoint (~> 0.14)
|
||||||
@@ -30,7 +30,7 @@ GEM
|
|||||||
fiber-annotation
|
fiber-annotation
|
||||||
fiber-local (~> 1.1)
|
fiber-local (~> 1.1)
|
||||||
json
|
json
|
||||||
cyberarm_engine (0.25.0)
|
cyberarm_engine (0.25.1)
|
||||||
gosu (~> 1.1)
|
gosu (~> 1.1)
|
||||||
digest-crc (0.7.0)
|
digest-crc (0.7.0)
|
||||||
rake (>= 12.0.0, < 14.0.0)
|
rake (>= 12.0.0, < 14.0.0)
|
||||||
@@ -43,7 +43,7 @@ GEM
|
|||||||
fiber-storage (1.0.1)
|
fiber-storage (1.0.1)
|
||||||
fiddle (1.1.8)
|
fiddle (1.1.8)
|
||||||
gosu (1.4.6)
|
gosu (1.4.6)
|
||||||
io-endpoint (0.16.0)
|
io-endpoint (0.17.1)
|
||||||
io-event (1.14.2)
|
io-event (1.14.2)
|
||||||
io-stream (0.11.1)
|
io-stream (0.11.1)
|
||||||
ircparser (1.0.0)
|
ircparser (1.0.0)
|
||||||
@@ -52,8 +52,8 @@ GEM
|
|||||||
fiddle
|
fiddle
|
||||||
metrics (0.15.0)
|
metrics (0.15.0)
|
||||||
protocol-hpack (1.5.1)
|
protocol-hpack (1.5.1)
|
||||||
protocol-http (0.58.0)
|
protocol-http (0.58.1)
|
||||||
protocol-http1 (0.36.0)
|
protocol-http1 (0.37.0)
|
||||||
protocol-http (~> 0.58)
|
protocol-http (~> 0.58)
|
||||||
protocol-http2 (0.24.0)
|
protocol-http2 (0.24.0)
|
||||||
protocol-hpack (~> 1.4)
|
protocol-hpack (~> 1.4)
|
||||||
|
|||||||
@@ -233,7 +233,7 @@ class W3DHub
|
|||||||
def run(app_id, channel, *args)
|
def run(app_id, channel, *args)
|
||||||
if (app_data = installed?(app_id, channel))
|
if (app_data = installed?(app_id, channel))
|
||||||
install_directory = app_data[:install_directory]
|
install_directory = app_data[:install_directory]
|
||||||
exe_path = app_id == "ecw" ? "#{install_directory}/game500.exe" : "#{install_directory}/game.exe"
|
exe_path = app_id == "ecw" ? "#{install_directory}/game500.exe" : app_data[:install_path]
|
||||||
exe_path.gsub!("/", "\\") if W3DHub.windows?
|
exe_path.gsub!("/", "\\") if W3DHub.windows?
|
||||||
exe_path.gsub!("\\", "/") if W3DHub.unix?
|
exe_path.gsub!("\\", "/") if W3DHub.unix?
|
||||||
|
|
||||||
|
|||||||
@@ -642,8 +642,7 @@ class W3DHub
|
|||||||
verified = verify_package(package)
|
verified = verify_package(package)
|
||||||
|
|
||||||
# download manifest if not valid
|
# download manifest if not valid
|
||||||
package_fetch(package) unless verified
|
verified ? true : package_fetch(package)
|
||||||
true if verified
|
|
||||||
else
|
else
|
||||||
# download manifest if not cached
|
# download manifest if not cached
|
||||||
package_fetch(package)
|
package_fetch(package)
|
||||||
@@ -657,9 +656,10 @@ class W3DHub
|
|||||||
block&.call(chunk, remaining_bytes, total_bytes)
|
block&.call(chunk, remaining_bytes, total_bytes)
|
||||||
end
|
end
|
||||||
|
|
||||||
fail!("Failed to retrieve package: (#{package.category}:#{package.subcategory}:#{package.name}:#{package.version})") unless status_okay
|
return status_okay if status_okay
|
||||||
|
|
||||||
status_okay
|
fail!("Failed to retrieve package: (#{package.category}:#{package.subcategory}:#{package.name}:#{package.version})")
|
||||||
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
def verify_package(package, &block)
|
def verify_package(package, &block)
|
||||||
|
|||||||
@@ -90,8 +90,6 @@ class W3DHub
|
|||||||
result = true
|
result = true
|
||||||
end
|
end
|
||||||
|
|
||||||
binding.irb unless response
|
|
||||||
|
|
||||||
if response&.status == 200 || response&.status == 206
|
if response&.status == 200 || response&.status == 206
|
||||||
result = true
|
result = true
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class W3DHub
|
|||||||
|
|
||||||
subtask.async do
|
subtask.async do
|
||||||
container.pinger.ping
|
container.pinger.ping
|
||||||
pp [container.pinger.address, container.pinger.average_ping]
|
# pp [container.pinger.address, container.pinger.average_ping]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user