cyberarm/w3dhub_linux_launcher
1
0
Fork 0
mirror of https://github.com/cyberarm/w3d_hub_linux_launcher.git synced 2025-12-16 09:12:35 +00:00
Code Issues Projects Releases Wiki Activity

Removed window as central storage, added Store class to be central memory store

Browse Source
This commit is contained in:
Cyberarm
2021-11-22 20:38:24 -06:00
parent 3a269cbaae
commit a4dd375511
13 changed files with 109 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/application_manager.rb
View File

@@ -58,8 +58,8 @@ class W3DHub
# open wwconfig.exe or config.exe for ecw # open wwconfig.exe or config.exe for ecw
if (app_data = installed?(app_id, channel) && W3DHub.unix?) if (app_data = installed?(app_id, channel) && W3DHub.unix?)
exe = if window.settings[:wine_prefix] exe = if Store.settings[:wine_prefix]
"WINEPREFIX=\"#{window.settings[:wine_prefix]}\" winecfg" "WINEPREFIX=\"#{Store.settings[:wine_prefix]}\" winecfg"
else else
"winecfg" "winecfg"
end end
@@ -106,28 +106,27 @@ class W3DHub
def wine_command(app_id, channel) def wine_command(app_id, channel)
return "" if W3DHub.windows? return "" if W3DHub.windows?
if window.settings[:wine_prefix] if Store.settings[:wine_prefix]
"WINEPREFIX=\"#{window.settings[:wine_prefix]}\" \"#{window.settings[:wine_command]}\" " "WINEPREFIX=\"#{Store.settings[:wine_prefix]}\" \"#{Store.settings[:wine_command]}\" "
else else
"#{window.settings[:wine_command]} " "#{Store.settings[:wine_command]} "
end end
end end
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))
pp "#{wine_command(app_id, channel)}#{app_data[:install_path]}", *args
pid = Process.spawn("#{wine_command(app_id, channel)}#{app_data[:install_path]}", *args) pid = Process.spawn("#{wine_command(app_id, channel)}#{app_data[:install_path]}", *args)
Process.detach(pid) Process.detach(pid)
end end
end end
def join_server(app_id, channel, server, password = nil) def join_server(app_id, channel, server, password = nil)
if installed?(app_id, channel) && window.settings[:server_list_username].to_s.length.positive? if installed?(app_id, channel) && Store.settings[:server_list_username].to_s.length.positive?
run( run(
app_id, channel, app_id, channel,
"-launcher", "-launcher",
"+connect #{server.address}:#{server.port}", "+connect #{server.address}:#{server.port}",
"+netplayername \"#{window.settings[:server_list_username]}\"", "+netplayername \"#{Store.settings[:server_list_username]}\"",
password ? "+password \"#{password}\"" : "" password ? "+password \"#{password}\"" : ""
) )
end end
@@ -179,9 +178,9 @@ class W3DHub
wine_prefix: nil wine_prefix: nil
} }
window.settings[:games] ||= {} Store.settings[:games] ||= {}
window.settings[:games][:"#{app_id}_#{channel_id}"] = application_data Store.settings[:games][:"#{app_id}_#{channel_id}"] = application_data
window.settings.save_settings Store.settings.save_settings
end end
end end
end end
@@ -206,13 +205,13 @@ class W3DHub
wine_prefix: task.wine_prefix wine_prefix: task.wine_prefix
} }
window.settings[:games] ||= {} Store.settings[:games] ||= {}
window.settings[:games][:"#{task.app_id}_#{task.release_channel}"] = application_data Store.settings[:games][:"#{task.app_id}_#{task.release_channel}"] = application_data
window.settings.save_settings Store.settings.save_settings
end end
def installed?(app_id, channel) def installed?(app_id, channel)
window.settings[:games, :"#{app_id}_#{channel}"] Store.settings[:games, :"#{app_id}_#{channel}"]
end end
def installing?(app_id, channel) def installing?(app_id, channel)

8
lib/application_manager/task.rb
View File

