Fix Api.async_http logging empty urls

lib/api.rb

@@ -60,15 +60,15 @@ class W3DHub
       end
 
       # Handle arbitrary urls that may come through
-      url = nil
       if path.start_with?("http")
         uri = URI(path)
+
         endpoint = uri.origin
         path = uri.request_uri
-      else
-        url = "#{endpoint}#{path}"
       end
 
+      url = "#{endpoint}#{path}"
+
       logger.debug(LOG_TAG) { "Fetching #{method.to_s.upcase} \"#{url}\"..." }
 
       # Inject Authorization header if account data is populated

lib/application_manager.rb

@@ -5,7 +5,6 @@ class W3DHub
 
     def initialize
       @tasks = [] # :installer, :importer, :repairer, :uninstaller
-      @running_applications = {}
     end
 
     def install(app_id, channel)
@@ -23,7 +22,9 @@ class W3DHub
       # unpack packages
       # install dependencies (e.g. visual C runtime)
 
-      @tasks.push(Installer.new(app_id, channel))
+      installer = Installer.new(app_id, channel)
+
+      @tasks.push(installer)
     end
 
     def update(app_id, channel)
@@ -31,7 +32,9 @@ class W3DHub
 
       return false unless installed?(app_id, channel)
 
-      @tasks.push(Updater.new(app_id, channel))
+      updater = Updater.new(app_id, channel)
+
+      @tasks.push(updater)
     end
 
     def import(app_id, channel)
@@ -166,16 +169,11 @@ class W3DHub
     def wine_command(app_id, channel)
       return "" if W3DHub.windows?
 
-      "\"#{Store.settings[:wine_command]}\" "
+      if !Store.settings[:wine_prefix].to_s.empty?
-    end
+        "WINEPREFIX=\"#{Store.settings[:wine_prefix]}\" \"#{Store.settings[:wine_command]}\" "
-
+      else
-    def wine_enviroment_variables(app_id, channel)
+        "#{Store.settings[:wine_command]} "
-      vars = {}
+      end
-      return vars if W3DHub.windows?
-
-      vars["WINEPREFIX"] = Store.settings[:wine_prefix] unless Store.settings[:wine_prefix].to_s.empty?
-
-      vars
     end
 
     def mangohud_command(app_id, channel)
@@ -190,13 +188,6 @@ class W3DHub
       end
     end
 
-    def mangohud_enviroment_variables(app_id, channel)
-      vars = {}
-      return vars if W3DHub.windows?
-
-      vars
-    end
-
     def dxvk_command(app_id, channel)
       return "" if W3DHub.windows?
 
@@ -210,13 +201,6 @@ class W3DHub
       end
     end
 
-    def dxvk_enviroment_variables(app_id, channel)
-      vars = {}
-      return vars if W3DHub.windows?
-
-      vars
-    end
-
     def start_command(path, exe)
       if W3DHub.windows?
         "start /D \"#{path}\" /B #{exe}"
@@ -228,32 +212,16 @@ class W3DHub
     def run(app_id, channel, *args)
       if (app_data = installed?(app_id, channel))
         install_directory = app_data[:install_directory]
-        exe_path = app_id == "ecw" ? "#{install_directory}/game500.exe" : app_data[:install_path]
+        exe_path = app_id == "ecw" ? "#{install_directory}/game500.exe" : "#{install_directory}/game.exe"
         exe_path.gsub!("/", "\\") if W3DHub.windows?
         exe_path.gsub!("\\", "/") if W3DHub.unix?
 
         exe = File.basename(exe_path)
         path = File.dirname(exe_path)
 
-        env = {}
-        if W3DHub.unix?
-          env.merge!(
-            dxvk_enviroment_variables(app_id, channel),
-            mangohud_enviroment_variables(app_id, channel),
-            wine_enviroment_variables(app_id, channel)
-          )
-        end
-
         attempted = false
         begin
-          pid = Process.spawn(
+          pid = Process.spawn("#{dxvk_command(app_id, channel)}#{mangohud_command(app_id, channel)}#{wine_command(app_id, channel)}#{attempted ? start_command(path, exe) : "\"#{exe_path}\""} -launcher #{args.join(' ')}")
-            env,
-            "#{dxvk_command(app_id, channel)}"\
-            "#{mangohud_command(app_id, channel)}"\
-            "#{wine_command(app_id, channel)}"\
-            "#{attempted ? start_command(path, exe) : "\"#{exe_path}\""} "\
-            "-launcher #{args.join(' ')}"
-          )
           Process.detach(pid)
         rescue Errno::EINVAL => e
           retryable = !attempted
@@ -268,14 +236,12 @@ class W3DHub
     end
 
     def join_server(app_id, channel, server, username = Store.settings[:server_list_username], password = nil, multi = false)
