Icarus-Mod-Tools 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7011bea56d03dd0edd74138d193a5ad4e5628c4c8d59e94abf6e8793b397051
-  data.tar.gz: 4e9c054fe489ec2abb4aa36f7b8ea9b6d5621723a8ce0cf50563166b7ef002ee
+  metadata.gz: f02e414cd84c6117e8ff650a1048c16eac751dae9cfe99a52a17a3e58682d1b0
+  data.tar.gz: f14a5bf74a4fcd74be9c71aba1debf378d45af6bc54290b35c2d20236e17d3af
 SHA512:
-  metadata.gz: 15d5e90ecb8c7f91accfb3ded406374278ab53e8b3d3d6b997e44904f4d9425acd0bd4461cf5def41dfe502ead8df5f0c54b5002380c78e7da928a39da45db8c
-  data.tar.gz: 0f9723a7821f213c70612c6510a2bc1c9508353cdf4e10ebf1568291f97e918325c12911e3621aaa4c82f7dd471c2236584d305532b40be32a84dcb0cafd90bf
+  metadata.gz: 636dfd397c992d7dd15d464584734f7e599417e1145f0cf139ffcf2f8eec9e409b473c4deae9abae453a42abbfe1f04138b36440669ead6db5c4386b6e33b4ca
+  data.tar.gz: b5085429a592dfc1bd8bbf0fde991ade384afcd88aedd50c6f0969a8a786b4c3e98c740fda3053aa48c52ea734dfe74381d2d8797dde0b0e563abc467ec3e75d

data/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 ## History (reverse chronological order)
 
+### v2.6.0 - 2026-03-04
+
+- Add `imt sync cleanup` command to remove duplicate entries from mods and tools collections
+  - Groups entries by name+author and keeps the most recently updated
+  - Supports `--dry-run` to preview what would be deleted
+- Fix `find_info` to match by both name AND author, not just name
+  - Previously, mods/tools with the same name but different authors could cause incorrect deletion logic
+  - Now consistent with `info_array` deduplication and `find_by_type` lookups
+
+### v2.5.2 - 2026-02-09
+
+- Fix duplicate entries created during sync operations
+  - Update Firestore cache after creating new documents to prevent duplicate creation within the same sync run
+  - Deduplicate info arrays by name+author before processing (handles duplicate/equivalent modinfo URLs)
+  - Strip empty file entries (e.g., `pak: ""`) from database writes
+  - Fix `id=` setter on Baseinfo (was silently no-op via method_missing, now uses attr_accessor)
+
 ### v2.5.1 - 2026-01-31
 
 - Fix `imt remove repo` failing to find repositories stored as full URLs

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (2.5.0)
+    Icarus-Mod-Tools (2.5.3)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       paint (~> 2.3)

data/lib/icarus/mod/cli/sync.rb

@@ -52,11 +52,63 @@ module Icarus
           sync_list(:tools)
         end
 
+        desc "cleanup", "Remove duplicate entries from mods and tools collections"
+        def cleanup
+          cleanup_duplicates(:mods)
+          cleanup_duplicates(:tools)
+        end
+
         no_commands do
           def firestore
             $firestore ||= Firestore.new
           end
 
+          def cleanup_duplicates(type)
+            singular_type = type.to_s.chomp("s").to_sym
+            collection = firestore.send(type)
+
+            puts "Scanning #{type} for duplicates..." if verbose?
+
+            # Group by [name, author]
+            grouped = collection.group_by { |item| [item.name, item.author] }
+            duplicates = grouped.select { |_, items| items.length > 1 }
+
+            if duplicates.empty?
+              puts "No duplicate #{type} found." if verbose?
+              return
+            end
+
+            puts "Found #{duplicates.length} duplicate #{singular_type}(s) to clean up:" if verbose?
+
+            duplicates.each do |key, items|
+              name, author = key
+              # Sort by updated_at descending, keep the most recent
+              sorted = items.sort_by { |item| item.updated_at || Time.at(0) }.reverse
+              keeper = sorted.first
+              to_delete = sorted[1..]
+
+              puts "  #{author}/#{name}: #{items.length} entries" if verbose?
+              puts "    Keeping: #{keeper.id} (updated: #{keeper.updated_at})" if verbose?
+
+              to_delete.each do |item|
+                if options[:dry_run]
+                  puts Paint["    Would delete: #{item.id} (updated: #{item.updated_at})", :yellow] if verbose?
+                else
+                  puts "    Deleting: #{item.id} (updated: #{item.updated_at})" if verbose?
+                  response = firestore.delete(singular_type, item)
+                  puts "      #{success_or_failure(response)}" if verbose > 1
+                end
+              end
+            end
+
+            deleted_count = duplicates.values.sum { |items| items.length - 1 }
+            if options[:dry_run]
+              puts Paint["Dry run; no changes made. Would have deleted #{deleted_count} duplicate #{type}.", :yellow] if verbose?
+            else
+              puts "Deleted #{deleted_count} duplicate #{type}." if verbose?
+            end
+          end
+
           def success_or_failure(status)
             format("%<status>10s", status: status ? Paint["Success", :green] : Paint["Failure", :red])
           end

