Fixed Task#verify_files, patching will now actually delete removed files now, some minor refactoring.

lib/application_manager/task.rb

@@ -27,8 +27,9 @@ class W3DHub
         @bytes_downloaded = -1
 
         @manifests = []
-        @files = {}
+        @files = []
         @packages = []
+        @deleted_files = [] # TODO: remove removed files
 
         @wine_prefix = nil
 
@@ -216,7 +217,7 @@ class W3DHub
         @manifests
       end
 
-      def build_package_list(manifests)
+      def build_package_list
         @status.operations.clear
         @status.label = "Downloading #{@application.name}..."
         @status.value = "Building package list..."
@@ -224,31 +225,29 @@ class W3DHub
 
         @status.step = :build_package_list
 
-        files = []
+        # Process manifest game files in OLDEST to NEWEST order so we can simply remove preceeding files from the array that aren't needed
-        packages = []
+        @manifests.reverse.each do |manifest|
-        deleted_files = [] # TODO: remove removed files
-
-        manifests.reverse.each do |manifest|
           logger.info(LOG_TAG) { "#{manifest.game}-#{manifest.type}: #{manifest.version} (#{manifest.base_version})" }
 
           manifest.files.each do |file|
-            @files["#{file.name}:#{manifest.version}"] = file
-
             if file.removed? # No package data
-              files.delete_if { |f| f.name == file.name }
+              @files.delete_if { |f| f.name.casecmp?(file.name) }
-              deleted_files.push(file)
+              @deleted_files.push(file)
               next
             end
 
-            files.delete_if { |f| f.name == file.name } unless file.patch?
+            @files.delete_if { |f| f.name.casecmp?(file.name) } unless file.patch?
 
-            files.push(file)
+            # If file has been recreated in a newer patch, don't delete it; A full file package will exist for it so it will get completely replaced.
+            @deleted_files.delete_if { |f| f.name.casecmp?(file.name) }
+
+            @files.push(file)
           end
 
           # TODO: Dependencies
         end
 
-        files.each do |file|
+        @files.each do |file|
           next if packages.detect do |pkg|
             pkg.category == "games" &&
             pkg.subcategory == @app_id &&
@@ -263,11 +262,10 @@ class W3DHub
           packages.push(package)
         end
 
-
+        @packages = packages
-        packages
       end
 
-      def verify_files(manifests, packages)
+      def verify_files
         @status.operations.clear
         @status.label = "Downloading #{@application.name}..."
         @status.value = "Verifying installed files..."
@@ -284,10 +282,11 @@ class W3DHub
 
         folder_exists = File.directory?(path)
 
-        manifests.each do |manifest|
+        # Process manifest game files in NEWEST to OLDEST order so that we don't erroneously flag
+        #   valid files as invalid due to an OLDER version of the file being checked FIRST.
+        @files.reverse.each do |file|
           break unless folder_exists
 
-          manifest.files.each do |file|
           safe_file_name = file.name.gsub("\\", "/")
           # Fix borked Data -> data 'cause Windows don't care about capitalization
           safe_file_name.sub!("Data/", "data/")
@@ -301,8 +300,8 @@ class W3DHub
           next if accepted_files.key?(safe_file_name)
 
           unless File.exist?(file_path)
-              rejected_files << { file: file, manifest_version: manifest.version }
+            rejected_files << { file: file, manifest_version: file.version }
-              logger.info(LOG_TAG) { "[#{manifest.version}] File missing: #{file_path}" }
+            logger.info(LOG_TAG) { "[#{file.version}] File missing: #{file_path}" }
             next
           end
 
@@ -318,12 +317,11 @@ class W3DHub
           logger.info(LOG_TAG) { file.inspect } if file.checksum.nil?
 
           if digest.hexdigest.upcase == file.checksum.upcase
-              accepted_files[safe_file_name] = manifest.version
+            accepted_files[safe_file_name] = file.version
-              logger.info(LOG_TAG) { "[#{manifest.version}] Verified file: #{file_path}" }
+            logger.info(LOG_TAG) { "[#{file.version}] Verified file: #{file_path}" }
           else