@@ -13,7 +13,7 @@ class W3DHub
@task_state = :not_started # :not_started, :running, :paused, :halted, :complete, :failed @task_state = :not_started # :not_started, :running, :paused, :halted, :complete, :failed
@application = window.applications.games.find { |g| g.id == app_id } @application = Store.applications.games.find { |g| g.id == app_id }
@channel = @application.channels.find { |c| c.id == release_channel } @channel = @application.channels.find { |c| c.id == release_channel }
@packages_to_download = [] @packages_to_download = []
@@ -102,8 +102,8 @@ class W3DHub
fail!("FAIL FAST: `#{W3DHub.tar_command} --help` command failed, #{W3DHub.tar_command} is not installed. Will be unable to unpack packages.") unless bsdtar_present fail!("FAIL FAST: `#{W3DHub.tar_command} --help` command failed, #{W3DHub.tar_command} is not installed. Will be unable to unpack packages.") unless bsdtar_present
if W3DHub.unix? if W3DHub.unix?
wine_present = system("which #{window.settings[:wine_command]}") wine_present = system("which #{Store.settings[:wine_command]}")
fail!("FAIL FAST: `which #{window.settings[:wine_command]}` command failed, wine is not installed. Will be unable to create prefixes or launch games.") unless wine_present fail!("FAIL FAST: `which #{Store.settings[:wine_command]}` command failed, wine is not installed. Will be unable to create prefixes or launch games.") unless wine_present
end end
end end
@@ -284,7 +284,7 @@ class W3DHub
end end
def mark_application_installed def mark_application_installed
window.application_manager.installed!(self) Store.application_manager.installed!(self)
puts "#{@app_id} has been installed." puts "#{@app_id} has been installed."
end end

4
lib/cache.rb
View File

@@ -34,13 +34,13 @@ class W3DHub
end end
def self.package_path(category, subcategory, name, version) def self.package_path(category, subcategory, name, version)
package_cache_dir = $window.settings[:package_cache_dir] package_cache_dir = $Store.settings[:package_cache_dir]
"#{package_cache_dir}/#{category}/#{subcategory}/#{version}/#{name}.package" "#{package_cache_dir}/#{category}/#{subcategory}/#{version}/#{name}.package"
end end
def self.install_path(application, channel) def self.install_path(application, channel)
app_install_dir = $window.settings[:app_install_dir] app_install_dir = $Store.settings[:app_install_dir]
"#{app_install_dir}/#{application.category}/#{application.id}/#{channel.id}" "#{app_install_dir}/#{application.category}/#{application.id}/#{channel.id}"
end end

2
lib/pages/download_manager.rb
View File

@@ -5,7 +5,7 @@ class W3DHub
def setup def setup
@download_package_info ||= {} @download_package_info ||= {}
@task = window.application_manager.current_task @task = Store.application_manager.current_task
return unless @task return unless @task

34
lib/pages/games.rb
View File