data/lib/icarus/mod/firestore.rb

@@ -106,7 +106,15 @@ module Icarus
 
         return @client.doc("#{collections.send(type)}/#{doc_id}").set(payload.to_h, merge:) if doc_id
 
-        @client.col(collections.send(type)).add(payload.to_h)
+        doc_ref = @client.col(collections.send(type)).add(payload.to_h)
+
+        # Update cache to prevent duplicate creation within the same sync run
+        payload.id = doc_ref.document_id
+        cache_var = :"@#{type}"
+        cached_collection = instance_variable_get(cache_var)
+        cached_collection&.push(payload)
+
+        doc_ref
       end
 
       def pluralize(type)

data/lib/icarus/mod/tools/baseinfo.rb

@@ -5,7 +5,8 @@ module Icarus
     module Tools
       # Base class for Modinfo and Toolinfo
       class Baseinfo
-        attr_reader :data, :id, :created_at, :updated_at
+        attr_reader :data
+        attr_accessor :id, :created_at, :updated_at
 
         HASHKEYS = %i[name author version compatibility description files imageURL readmeURL].freeze
 
@@ -78,6 +79,7 @@ module Icarus
           db_hash = HASHKEYS.each_with_object({}) { |key, hash| hash[key] = @data[key] }
 
           db_hash[:version] = "1.0" if version.nil?
+          db_hash[:files] = db_hash[:files]&.reject { |_, url| url.nil? || url.to_s.strip.empty? }
 
           db_hash
         end

data/lib/icarus/mod/tools/sync/mods.rb

@@ -21,14 +21,14 @@ module Icarus
 
           def info_array
             @info_array ||= @firestore.modinfo.map do |url|
-              retrieve_from_url(url)[:mods].map { |mod| Icarus::Mod::Tools::Modinfo.new(mod) if mod[:name].match?(/[a-z0-9]+/i) }
+              retrieve_from_url(url)[:mods].map { |mod| Icarus::Mod::Tools::Modinfo.new(mod) if /[a-z0-9]+/i.match?(mod[:name]) }
             rescue Icarus::Mod::Tools::Sync::RequestFailed
               warn "Skipped; Failed to retrieve #{url}"
               next
             rescue JSON::ParserError => e
               warn "Skipped; Invalid JSON in #{url}: #{e.message}"
               next
-            end.flatten.compact
+            end.flatten.compact.uniq { |mod| [mod.name, mod.author] }
           end
 
           def find(modinfo)
@@ -36,7 +36,7 @@ module Icarus
           end
 
           def find_info(modinfo)
-            @info_array.find { |mod| mod.name == modinfo.name }
+            @info_array.find { |mod| mod.name == modinfo.name && mod.author == modinfo.author }
           end
 
           def update(modinfo)

data/lib/icarus/mod/tools/sync/tools.rb

@@ -30,7 +30,7 @@ module Icarus
             rescue JSON::ParserError => e
               warn "Skipped; Invalid JSON in #{url}: #{e.message}"
               next
-            end.flatten.compact
+            end.flatten.compact.uniq { |tool| [tool.name, tool.author] }
           end
 
           def find(toolinfo)
@@ -38,7 +38,7 @@ module Icarus
           end
 
           def find_info(toolinfo)
-            @info_array.find { |tool| tool.name == toolinfo.name }
+            @info_array.find { |tool| tool.name == toolinfo.name && tool.author == toolinfo.author }
           end
 
           def update(toolinfo)

data/lib/icarus/mod/version.rb

@@ -2,6 +2,6 @@
 
 module Icarus
   module Mod
-    VERSION = "2.5.1"
+    VERSION = "2.6.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Icarus-Mod-Tools
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Donovan Young