Update hardware survey to be able to collect the same data as on windows, mostly.

Gemfile

@@ -1,15 +1,26 @@
 source "https://rubygems.org"
 
+# "standard lib" gems
 gem "base64"
+gem "rexml"
+gem "logger"
+
+# networking libs
 gem "async-http"
 gem "async-websocket"
+
+# "game" library gem
 gem "cyberarm_engine"
 gem "sdl2-bindings"
-gem "libui", platforms: [:windows]
+
+# misc. libs
 gem "digest-crc"
 gem "ircparser"
-gem "rexml"
 gem "rubyzip"
+
+# file selection dialogs on windows (SDL3 has these built-in, but we're on SDL2)
+gem "libui", platforms: [:windows]
+# misc. windows only gems
 gem "win32-process", platforms: [:windows]
 gem "win32-security", platforms: [:windows]
 
@@ -18,9 +29,9 @@ gem "win32-security", platforms: [:windows]
 # use `bundle _x.y.z_ COMMAND` to use this one...
 # NOTE: Releasy needs to be installed as a system gem i.e. `rake install`
 # NOTE: contents of the `gemhome` folder in the packaged folder need to be moved into the lib/ruby/gems\<RUBY_VERSION> folder
- # group :windows_packaging do
- #   gem "bundler", "~>2.4.3"
- #   gem "rake"
- #   gem "ocran"
- #   gem "releasy"#, path: "../releasy"
- # end
+# group :windows_packaging do
+#   gem "bundler", "~>2.4.3"
+#   gem "rake"
+#   gem "ocran"
+#   gem "releasy"#, path: "../releasy"
+# end

Gemfile.lock

@@ -1,13 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    async (2.35.2)
+    async (2.38.1)
       console (~> 1.29)
       fiber-annotation
       io-event (~> 1.11)
       metrics (~> 0.12)
       traces (~> 0.18)
-    async-http (0.94.0)
+    async-http (0.94.2)
       async (>= 2.10.2)
       async-pool (~> 0.11)
       io-endpoint (~> 0.14)
@@ -18,7 +18,7 @@ GEM
       protocol-http2 (~> 0.22)
       protocol-url (~> 0.2)
       traces (~> 0.10)
-    async-pool (0.11.1)
+    async-pool (0.11.2)
       async (>= 2.0)
     async-websocket (0.30.0)
       async-http (~> 0.76)
@@ -26,11 +26,11 @@ GEM
       protocol-rack (~> 0.7)
       protocol-websocket (~> 0.17)
     base64 (0.3.0)
-    console (1.34.2)
+    console (1.34.3)
       fiber-annotation
       fiber-local (~> 1.1)
       json
-    cyberarm_engine (0.25.0)
+    cyberarm_engine (0.25.1)
       gosu (~> 1.1)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
@@ -43,29 +43,30 @@ GEM
     fiber-storage (1.0.1)
     fiddle (1.1.8)
     gosu (1.4.6)
-    io-endpoint (0.16.0)
-    io-event (1.14.2)
+    io-endpoint (0.17.2)
+    io-event (1.14.4)
     io-stream (0.11.1)
     ircparser (1.0.0)
-    json (2.18.0)
+    json (2.19.2)
     libui (0.2.0-x64-mingw-ucrt)
       fiddle
+    logger (1.7.0)
     metrics (0.15.0)
     protocol-hpack (1.5.1)
-    protocol-http (0.58.0)
-    protocol-http1 (0.36.0)
+    protocol-http (0.60.0)
+    protocol-http1 (0.37.0)
       protocol-http (~> 0.58)
     protocol-http2 (0.24.0)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.47)
-    protocol-rack (0.21.0)
+    protocol-rack (0.22.0)
       io-stream (>= 0.10)
       protocol-http (~> 0.58)
       rack (>= 1.0)
     protocol-url (0.4.0)
     protocol-websocket (0.20.2)
       protocol-http (~> 0.2)
-    rack (3.2.4)
+    rack (3.2.5)
     rake (13.3.1)
     rexml (3.4.4)
     rubyzip (3.2.2)
@@ -90,6 +91,7 @@ DEPENDENCIES
   digest-crc
   ircparser
   libui
+  logger
   rexml
   rubyzip
   sdl2-bindings
@@ -97,4 +99,4 @@ DEPENDENCIES
   win32-security
 
 BUNDLED WITH