@@ -3,7 +3,7 @@ class W3DHub
class Games < Page class Games < Page
def setup def setup
@game_news ||= {} @game_news ||= {}
@focused_game ||= window.applications.games.first @focused_game ||= Store.applications.games.first
body.clear do body.clear do
# Games List # Games List
@@ -23,7 +23,7 @@ class W3DHub
@games_list_container.clear do @games_list_container.clear do
background 0xff_121920 background 0xff_121920
window.applications.games.each do |game| Store.applications.games.each do |game|
selected = game == @focused_game selected = game == @focused_game
game_button = stack(width: 1.0, border_thickness_left: 4, game_button = stack(width: 1.0, border_thickness_left: 4,
@@ -34,7 +34,7 @@ class W3DHub
flow(width: 1.0, height: 48) do flow(width: 1.0, height: 48) do
stack(width: 0.3) stack(width: 0.3)
image "#{GAME_ROOT_PATH}/media/icons/#{game.id}.png", height: 48, color: window.application_manager.installed?(game.id, game.channels.first.id) ? 0xff_ffffff : 0xee_444444 image "#{GAME_ROOT_PATH}/media/icons/#{game.id}.png", height: 48, color: Store.application_manager.installed?(game.id, game.channels.first.id) ? 0xff_ffffff : 0xee_444444
end end
inscription game.name, width: 1.0, text_align: :center inscription game.name, width: 1.0, text_align: :center
end end
@@ -85,17 +85,17 @@ class W3DHub
# end # end
# end # end
if window.application_manager.installed?(game.id, channel.id) if Store.application_manager.installed?(game.id, channel.id)
Hash.new.tap { |hash| Hash.new.tap { |hash|
hash[I18n.t(:"games.game_settings")] = { icon: "gear", block: proc { window.application_manager.settings(game.id, channel.id) } } hash[I18n.t(:"games.game_settings")] = { icon: "gear", block: proc { Store.application_manager.settings(game.id, channel.id) } }
hash[I18n.t(:"games.wine_configuration")] = { icon: "gear", block: proc { window.application_manager.wine_configuration(game.id, channel.id) } } if W3DHub.unix? hash[I18n.t(:"games.wine_configuration")] = { icon: "gear", block: proc { Store.application_manager.wine_configuration(game.id, channel.id) } } if W3DHub.unix?
if game.id != "ren" if game.id != "ren"
hash[I18n.t(:"games.repair_installation")] = { icon: "wrench", block: proc { window.application_manager.repair(game.id, channel.id) } } hash[I18n.t(:"games.repair_installation")] = { icon: "wrench", block: proc { Store.application_manager.repair(game.id, channel.id) } }
hash[I18n.t(:"games.uninstall_game")] = { icon: "trashCan", block: proc { window.application_manager.uninstall(game.id, channel.id) } } hash[I18n.t(:"games.uninstall_game")] = { icon: "trashCan", block: proc { Store.application_manager.uninstall(game.id, channel.id) } }
end end
hash[I18n.t(:"games.install_folder")] = { icon: nil, block: proc { window.application_manager.show_folder(game.id, channel.id, :installation) } } hash[I18n.t(:"games.install_folder")] = { icon: nil, block: proc { Store.application_manager.show_folder(game.id, channel.id, :installation) } }
hash[I18n.t(:"games.user_data_folder")] = { icon: nil, block: proc { window.application_manager.show_folder(game.id, channel.id, :user_data) } } hash[I18n.t(:"games.user_data_folder")] = { icon: nil, block: proc { Store.application_manager.show_folder(game.id, channel.id, :user_data) } }
hash[I18n.t(:"games.view_screenshots")] = { icon: nil, block: proc { window.application_manager.show_folder(game.id, channel.id, :screenshots) } } hash[I18n.t(:"games.view_screenshots")] = { icon: nil, block: proc { Store.application_manager.show_folder(game.id, channel.id, :screenshots) } }
}.each do |key, hash| }.each do |key, hash|
flow(width: 1.0, height: 22, margin_bottom: 8) do flow(width: 1.0, height: 22, margin_bottom: 8) do
image "#{GAME_ROOT_PATH}/media/ui_icons/#{hash[:icon]}.png", width: 0.11 if hash[:icon] image "#{GAME_ROOT_PATH}/media/ui_icons/#{hash[:icon]}.png", width: 0.11 if hash[:icon]
@@ -127,24 +127,24 @@ class W3DHub
flow(width: 1.0, height: 0.08) do flow(width: 1.0, height: 0.08) do
# background 0xff_551100 # background 0xff_551100
if window.application_manager.installed?(game.id, channel.id) if Store.application_manager.installed?(game.id, channel.id)
button "<b>#{I18n.t(:"interface.play_now")}</b>", margin_left: 24 do button "<b>#{I18n.t(:"interface.play_now")}</b>", margin_left: 24 do
window.application_manager.run(game.id, channel.id) Store.application_manager.run(game.id, channel.id)
end end
button "<b>#{I18n.t(:"interface.single_player")}</b>", margin_left: 24 do button "<b>#{I18n.t(:"interface.single_player")}</b>", margin_left: 24 do
window.application_manager.run(game.id, channel.id) Store.application_manager.run(game.id, channel.id)
end end
else else
unless game.id == "ren" unless game.id == "ren"
button "<b>#{I18n.t(:"interface.install")}</b>", margin_left: 24, enabled: !window.application_manager.task?(:installer, game.id, channel.id) do |button| button "<b>#{I18n.t(:"interface.install")}</b>", margin_left: 24, enabled: !Store.application_manager.task?(:installer, game.id, channel.id) do |button|
button.enabled = false button.enabled = false
window.application_manager.install(game.id, channel.id) Store.application_manager.install(game.id, channel.id)
end end
end end
button "<b>#{I18n.t(:"interface.import")}</b>", margin_left: 24, enabled: false do button "<b>#{I18n.t(:"interface.import")}</b>", margin_left: 24, enabled: false do
window.application_manager.import(game.id, channel.id, "?") Store.application_manager.import(game.id, channel.id, "?")
end end
end end
end end

18
lib/pages/login.rb
View File

@@ -40,9 +40,9 @@ class W3DHub
account = Api.user_login(@username.value, @password.value) account = Api.user_login(@username.value, @password.value)
if account if account
window.account = account Store.account = account
window.settings[:account][:refresh_token] = account.refresh_token Store.settings[:account][:refresh_token] = account.refresh_token
window.settings.save_settings Store.settings.save_settings
Cache.fetch(account.avatar_uri) Cache.fetch(account.avatar_uri)
@@ -67,7 +67,7 @@ class W3DHub
end end
end end
if window.account if Store.account
populate_account_info populate_account_info
page(W3DHub::Pages::Games) page(W3DHub::Pages::Games)
end end
@@ -77,23 +77,23 @@ class W3DHub
@host.instance_variable_get(:"@account_container").clear do @host.instance_variable_get(:"@account_container").clear do
stack(width: 0.7, height: 1.0) do stack(width: 0.7, height: 1.0) do
# background 0xff_222222 # background 0xff_222222
tagline "<b>#{window.account.username}</b>" tagline "<b>#{Store.account.username}</b>"
flow(width: 1.0) do flow(width: 1.0) do
link(I18n.t(:"interface.log_out"), text_size: 16, width: 0.5) { depopulate_account_info } link(I18n.t(:"interface.log_out"), text_size: 16, width: 0.5) { depopulate_account_info }
link I18n.t(:"interface.profile"), text_size: 16, width: 0.49 do link I18n.t(:"interface.profile"), text_size: 16, width: 0.49 do
Launchy.open("https://secure.w3dhub.com/forum/index.php?showuser=#{window.account.id}") Launchy.open("https://secure.w3dhub.com/forum/index.php?showuser=#{Store.account.id}")
end end
end end
end end
image Cache.path(window.account.avatar_uri), height: 1.0 image Cache.path(Store.account.avatar_uri), height: 1.0
end end
end end
def depopulate_account_info def depopulate_account_info
window.settings[:account][:refresh_token] = nil Store.settings[:account][:refresh_token] = nil
window.settings.save_settings Store.settings.save_settings
@host.instance_variable_get(:"@account_container").clear do @host.instance_variable_get(:"@account_container").clear do
stack(width: 0.7, height: 1.0) do stack(width: 0.7, height: 1.0) do

28
lib/pages/server_browser.rb
View File

@@ -8,7 +8,7 @@ class W3DHub
@filters = {} @filters = {}
@filter_region = "Any" # "Any", "North America", "Europe" @filter_region = "Any" # "Any", "North America", "Europe"
window.applications.games.each { |game| @filters[game.id] = true } Store.applications.games.each { |game| @filters[game.id] = true }
body.clear do body.clear do
stack(width: 1.0, height: 1.0, padding: 8) do stack(width: 1.0, height: 1.0, padding: 8) do
@@ -19,7 +19,7 @@ class W3DHub
flow(width: 1.0, height: 0.06) do flow(width: 1.0, height: 0.06) do
flow(width: 0.75, height: 1.0) do flow(width: 0.75, height: 1.0) do
@filters.each do |app_id, enabled| @filters.each do |app_id, enabled|
app = window.applications.games.find { |a| a.id == app_id } app = Store.applications.games.find { |a| a.id == app_id }
image "#{GAME_ROOT_PATH}/media/icons/#{app_id}.png", tip: "#{app.name}", height: 1.0, image "#{GAME_ROOT_PATH}/media/icons/#{app_id}.png", tip: "#{app.name}", height: 1.0,
border_thickness_bottom: 1, border_color_bottom: 0x00_000000, border_thickness_bottom: 1, border_color_bottom: 0x00_000000,
@@ -48,14 +48,14 @@ class W3DHub
flow(width: 0.249, height: 1.0) do flow(width: 0.249, height: 1.0) do
inscription "#{I18n.t(:"server_browser.nickname")}:", width: 0.32 inscription "#{I18n.t(:"server_browser.nickname")}:", width: 0.32
@nickname_label = inscription "#{window.settings[:server_list_username]}", width: 0.6 @nickname_label = inscription "#{Store.settings[:server_list_username]}", width: 0.6
image "#{GAME_ROOT_PATH}/media/ui_icons/wrench.png", height: 16, hover: { color: 0xaa_ffffff }, tip: I18n.t(:"server_browser.set_nickname") do image "#{GAME_ROOT_PATH}/media/ui_icons/wrench.png", height: 16, hover: { color: 0xaa_ffffff }, tip: I18n.t(:"server_browser.set_nickname") do
# Prompt for player name # Prompt for player name
prompt_for_nickname( prompt_for_nickname(
accept_callback: proc do |entry| accept_callback: proc do |entry|
@nickname_label.value = entry @nickname_label.value = entry
window.settings[:server_list_username] = entry Store.settings[:server_list_username] = entry
window.settings.save_settings Store.settings.save_settings
end end
) )
end end
@@ -189,7 +189,7 @@ class W3DHub
end end
stack(width: 1.0, height: 0.25) do stack(width: 1.0, height: 0.25) do
game_installed = window.application_manager.installed?(server.game, window.applications.games.find { |g| g.id == server.game }.channels.first.id) game_installed = Store.application_manager.installed?(server.game, Store.applications.games.find { |g| g.id == server.game }.channels.first.id)
button "<b>#{I18n.t(:"server_browser.join_server")}</b>", enabled: !game_installed.nil? do button "<b>#{I18n.t(:"server_browser.join_server")}</b>", enabled: !game_installed.nil? do
# Check for nickname # Check for nickname
@@ -198,12 +198,12 @@ class W3DHub
# Check if password needed # Check if password needed
# prompt for password # prompt for password
# Launch game # Launch game
if window.settings[:server_list_username].to_s.length.zero? if Store.settings[:server_list_username].to_s.length.zero?
prompt_for_nickname( prompt_for_nickname(
accept_callback: proc do |entry| accept_callback: proc do |entry|
@nickname_label.value = entry @nickname_label.value = entry
window.settings[:server_list_username] = entry Store.settings[:server_list_username] = entry
window.settings.save_settings Store.settings.save_settings
if server.status.password if server.status.password
prompt_for_password( prompt_for_password(
@@ -315,7 +315,7 @@ class W3DHub
end end
def game_name(game) def game_name(game)
window.applications.games.detect { |g| g.id == game }&.name Store.applications.games.detect { |g| g.id == game }&.name
end end
def prompt_for_nickname(accept_callback: nil, cancel_callback: nil) def prompt_for_nickname(accept_callback: nil, cancel_callback: nil)
@@ -323,7 +323,7 @@ class W3DHub
W3DHub::States::PromptDialog, W3DHub::States::PromptDialog,
title: I18n.t(:"server_browser.set_nickname"), title: I18n.t(:"server_browser.set_nickname"),
message: I18n.t(:"server_browser.set_nickname_message"), message: I18n.t(:"server_browser.set_nickname_message"),
prefill: window.settings[:server_list_username], prefill: Store.settings[:server_list_username],
accept_callback: accept_callback, accept_callback: accept_callback,
cancel_callback: cancel_callback, cancel_callback: cancel_callback,
valid_callback: proc { |entry| entry.length.positive? } valid_callback: proc { |entry| entry.length.positive? }
@@ -346,11 +346,11 @@ class W3DHub
if ( if (
(server.status.password && password.length.positive?) || (server.status.password && password.length.positive?) ||
!server.status.password) && !server.status.password) &&
window.settings[:server_list_username].to_s.length.positive? Store.settings[:server_list_username].to_s.length.positive?
window.application_manager.join_server( Store.application_manager.join_server(
server.game, server.game,
window.applications.games.find { |g| g.id == server.game }.channels.first.id, server, password Store.applications.games.find { |g| g.id == server.game }.channels.first.id, server, password
) )
else else
window.push_state(W3DHub::States::MessageDialog, type: "?", title: "?", message: "?") window.push_state(W3DHub::States::MessageDialog, type: "?", title: "?", message: "?")

6
lib/pages/settings.rb
View File

@@ -14,7 +14,7 @@ class W3DHub
para "<b>App Install Folder</b>", width: 0.249 para "<b>App Install Folder</b>", width: 0.249
stack(width: 0.75, height: 1.0) do stack(width: 0.75, height: 1.0) do
edit_line window.settings[:app_install_dir], width: 1.0 edit_line Store.settings[:app_install_dir], width: 1.0
inscription "The folder into which new games and apps will be installed by the launcher" inscription "The folder into which new games and apps will be installed by the launcher"
end end
end end
@@ -23,7 +23,7 @@ class W3DHub
para "<b>Package Cache Folder</b>", width: 0.249 para "<b>Package Cache Folder</b>", width: 0.249
stack(width: 0.75, height: 1.0) do stack(width: 0.75, height: 1.0) do
edit_line window.settings[:package_cache_dir], width: 1.0 edit_line Store.settings[:package_cache_dir], width: 1.0
inscription "A folder which will be used to cache downloaded packages used to install games and apps" inscription "A folder which will be used to cache downloaded packages used to install games and apps"
end end
end end
@@ -34,7 +34,7 @@ class W3DHub
inscription "If this is enabled the launcher will automatically report errors to the development team, along with basic information about your machine, such as operating system.", width: 1.0 inscription "If this is enabled the launcher will automatically report errors to the development team, along with basic information about your machine, such as operating system.", width: 1.0
button "Save", margin_top: 32 do button "Save", margin_top: 32 do
window.settings.save_settings Store.settings.save_settings
end end
end end
end end

18
lib/states/boot.rb
View File

@@ -44,9 +44,9 @@ class W3DHub
@progressbar.value = @fraction @progressbar.value = @fraction
if @progressbar.value >= 1.0 && @task_index == @tasks.size if @progressbar.value >= 1.0 && @task_index == @tasks.size
window.account = @account Store.account = @account
window.service_status = @service_status Store.service_status = @service_status
window.applications = @applications Store.applications = @applications
push_state(States::Interface) push_state(States::Interface)
end end
@@ -61,18 +61,18 @@ class W3DHub
end end
def refresh_user_token def refresh_user_token
if window.settings[:account, :refresh_token] if Store.settings[:account, :refresh_token]
Thread.new do Thread.new do
@account = Api.refresh_user_login(window.settings[:account, :refresh_token]) @account = Api.refresh_user_login(Store.settings[:account, :refresh_token])
if @account if @account
window.settings[:account][:refresh_token] = @account.refresh_token Store.settings[:account][:refresh_token] = @account.refresh_token
window.settings.save_settings
else else
window.settings[:account][:refresh_token] = nil Store.settings[:account][:refresh_token] = nil
window.settings.save_settings
end end
Store.settings.save_settings
@tasks[:refresh_user_token][:complete] = true @tasks[:refresh_user_token][:complete] = true
end end
else else

4
lib/states/interface.rb
View File

@@ -15,7 +15,7 @@ class W3DHub
@main_thread_queue = [] @main_thread_queue = []
window.application_manager.auto_import Store.application_manager.auto_import
theme(W3DHub::THEME) theme(W3DHub::THEME)
@@ -118,7 +118,7 @@ class W3DHub
end end
end end
if window.account if Store.account
page(W3DHub::Pages::Login) page(W3DHub::Pages::Login)
else else
page(W3DHub::Pages::Games) page(W3DHub::Pages::Games)

27
lib/store.rb Normal file
View File

@@ -0,0 +1,27 @@
class W3DHub
class Store
@@store = {}
def self.get(*args)
@@store.get(*args)
end
def self.[]=(key, value)
@@store[key] = value
end
def self.[](key)
@@store[key]
end
def self.method_missing(sym, *args)
if args.size == 1
self[:"#{sym.to_s.sub('=', '')}"] = args.first
elsif args.size.zero?
self[sym]
else
raise "Only one argument suppported"
end
end
end
end

15
lib/window.rb
View File

@@ -1,15 +1,12 @@
class W3DHub class W3DHub
class Window < CyberarmEngine::Window class Window < CyberarmEngine::Window
attr_reader :settings, :application_manager
attr_accessor :account, :service_status, :applications
def setup def setup
self.caption = I18n.t(:app_name) self.caption = I18n.t(:app_name)
@settings = Settings.new Store[:settings] = Settings.new
@application_manager = ApplicationManager.new Store[:application_manager] = ApplicationManager.new
@settings.save_settings Store.settings.save_settings
push_state(W3DHub::States::Boot) push_state(W3DHub::States::Boot)
end end
@@ -17,14 +14,14 @@ class W3DHub
def update def update
super super
@application_manager.start_next_available_task if @application_manager.idle? Store.application_manager.start_next_available_task if Store.application_manager.idle?
current_state.update_application_manager_status if current_state.is_a?(States::Interface) current_state.update_application_manager_status if current_state.is_a?(States::Interface)
end end
def close def close
@settings.save_settings Store.settings.save_settings
super if @application_manager.idle? super if Store.application_manager.idle?
end end
def main_thread_queue def main_thread_queue

1
w3dhub.rb
View File

@@ -28,6 +28,7 @@ end
require_relative "lib/version" require_relative "lib/version"
require_relative "lib/theme" require_relative "lib/theme"
require_relative "lib/common" require_relative "lib/common"
require_relative "lib/store"
require_relative "lib/window" require_relative "lib/window"
require_relative "lib/cache" require_relative "lib/cache"
require_relative "lib/settings" require_relative "lib/settings"