-              rejected_files << { file: file, manifest_version: manifest.version }
+            rejected_files << { file: file, manifest_version: file.version }
-              logger.info(LOG_TAG) { "[#{manifest.version}] File failed Verification: #{file_path}" }
+            logger.info(LOG_TAG) { "[#{file.version}] File failed Verification: #{file_path}" }
-            end
           end
         end
 
@@ -332,11 +330,10 @@ class W3DHub
         selected_packages = []
         selected_packages_hash = {}
 
-        # FIXME: Refactoring `build_package_list` has broken this bit since we no longer fetch EVERYTHING and actually DON'T download REMOVED files
         rejected_files.each do |hash|
           next if selected_packages_hash["#{hash[:file].package}_#{hash[:manifest_version]}"]
 
-          package = packages.find { |pkg| pkg.name == hash[:file].package && pkg.version == hash[:manifest_version] }
+          package = @packages.find { |pkg| pkg.name.casecmp?(hash[:file].package) && pkg.version == hash[:manifest_version] }
 
           if package
             selected_packages_hash["#{hash[:file].package}_#{hash[:manifest_version]}"] = true
@@ -347,13 +344,15 @@ class W3DHub
         end
 
         # Removed packages that don't need to be fetched or processed
-        packages.delete_if { |package| !selected_packages.find { |pkg| pkg == package } } if folder_exists
+        @packages.delete_if { |package| !selected_packages.find { |pkg| pkg == package } } if folder_exists
 
-        packages
+        @packages
       end
 