-   2.6.8
+  4.0.3

lib/application_manager.rb

@@ -5,6 +5,7 @@ class W3DHub
 
     def initialize
       @tasks = [] # :installer, :importer, :repairer, :uninstaller
+      @running_applications = {}
     end
 
     def install(app_id, channel)
@@ -22,9 +23,7 @@ class W3DHub
       # unpack packages
       # install dependencies (e.g. visual C runtime)
 
-      installer = Installer.new(app_id, channel)
-
-      @tasks.push(installer)
+      @tasks.push(Installer.new(app_id, channel))
     end
 
     def update(app_id, channel)
@@ -32,9 +31,7 @@ class W3DHub
 
       return false unless installed?(app_id, channel)
 
-      updater = Updater.new(app_id, channel)
-
-      @tasks.push(updater)
+      @tasks.push(Updater.new(app_id, channel))
     end
 
     def import(app_id, channel)
@@ -169,11 +166,16 @@ class W3DHub
     def wine_command(app_id, channel)
       return "" if W3DHub.windows?
 
-      if !Store.settings[:wine_prefix].to_s.empty?
-        "WINEPREFIX=\"#{Store.settings[:wine_prefix]}\" \"#{Store.settings[:wine_command]}\" "
-      else
-        "#{Store.settings[:wine_command]} "
-      end
+      "\"#{Store.settings[:wine_command]}\" "
+    end
+
+    def wine_enviroment_variables(app_id, channel)
+      vars = {}
+      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)
@@ -188,6 +190,13 @@ 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?
 
@@ -201,6 +210,13 @@ 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}"
@@ -212,16 +228,32 @@ 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" : "#{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.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("#{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(' ')}")
+          pid = Process.spawn(
+            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
@@ -236,12 +268,14 @@ class W3DHub
     end
 
     def join_server(app_id, channel, server, username = Store.settings[:server_list_username], password = nil, multi = false)
-      if installed?(app_id, channel) && username.to_s.length.positive?
-        run(
-          app_id, channel,
-          "+connect #{server.address}:#{server.port} +netplayername #{username}#{password ? " +password \"#{password}\"" : ""}#{multi ? " +multi" : ""}"
-        )
-      end
+      return unless installed?(app_id, channel) && username.to_s.length.positive?
+
+      run(
+        app_id, channel,
+        "+connect #{server.address}:#{server.port} "\
+        "+netplayername #{username}#{password ? " +password \"#{password}\"" : ""}"\
+        "#{multi ? " +multi" : ""}"
+      )
     end
 
     def play_now_server(app_id, channel)
@@ -251,9 +285,14 @@ class W3DHub
 
       server_options = Store.server_list.select do |server|
         server.game == app_id &&
-        server.channel == channel &&
-        !server.status.password &&
-        server.status.player_count < server.status.max_players
+          server.channel == channel &&
+          !server.status.password &&
+          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
@@ -261,7 +300,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 : nil
+      found_server
     end
 
     def play_now(app_id, channel)

lib/application_manager/task.rb

@@ -746,6 +746,8 @@ 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)
 
@@ -765,20 +767,15 @@ class W3DHub
         patch_info[:updatedFiles].each do |file|
           logger.debug(LOG_TAG) { "        #{file}" }
 
-          patch = patch_mix.entries.find { |e| e.name.casecmp?(file) }
-          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
+          patch_mix.entries.each do |entry|
+            target_mix.add_entry(entry: entry, replace: true)
           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)
-        target_mix.entries.each { |e| temp_mix.add_entry(entry: e) }
+        temp_mix = W3DHub::WWMix.new(path: temp_mix_path, encrypted: target_mix.encrypted?)
+        target_mix.entries.each { |e| temp_mix.add_entry(entry: e, replace: true) }
         unless temp_mix.save
           raise temp_mix.error_reason
         end

lib/common.rb

@@ -54,51 +54,49 @@ class W3DHub
   end
 
   def self.prompt_for_nickname(accept_callback: nil, cancel_callback: nil)