-      return unless installed?(app_id, channel) && username.to_s.length.positive?
+      if installed?(app_id, channel) && username.to_s.length.positive?
-
+        run(
-      run(
+          app_id, channel,
-        app_id, channel,
+          "+connect #{server.address}:#{server.port} +netplayername #{username}#{password ? " +password \"#{password}\"" : ""}#{multi ? " +multi" : ""}"
-        "+connect #{server.address}:#{server.port} "\
+        )
-        "+netplayername #{username}#{password ? " +password \"#{password}\"" : ""}"\
+      end
-        "#{multi ? " +multi" : ""}"
-      )
     end
 
     def play_now_server(app_id, channel)
@@ -285,14 +251,9 @@ class W3DHub
 
       server_options = Store.server_list.select do |server|
         server.game == app_id &&
-          server.channel == channel &&
+        server.channel == channel &&
-          !server.status.password &&
+        !server.status.password &&
-          server.status.player_count < server.status.max_players
+        server.status.player_count < server.status.max_players
-      end
-      # sort by player count HIGH to LOW
-      # and by ping LOW to HIGH
-      server_options.sort! do |a, b|
-        [b.status.player_count, a.ping] <=> [a.status.player_count, b.ping]
       end
 
       # try to find server with lowest ping and matching version
@@ -300,7 +261,7 @@ class W3DHub
       # try to find server with lowest ping and undefined version
       found_server ||= server_options.find { |server| server.version == Api::ServerListServer::NO_OR_DEFAULT_VERSION }
 
-      found_server
+      found_server ? found_server : nil
     end
 
     def play_now(app_id, channel)

lib/application_manager/task.rb

@@ -746,8 +746,6 @@ class W3DHub
         end
         patch_entry = patch_mix.entries.find { |e| e.name.casecmp?(".w3dhub.patch") || e.name.casecmp?(".bhppatch") }
         patch_entry.read
-        # "remove" patch meta file from patch before copying patch data
-        patch_mix.entries.delete(patch_entry)
 
         patch_info = JSON.parse(patch_entry.blob, symbolize_names: true)
 
@@ -767,15 +765,20 @@ class W3DHub
         patch_info[:updatedFiles].each do |file|
           logger.debug(LOG_TAG) { "        #{file}" }
 
-          patch_mix.entries.each do |entry|
+          patch = patch_mix.entries.find { |e| e.name.casecmp?(file) }
-            target_mix.add_entry(entry: entry, replace: true)
+          target = target_mix.entries.find { |e| e.name.casecmp?(file) }
+
+          if target
+            target_mix.entries[target_mix.entries.index(target)] = patch
+          else
+            target_mix.entries << patch
           end
         end
 
         logger.info(LOG_TAG) { "      Writing updated #{file_path}..." } if patch_info[:updatedFiles].size.positive?
         temp_mix_path = "#{temp_path}/#{File.basename(file_path)}"
-        temp_mix = W3DHub::WWMix.new(path: temp_mix_path, encrypted: target_mix.encrypted?)
+        temp_mix = W3DHub::WWMix.new(path: temp_mix_path)
-        target_mix.entries.each { |e| temp_mix.add_entry(entry: e, replace: true) }
+        target_mix.entries.each { |e| temp_mix.add_entry(entry: e) }
         unless temp_mix.save
           raise temp_mix.error_reason
         end

lib/version.rb

@@ -1,4 +1,4 @@
 class W3DHub
   DIR_NAME = "W3DHubAlt".freeze
-  VERSION = "0.9.2".freeze
+  VERSION = "0.9.0".freeze
 end

lib/ww_mix.rb

@@ -228,34 +228,27 @@ class W3DHub
       @encrypted
     end
 
-    def add_file(path:, replace: false)
+    def add_file(path:)
       return false unless File.exist?(path)
       return false if File.directory?(path)
 
-      entry = Entry.new(name: File.basename(path), path: path, info: EntryInfoHeader.new(0, 0, File.size(path)))
+      info = EntryInfoHeader.new(0, 0, File.size(path))
-      add_entry(entry: entry, replace: replace)
+      @entries << Entry.new(name: File.basename(path), path: path, info: info)
+
+      true
     end
 
-    def add_blob(path:, blob:, replace: false)
+    def add_blob(path:, blob:)
       info = EntryInfoHeader.new(0, 0, blob.size)
-      entry = Entry.new(name: File.basename(path), path: path, info: info, blob: blob)
+      @entries << Entry.new(name: File.basename(path), path: path, info: info, blob: blob)
       into.crc32 = @entries.last.calculate_crc32
 
-      add_entry(entry: entry, replace: replace)
+      true
     end
 
-    def add_entry(entry:, replace: false)
+    def add_entry(entry:)
-      duplicate = @entries.find { |e| e.name.upcase == entry.name.upcase }
-
-      if duplicate
-        if replace
-          @entries.delete(duplicate)
-        else
-          return false
-        end
-      end
-
       @entries << entry
+
       true
     end