-      def fetch_packages(packages)
+      def fetch_packages
-        hashes = packages.map do |pkg|
+        return if @packages.empty?
+
+        hashes = @packages.map do |pkg|
           {
             category: pkg.category,
             subcategory: pkg.subcategory,
@@ -364,10 +363,13 @@ class W3DHub
 
         package_details = Api.package_details(hashes)
 
-        if package_details
+        unless package_details
-          @packages = [package_details].flatten
+          fail!("Failed to fetch package details")
-          @packages.each do |rich|
+          return
-            package = packages.find do |pkg|
+        end
+
+        [package_details].flatten.each do |rich|
+          package = @packages.find do |pkg|
             pkg.category == rich.category &&
             pkg.subcategory == rich.subcategory &&
             "#{pkg.name}.zip" == rich.name &&
@@ -445,15 +447,12 @@ class W3DHub
         end
 
         pool.manage_pool
-        else
-          fail!("Failed to fetch package details")
-        end
       end
 
-      def verify_packages(packages)
+      def verify_packages
       end
 
-      def unpack_packages(packages)
+      def unpack_packages
         path = Cache.install_path(@application, @channel)
         logger.info(LOG_TAG) { "Unpacking packages in '#{path}'..." }
         Cache.create_directories(path, true)
@@ -463,7 +462,7 @@ class W3DHub
         @status.value = "Unpacking..."
         @status.progress = 0.0
 
-        packages.each do |pkg|
+        @packages.each do |pkg|
           # FIXME: can't add a new key into hash during iteration (RuntimeError)
           @status.operations[:"#{pkg.checksum}"] = Status::Operation.new(
             label: pkg.name,
@@ -475,7 +474,7 @@ class W3DHub
         @status.step = :unpacking
 
         i = -1
-        packages.each do |package|
+        @packages.each do |package|
           i += 1
 
           status = if package.custom_is_patch
@@ -508,6 +507,23 @@ class W3DHub
         end
       end
 
+      def remove_deleted_files
+        return unless @deleted_files.size.positive?
+
+        logger.info(LOG_TAG) { "Removing dead files..." }
+
+        @deleted_files.each do |file|
+          logger.info(LOG_TAG) { "    #{file.name}" }
+
+          path = Cache.install_path(@application, @channel)
+          file_path = "#{path}/#{file.name}".sub('Data/', 'data/')
+
+          File.delete(file_path) if File.exist?(file_path)
+
+          logger.info(LOG_TAG) { "        removed." }
+        end
+      end
+
       def create_wine_prefix
         if W3DHub.unix? && @wine_prefix
           # TODO: create a wine prefix if configured
@@ -520,7 +536,7 @@ class W3DHub
         end
       end
 
-      def install_dependencies(packages)
+      def install_dependencies
         # TODO: install dependencies
         @status.operations.clear
         @status.label = "Installing #{@application.name}..."
@@ -658,7 +674,7 @@ class W3DHub
 
         logger.info(LOG_TAG) { "      Loading #{temp_path}/#{safe_file_name}.patch..." }
         patch_mix = W3DHub::Mixer::Reader.new(file_path: "#{temp_path}/#{safe_file_name}.patch", ignore_crc_mismatches: false)
-        patch_info = JSON.parse(patch_mix.package.files.find { |f| f.name == ".w3dhub.patch" || f.name == ".bhppatch" }.data, symbolize_names: true)
+        patch_info = JSON.parse(patch_mix.package.files.find { |f| f.name.casecmp?(".w3dhub.patch") || f.name.casecmp?(".bhppatch") }.data, symbolize_names: true)
 
         logger.info(LOG_TAG) { "      Loading #{path}/#{safe_file_name}..." }
         target_mix = W3DHub::Mixer::Reader.new(file_path: "#{path}/#{safe_file_name}", ignore_crc_mismatches: false)
@@ -666,15 +682,15 @@ class W3DHub
         logger.info(LOG_TAG) { "      Removing files..." } if patch_info[:removedFiles].size.positive?
         patch_info[:removedFiles].each do |file|
           logger.debug(LOG_TAG) { "        #{file}" }
-          target_mix.package.files.delete_if { |f| f.name == file }
+          target_mix.package.files.delete_if { |f| f.name.casecmp?(file) }
         end
 
         logger.info(LOG_TAG) { "      Adding/Updating files..." } if patch_info[:updatedFiles].size.positive?
         patch_info[:updatedFiles].each do |file|
           logger.debug(LOG_TAG) { "        #{file}" }
 
-          patch = patch_mix.package.files.find { |f| f.name == file }
+          patch = patch_mix.package.files.find { |f| f.name.casecmp?(file) }
-          target = target_mix.package.files.find { |f| f.name == file }
+          target = target_mix.package.files.find { |f| f.name.casecmp?(file) }
 
           if target
             target_mix.package.files[target_mix.package.files.index(target)] = patch

lib/application_manager/tasks/installer.rb

@@ -13,28 +13,31 @@ class W3DHub
         fail_fast
         return false if failed?
 
-        manifests = fetch_manifests
+        fetch_manifests
         return false if failed?
 
-        packages = build_package_list(manifests)
+        build_package_list
         return false if failed?
 
-        verify_files(manifests, packages)
+        remove_deleted_files
         return false if failed?
 
-        fetch_packages(packages)
+        verify_files
         return false if failed?
 
-        verify_packages(packages)
+        fetch_packages
         return false if failed?
 
-        unpack_packages(packages)
+        verify_packages
+        return false if failed?
+
+        unpack_packages
         return false if failed?
 
         create_wine_prefix
         return false if failed?
 
-        install_dependencies(packages)
+        install_dependencies
         return false if failed?
 
         mark_application_installed

lib/application_manager/tasks/repairer.rb

@@ -6,24 +6,6 @@ class W3DHub
       def type
         :repairer
       end
-
-      # def execute_task
-      #   fail_fast
-      #   return false if failed?
-
-      #   manifests = fetch_manifests
-      #   return false if failed?
-
-      #   packages = build_package_list(manifests)
-      #   return false if failed?
-
-      #   verify_files(manifests, packages)
-      #   return false if failed?
-
-      #   # pp packages.select { |pkg| pkg.name == "misc" }
-
-      #   true
-      # end
     end
   end
 end