-        CyberarmEngine::Window.instance.push_state(
-          W3DHub::States::PromptDialog,
-          title: I18n.t(:"server_browser.set_nickname"),
-          message: I18n.t(:"server_browser.set_nickname_message"),
-          prefill: Store.settings[:server_list_username],
-          accept_callback: accept_callback,
-          cancel_callback: cancel_callback,
-          # See: https://gitlab.com/danpaul88/brenbot/-/blob/master/Source/renlog.pm#L136-175
-          valid_callback: proc do |entry|
-            entry.length > 1 && entry.length < 30 && (entry =~ /(:|!|&|%| )/i).nil? &&
-              (entry =~ /[\001\002\037]/).nil? && (entry =~ /\\/).nil?
-          end
-        )
+    CyberarmEngine::Window.instance.push_state(
+      W3DHub::States::PromptDialog,
+      title: I18n.t(:"server_browser.set_nickname"),
+      message: I18n.t(:"server_browser.set_nickname_message"),
+      prefill: Store.settings[:server_list_username],
+      accept_callback: accept_callback,
+      cancel_callback: cancel_callback,
+      valid_callback: proc do |entry|
+        entry.length.between?(3, 40) && (entry =~ /^[a-z0-9_\-\[\]]+$/i)
       end
+    )
+  end
 
-      def self.prompt_for_password(accept_callback: nil, cancel_callback: nil)
-        CyberarmEngine::Window.instance.push_state(
-          W3DHub::States::PromptDialog,
-          title: I18n.t(:"server_browser.enter_password"),
-          message: I18n.t(:"server_browser.enter_password_message"),
-          input_type: :password,
-          accept_callback: accept_callback,
-          cancel_callback: cancel_callback,
-          valid_callback: proc { |entry| entry.length.positive? }
-        )
-      end
+  def self.prompt_for_password(accept_callback: nil, cancel_callback: nil)
+    CyberarmEngine::Window.instance.push_state(
+      W3DHub::States::PromptDialog,
+      title: I18n.t(:"server_browser.enter_password"),
+      message: I18n.t(:"server_browser.enter_password_message"),
+      input_type: :password,
+      accept_callback: accept_callback,
+      cancel_callback: cancel_callback,
+      valid_callback: proc { |entry| entry.length.positive? }
+    )
+  end
 
-      def self.join_server(server:, username: Store.settings[:server_list_username], password: nil, multi: false)
-        if (
-          (server.status.password && password.length.positive?) ||
-          !server.status.password) &&
-           username.to_s.length.positive?
+  def self.join_server(server:, username: Store.settings[:server_list_username], password: nil, multi: false)
+    if (
+      (server.status.password && password.length.positive?) ||
+      !server.status.password) &&
+       username.to_s.length.positive?
 
-          Store.application_manager.join_server(
-            server.game,
-            server.channel,
-            server,
-            username,
-            password,
-            multi
-          )
-        else
-          CyberarmEngine::Window.instance.push_state(W3DHub::States::MessageDialog, type: "?", title: "?", message: "?")
-        end
-      end
+      Store.application_manager.join_server(
+        server.game,
+        server.channel,
+        server,
+        username,
+        password,
+        multi
+      )
+    else
+      CyberarmEngine::Window.instance.push_state(W3DHub::States::MessageDialog, type: "?", title: "?", message: "?")
+    end
+  end
 
   def self.command(command, &block)
     if windows?
@@ -123,7 +121,6 @@ class W3DHub
       process_info = Process.create(**hash)
 
       pid = process_info.process_id
-      status = -1
 
       until (status = Process.get_exitcode(pid))
         if block

lib/hardware_survey.rb

@@ -2,7 +2,7 @@ class W3DHub
   class HardwareSurvey
     attr_reader :data
 
-    def initialize
+    def initialize(displays_only: false)
       @data = {
         displays: [],
         system: {
@@ -26,8 +26,6 @@ class W3DHub
         }
       }
 
-      # Hardware survey only works on Windows atm
-
       if Gem::win_platform?
         lib_dir = File.dirname($LOADED_FEATURES.find { |file| file.include?("gosu.so") })
         SDL.load_lib("#{lib_dir}64/SDL2.dll")
@@ -36,11 +34,13 @@ class W3DHub
       end
 
       query_displays
-      query_motherboard
-      query_operating_system
-      query_cpus
-      query_ram
-      query_gpus
+      unless displays_only
+        query_motherboard
+        query_operating_system
+        query_cpus
+        query_ram
+        query_gpus
+      end
 
       @data.freeze
     end
@@ -68,37 +68,51 @@ class W3DHub
     end
 
     def query_motherboard
-      return unless Gem::win_platform?
-
-      Win32::Registry::HKEY_LOCAL_MACHINE.open("HARDWARE\\DESCRIPTION\\System\\BIOS", Win32::Registry::KEY_READ) do |reg|
-        @data[:system][:motherboard][:manufacturer]      = safe_reg(reg, "SystemManufacturer")
-        @data[:system][:motherboard][:model]             = safe_reg(reg, "SystemProductName")
-        @data[:system][:motherboard][:bios_vendor]       = safe_reg(reg, "BIOSVendor")
-        @data[:system][:motherboard][:bios_release_date] = safe_reg(reg, "BIOSReleaseDate")
-        @data[:system][:motherboard][:bios_version]      = safe_reg(reg, "BIOSVersion")
+      if Gem::win_platform?
+        begin
+          Win32::Registry::HKEY_LOCAL_MACHINE.open("HARDWARE\\DESCRIPTION\\System\\BIOS", Win32::Registry::KEY_READ) do |reg|
+            @data[:system][:motherboard][:manufacturer]      = safe_reg(reg, "SystemManufacturer")
+            @data[:system][:motherboard][:model]             = safe_reg(reg, "SystemProductName")
+            @data[:system][:motherboard][:bios_vendor]       = safe_reg(reg, "BIOSVendor")
+            @data[:system][:motherboard][:bios_release_date] = safe_reg(reg, "BIOSReleaseDate")
+            @data[:system][:motherboard][:bios_version]      = safe_reg(reg, "BIOSVersion")
+          end
+        rescue Win32::Registry::Error
+          @data[:system][:motherboard][:manufacturer]      = "Unknown"
+          @data[:system][:motherboard][:model]             = "Unknown"
+          @data[:system][:motherboard][:bios_vendor]       = "Unknown"
+          @data[:system][:motherboard][:bios_release_date] = "Unknown"
+          @data[:system][:motherboard][:bios_version]      = "Unknown"
+        end
+      else # unix
+        @data[:system][:motherboard][:manufacturer]      = safe_file("/sys/devices/virtual/dmi/id/board_vendor")
+        @data[:system][:motherboard][:model]             = safe_file("/sys/devices/virtual/dmi/id/board_name")
+        @data[:system][:motherboard][:bios_version]      = safe_file("/sys/devices/virtual/dmi/id/board_version")
       end
-    rescue Win32::Registry::Error
-      @data[:system][:motherboard][:manufacturer]      = "Unknown"
-      @data[:system][:motherboard][:model]             = "Unknown"
-      @data[:system][:motherboard][:bios_vendor]       = "Unknown"
-      @data[:system][:motherboard][:bios_release_date] = "Unknown"
-      @data[:system][:motherboard][:bios_version]      = "Unknown"
     end
 
     def query_operating_system
-      return unless Gem::win_platform?
-
-      Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", Win32::Registry::KEY_READ) do |reg|
-        @data[:system][:operating_system][:name]    = safe_reg(reg, "ProductName")
-        @data[:system][:operating_system][:build]   = safe_reg(reg, "CurrentBuild")
-        @data[:system][:operating_system][:version] = safe_reg(reg, "DisplayVersion")
-        @data[:system][:operating_system][:edition] = safe_reg(reg, "EditionID")
+      if Gem::win_platform?
+        begin
+          Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", Win32::Registry::KEY_READ) do |reg|
+            @data[:system][:operating_system][:name]    = safe_reg(reg, "ProductName")
+            @data[:system][:operating_system][:build]   = safe_reg(reg, "CurrentBuild")
+            @data[:system][:operating_system][:version] = safe_reg(reg, "DisplayVersion")
+            @data[:system][:operating_system][:edition] = safe_reg(reg, "EditionID")
+          end
+        rescue Win32::Registry::Error
+          @data[:system][:operating_system][:name]    = "Unknown"
+          @data[:system][:operating_system][:build]   = "Unknown"
+          @data[:system][:operating_system][:version] = "Unknown"
+          @data[:system][:operating_system][:edition] = "Unknown"
+        end
+      else # unix
+        release_info = query_release_info
+        @data[:system][:operating_system][:name]    = release_info["pretty_name"] || release_info["name"] || "Unknown"
+        @data[:system][:operating_system][:build]   = release_info["version_codename"] || release_info["build_id"] || "Unknown"
+        @data[:system][:operating_system][:version] = release_info["version_id"] || release_info["build_id"] || "Unknown"
+        @data[:system][:operating_system][:edition] = release_info["id"] || release_info["id_like"] || "Unknown"
       end
-    rescue Win32::Registry::Error
-      @data[:system][:operating_system][:name]    = "Unknown"
-      @data[:system][:operating_system][:build]   = "Unknown"
-      @data[:system][:operating_system][:version] = "Unknown"
-      @data[:system][:operating_system][:edition] = "Unknown"
     end
 
     def query_cpus
@@ -122,6 +136,16 @@ class W3DHub
           end
         rescue Win32::Registry::Error
         end
+      else
+        cpu_info = query_cpu_info
+        cpu_info.each do |cpu|
+          @data[:system][:cpus] << {
+            manufacturer: cpu["manufacturer"] || "Unknown",
+            model: cpu["model"] || "Unknown",
+            mhz: cpu["mhz"] || "Unknown",
+            family: cpu["family"] || "Unknown"
+          }
+        end
       end
 
       instruction_sets = %w[ HasRDTSC HasAltiVec HasMMX Has3DNow HasSSE HasSSE2 HasSSE3 HasSSE41 HasSSE42 HasAVX HasAVX2 HasAVX512F HasARMSIMD HasNEON ] # HasLSX HasLASX # These cause a crash atm
@@ -140,44 +164,57 @@ class W3DHub
     end
 
     def query_gpus
-      return unless Gem::win_platform?
+      if Gem::win_platform?
+        begin
+          Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\ControlSet001\\Control\\Class\\{4d36e968-e325-11ce-bfc1-08002be10318}", Win32::Registry::KEY_READ) do |reg|
+            i = 0
 
-      Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\ControlSet001\\Control\\Class\\{4d36e968-e325-11ce-bfc1-08002be10318}", Win32::Registry::KEY_READ) do |reg|
-        i = 0
+            reg.each_key do |key, _|
+              next unless key.start_with?("0")
 
-        reg.each_key do |key, _|
-          next unless key.start_with?("0")
-
-          reg.open(key) do |device|
-            vram = -1
-
-            begin
-              vram = device["HardwareInformation.qwMemorySize"].to_i
-            rescue Win32::Registry::Error, TypeError
-              begin
-                vram = device["HardwareInformation.MemorySize"].to_i
-              rescue Win32::Registry::Error, TypeError
+              reg.open(key) do |device|
                 vram = -1
+
+                begin
+                  vram = device["HardwareInformation.qwMemorySize"].to_i
+                rescue Win32::Registry::Error, TypeError
+                  begin
+                    vram = device["HardwareInformation.MemorySize"].to_i
+                  rescue Win32::Registry::Error, TypeError
+                    vram = -1
+                  end
+                end
+
+                next if vram.negative?
+
+                vram = vram / 1024.0 / 1024.0
+
+                @data[:system][:gpus] << {
+                  manufacturer: safe_reg(device, "ProviderName"),
+                  model: safe_reg(device, "DriverDesc"),
+                  vram: vram.round,
+                  driver_date: safe_reg(device, "DriverDate"),
+                  driver_version: safe_reg(device, "DriverVersion")
+                }
+
+                i += 1
               end
             end
-
-            next if vram.negative?
-
-            vram = vram / 1024.0 / 1024.0
-
-            @data[:system][:gpus] << {
-              manufacturer: safe_reg(device, "ProviderName"),
-              model: safe_reg(device, "DriverDesc"),
-              vram: vram.round,
-              driver_date: safe_reg(device, "DriverDate"),
-              driver_version: safe_reg(device, "DriverVersion")
-            }
-
-            i += 1
           end
+        rescue Win32::Registry::Error
+        end
+      else # unix
+        gpu_info = query_glx_info
+        gpu_info.each do |gpu|
+          @data[:system][:gpus] << {
+            manufacturer: gpu["manufacturer"] || "Unknown",
+            model: gpu["model"] || "Unknown",
+            vram: gpu["vram"].to_i,
+            driver_date: gpu["driver_date"] || "Unknown",
+            driver_version: gpu["driver_version"] || "Unknown"
+          }
         end
       end
-    rescue Win32::Registry::Error
     end
 
     def safe_reg(reg, key, default_value = "Unknown")
@@ -185,5 +222,130 @@ class W3DHub
     rescue Win32::Registry::Error
       default_value
     end
+
+    def safe_file(path, default_value = "Unknown")
+      value = File.read(path).to_s.strip
+      return default_value if value.downcase == "default string"
+
+      value
+    rescue
+      default_value
+    end
+
+    def query_release_info
+      hash = {}
+
+      File.open("/etc/os-release") do |f|
+        f.each_line do |line|
+          line = line.strip
+
+          key, value = line.split("=", 2)
+          value.gsub!('"', "")
+
+          hash[key.downcase] = value
+        end
+      end
+
+      hash
+    rescue
+      hash
+    end
+
+    def query_cpu_info
+      cpus = []
+
+      cpu = {}
+      File.open("/proc/cpuinfo") do |f|
+        f.each_line do |line|
+          line = line.strip
+
+          if line.empty?
+            cpu["family"] = format(
+              "%s Family %s Model %s Stepping %s",
+              cpu["manufacturer"] || "Unknown",
+              cpu["_family"] || "Unknown",
+              cpu["_model"] || "Unknown",
+              cpu["_stepping"] || "Unknown",
+            )
+
+            cpus << cpu
+            cpu = {}
+
+            next
+          end
+
+          key, value = line.split(":", 2).map(&:strip)
+
+          case key.downcase
+          when "vendor_id"
+            cpu["manufacturer"] = value
+          when "model name"
+            cpu["model"] = value
+          when "cpu mhz"
+            cpu["mhz"] = value
+
+          when "cpu family"
+            cpu["_family"] = value
+          when "model"
+            cpu["_model"] = value
+          when "stepping"
+            cpu["_stepping"] = value
+          end
+        end
+      end
+
+      cpus
+    rescue
+      cpus
+    end
+
+    def query_glx_info
+      gpus = []
+      glxinfo = `glxinfo`
+
+      return gpus if glxinfo.empty?
+
+      gpu = {}
+      glxinfo.lines do |line|
+        line = line.strip
+
+        next if line.empty?
+
+        key, value = line.split(":", 2).map(&:strip)
+
+        mesa_info = false
+        gpu_memory_info = false
+        case key.downcase
+        when "opengl vendor string"
+          if mesa_info
+            gpus << gpu
+            gpu = {}
+
+            break
+          end
+        when /extended renderer info \(GLX_MESA_query_renderer\)/i
+          # Joy and happiness
+          mesa_info = true
+        when /Memory info \(GL_NVX_gpu_memory_info\)/i
+          # Happiness and joy
+          gpu_memory_info = true
+        when "vendor", "opengl vendor string"
+          gpu["manufacturer"] = value
+        when "device", "opengl renderer string"
+          gpu["model"] = value
+        when "version"
+          gpu["driver_version"] = value
+        when "video memory", "dedicated video memory"
+          gpu["vram"] = value.gsub(/[\D]+/, "")
+        when "opengl version string"
+          gpus << gpu
+          gpu = {}
+
+          break
+        end
+      end
+
+      gpus
+    end
   end
 end

lib/version.rb

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

lib/ww_mix.rb

@@ -228,27 +228,34 @@ class W3DHub
       @encrypted
     end
 
-    def add_file(path:)
+    def add_file(path:, replace: false)
       return false unless File.exist?(path)
       return false if File.directory?(path)
 
-      info = EntryInfoHeader.new(0, 0, File.size(path))
-      @entries << Entry.new(name: File.basename(path), path: path, info: info)
-
-      true
+      entry = Entry.new(name: File.basename(path), path: path, info: EntryInfoHeader.new(0, 0, File.size(path)))
+      add_entry(entry: entry, replace: replace)
     end
 
-    def add_blob(path:, blob:)
+    def add_blob(path:, blob:, replace: false)
       info = EntryInfoHeader.new(0, 0, blob.size)
-      @entries << Entry.new(name: File.basename(path), path: path, info: info, blob: blob)
+      entry = Entry.new(name: File.basename(path), path: path, info: info, blob: blob)
       into.crc32 = @entries.last.calculate_crc32
 
-      true
+      add_entry(entry: entry, replace: replace)
     end
 
-    def add_entry(entry:)
-      @entries << entry
+    def add_entry(entry:, replace: false)
+      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