Icarus-Mod-Tools 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89daa8f362dd79f861a471ca6793f767e753fd2627d0ba8e1845fedaace7d12
-  data.tar.gz: a47625e44ac934097f21f17303068728926b9a32e814c81d09736bc49d08cefd
+  metadata.gz: d70aff1f7ed368044b414fdca605fa438e0fbfe68c2af436d534a233fc6bff17
+  data.tar.gz: e4467d443894344c50a2c3c663e262afd7e54cc806da308ecd16d732bcd2c844
 SHA512:
-  metadata.gz: dd9a8c3c7d816b49d5e5f5828b66f87646b0fa9f8d01cd11ab8034a3572c0a1942e5459f51d22a518d70433b938d4041bfd8dfba0ea3943fa0dd82747a2980f2
-  data.tar.gz: 2f82e939d00a943115b2c32432883fe6086a62da45e2749eb6db6d86f6bd73298c79d45ae808a23dbf4d612729d5510387b04159915a92ec43984f4e3239f3c6
+  metadata.gz: 26c83360237ab149e6738e60966df113f8ede55460f85b0b2de29dd690cea238cdfda8af0ffc70f288ca58765b535d18b2cfcb21e0619b0a8226bfe099e7fecc
+  data.tar.gz: 278435526ede69d45383920bee07fc3fc094924d022ed55c54141d00e9b53ef003d7688fb26bc4f251e3b13705b743013875583d553ca8c22198a7daeb590238

data/.rubocop.yml

@@ -38,11 +38,17 @@ Metrics/AbcSize:
   Exclude:
     - lib/icarus/mod/cli/*.rb # Thor command files
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 
 Metrics/MethodLength:
-  Max: 50
+  Enabled: false
+
+Naming/BlockForwarding:
+  EnforcedStyle: explicit
 
 RSpec/MultipleMemoizedHelpers:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (1.8.0)
+    Icarus-Mod-Tools (1.8.1)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       paint (~> 2.3)
@@ -14,7 +14,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
@@ -38,7 +38,7 @@ GEM
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.0)
-    google-cloud-firestore (2.8.0)
+    google-cloud-firestore (2.9.0)
       concurrent-ruby (~> 1.0)
       google-cloud-core (~> 1.5)
       google-cloud-firestore-v1 (~> 0.0)
@@ -65,10 +65,10 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.50.0-x86_64-darwin)
+    grpc (1.51.0-x86_64-darwin)
       google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.50.0-x86_64-linux)
+    grpc (1.51.0-x86_64-linux)
       google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
     guard (2.18.0)
@@ -131,7 +131,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.43.0)
+    rubocop (1.44.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)

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

@@ -15,6 +15,14 @@ module Icarus
           puts firestore.update(:modinfo, payload, merge: true) ? "Success" : "Failure"
         end
 
+        desc "proginfo", "Adds an entry to 'meta/proginfo/list'"
+        def proginfo(item)
+          firestore = Firestore.new
+          payload = [firestore.list(:proginfo), item].flatten.compact
+
+          puts firestore.update(:proginfo, payload, merge: true) ? "Success" : "Failure"
+        end
+
         desc "repos", "Adds an entry to 'meta/repos/list'"
         def repos(item)
           firestore = Firestore.new

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

@@ -33,63 +33,75 @@ module Icarus
         method_option :sort, type: :string, default: "name", desc: "Sort by field (name, author, etc.)"
         method_option :filter, type: :array, default: [], desc: "Filter by field (name, author, etc.)"
         def mods
-          valid_keys = Icarus::Mod::Tools::Modinfo::HASHKEYS + [:updated_at]
+          list_for_type(:mods)
+        end
 
-          sort_field = options[:sort]&.to_sym
+        desc "progs", "Displays data from 'progs'"
+        method_option :sort, type: :string, default: "name", desc: "Sort by field (name, author, etc.)"
+        method_option :filter, type: :array, default: [], desc: "Filter by field (name, author, etc.)"
+        def progs
+          list_for_type(:progs)
+        end
 
-          filter = !options[:filter].empty?
+        no_commands do
+          def list_for_type(type)
+            klass = type == :mods ? Icarus::Mod::Tools::Modinfo : Icarus::Mod::Tools::Proginfo
+            valid_keys = klass::HASHKEYS + [:updated_at]
+            sort_field = options[:sort]&.to_sym
+            filter     = !options[:filter].empty?
 
-          if filter
-            filter_field = options[:filter].first&.to_sym
-            filter_value = options[:filter].last&.to_s
+            if filter
+              filter_field = options[:filter].first&.to_sym
+              filter_value = options[:filter].last&.to_s
 
-            raise Icarus::Mod::Tools::Error, "Invalid filter option #{options[:filter]}" unless options[:filter].empty? || options[:filter]&.count == 2
+              raise Icarus::Mod::Tools::Error, "Invalid filter option #{options[:filter]}" unless options[:filter].empty? || options[:filter]&.count == 2
 
-            raise Icarus::Mod::Tools::Error, "Invalid filter field '#{filter_field}'" unless filter_field && valid_keys.include?(filter_field)
-          end
+              raise Icarus::Mod::Tools::Error, "Invalid filter field '#{filter_field}'" unless filter_field && valid_keys.include?(filter_field)
+            end
 
-          raise Icarus::Mod::Tools::Error, "Invalid sort field '#{sort_field}'" unless valid_keys.include?(sort_field)
+            raise Icarus::Mod::Tools::Error, "Invalid sort field '#{sort_field}'" unless valid_keys.include?(sort_field)
 
-          puts "Sorted by #{sort_field}" if sort_field && verbose > 2
-          puts "Filtered by #{filter_field} = #{filter_value}" if filter_field && verbose > 2
+            puts "Sorted by #{sort_field}" if sort_field && verbose > 2
+            puts "Filtered by #{filter_field} = #{filter_value}" if filter_field && verbose > 2
 
-          mods = Firestore.new.list(:mods)
+            items = Firestore.new.list(type)
 
-          # Filter by field
-          mods.select! { |mod| mod.send(filter_field).downcase =~ /#{filter_value&.downcase}/ } if filter_field
+            # Filter by field
+            items.select! { |item| item.send(filter_field).downcase =~ /#{filter_value&.downcase}/ } if filter_field
 
-          if mods.empty?
-            puts "no mods found" if verbose?
-            return
-          end
+            if items.empty?
+              puts "no entries found" if verbose?
+              return
+            end
 
-          header_format = "%-<name>50s %-<author>20s %-<version>10s %-<updated_at>20s"
-          header_format += " %-<id>20s %<description>s" if verbose > 1
-
-          if verbose?
-            puts format(
-              header_format,
-              name: "NAME",
-              author: "AUTHOR",
-              version: "VERSION",
-              updated_at: "LAST UPDATED",
-              id: "ID",
-              description: "DESCRIPTION"
-            )
-          end
+            header_format = "%-<name>50s %-<author>20s %-<version>10s %-<updated_at>20s"
+            header_format += " %-<id>20s %<description>s" if verbose > 1
 
-          # Sort by field, optionally subsorting by name
-          (sort_field == :name ? mods.sort_by(&:name) : mods.sort_by { |mod| [mod.send(sort_field), mod.name] }).each do |mod|
-            data_format = "%-<name>50s %-<author>20s v%-<version>10s%-<updated_at>20s"
-            data_format += " %-<id>20s %<description>s" if verbose > 1
+            if verbose?
+              puts format(
+                header_format,
+                name: "NAME",
+                author: "AUTHOR",
+                version: "VERSION",
+                updated_at: "LAST UPDATED",
+                id: "ID",
+                description: "DESCRIPTION"
+              )
+            end
 
-            puts format(data_format, mod.to_h.merge(id: mod.id, updated_at: mod.updated_at.strftime("%Y-%m-%d %H:%M:%S")))
-          end
+            # Sort by field, optionally subsorting by name
+            (sort_field == :name ? items.sort_by(&:name) : items.sort_by { |item| [item.send(sort_field), item.name] }).each do |item|
+              data_format = "%-<name>50s %-<author>20s v%-<version>10s%-<updated_at>20s"
+              data_format += " %-<id>20s %<description>s" if verbose > 1
 
-          puts "Total: #{mods.count}" if verbose?
-        rescue Icarus::Mod::Tools::Error => e
-          puts e.message
-          exit 1
+              puts format(data_format, item.to_h.merge(id: item.id, updated_at: item.updated_at.strftime("%Y-%m-%d %H:%M:%S")))
+            end
+
+            puts "Total: #{items.count}" if verbose?
+          rescue Icarus::Mod::Tools::Error => e
+            puts e.message
+            exit 1
+          end
         end
       end
     end

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

@@ -22,176 +22,110 @@ module Icarus
 
         desc "modinfo", "Reads from 'meta/repos/list' and Syncs any modinfo files we find (github only for now)"
         def modinfo
-          modinfo_sync = Icarus::Mod::Tools::ModinfoSync.new
-
-          puts "Retrieving repository Data..." if verbose?
-          repositories = modinfo_sync.repositories
-
-          raise Icarus::Mod::Tools::Error, "Unable to find any repositories!" unless repositories.any?
-
-          puts "Retrieving modinfo Array..." if verbose?
-          modinfo_array = modinfo_sync.modinfo_data(repositories, verbose: verbose > 1)&.map(&:download_url)&.compact
-
-          raise Icarus::Mod::Tools::Error, "No modinfo.json files found" unless modinfo_array&.any?
-
-          if options[:dry_run]
-            puts "Dry run; no changes will be made"
-            return
-          end
-
-          puts "Saving to Firestore..." if verbose?
-          response = modinfo_sync.update(modinfo_array)
-          puts response ? "Success" : "Failure (may be no changes)" if verbose?
-        rescue Icarus::Mod::Tools::Error => e
-          warn e.message
+          sync_info(:modinfo)
         end
 
         desc "proginfo", "Reads from 'meta/repos/list' and Syncs any proginfo files we find (github only for now)"
         def proginfo
-          proginfo_sync = Icarus::Mod::Tools::ProginfoSync.new
-
-          puts "Retrieving repository Data..." if verbose?
-          repositories = proginfo_sync.repositories
-
-          raise Icarus::Mod::Tools::Error, "Unable to find any repositories!" unless repositories.any?
-
-          puts "Retrieving proginfo Array..." if verbose?
-          proginfo_array = proginfo_sync.proginfo_data(repositories, verbose: verbose > 1)&.map(&:download_url)&.compact
-
-          raise Icarus::Mod::Tools::Error, "no proginfo.json files found" unless proginfo_array&.any?
-
-          if options[:dry_run]
-            puts "Dry run; no changes will be made"
-            return
-          end
-
-          puts "Saving to Firestore..." if verbose?
-          response = proginfo_sync.update(proginfo_array)
-          puts response ? "Success" : "Failure (may be no changes)" if verbose?
-        rescue Icarus::Mod::Tools::Error => e
-          warn e.message
+          sync_info(:proginfo)
         end
 
         desc "mods", "Reads from 'meta/modinfo/list' and updates the 'mods' database accordingly"
         method_option :check, type: :boolean, default: false, desc: "Validate modinfo without applying changes"
         def mods
-          modsync = Icarus::Mod::Tools::ModSync.new
-
-          puts "Retrieving modinfo Data..." if verbose?
-          modinfo_array = modsync.modinfo_array
+          sync_list(:mods)
+        end
 
-          puts "Retrieving mod Data..." if verbose?
-          mod_array = modsync.mods
+        desc "progs", "Reads from 'meta/proginfo/list' and updates the 'progs' database accordingly"
+        method_option :check, type: :boolean, default: false, desc: "Validate proginfo without applying changes"
+        def progs
+          sync_list(:progs)
+        end
 
-          return if options[:check]
+        no_commands do
+          def sync_info(type)
+            sync = (type == :modinfo ? Icarus::Mod::Tools::ModinfoSync : Icarus::Mod::Tools::ProginfoSync).new
 
-          puts "Updating mod Data..." if verbose?
-          modinfo_array.each do |mod|
-            verb = "Creating"
+            puts "Retrieving repository Data..." if verbose?
+            repositories = sync.repositories
 
-            puts "Validating modinfo Data for #{mod.uniq_name}..." if verbose > 2
-            warn "Skipping mod #{mod.uniq_name} due to validation errors" && next unless mod.validate
+            raise Icarus::Mod::Tools::Error, "Unable to find any repositories!" unless repositories.any?
 
-            doc_id = modsync.find_mod(mod)
-            if doc_id
-              puts "Found existing mod #{mod.name} at #{doc_id}" if verbose > 2
-              mod.id = doc_id
-              verb = "Updating"
-            end
+            puts "Retrieving Info Array..." if verbose?
+            info_array = sync.data(repositories, verbose: verbose > 1)&.map(&:download_url)&.compact
 
-            print format("#{verb} %-<name>60s", name: "'#{mod.author || "NoOne"}/#{mod.name || "Unnamed"}'") if verbose > 1
+            raise Icarus::Mod::Tools::Error, "no .json files found for #{type}" unless info_array&.any?
 
             if options[:dry_run]
-              puts "Dry run; no changes will be made" if verbose > 1
-              next
+              puts "Dry run; no changes will be made"
+              return
             end
 
-            response = modsync.update(mod)
-            puts format("%<status>10s", status: response ? "Success" : "Failure") if verbose > 1
-          end
-
-          if options[:dry_run]
-            puts "Dry run; no changes will be made" if verbose?
-            return
+            puts "Saving to Firestore..." if verbose?
+            response = sync.update(info_array)
+            puts response ? "Success" : "Failure (may be no changes)" if verbose?
+          rescue Icarus::Mod::Tools::Error => e
+            warn e.message
           end
 
-          puts "Created/Updated #{modinfo_array.count} mods" if verbose?
+          def sync_list(type)
+            sync = (type == :mods ? Icarus::Mod::Tools::ModSync : Icarus::Mod::Tools::ProgSync).new
 
-          delete_array = mod_array.filter { |mod| modsync.find_modinfo(mod).nil? }
+            puts "Retrieving Info Data..." if verbose?
+            info_array = sync.info_array
 
-          return unless delete_array.any?
-
-          puts "Deleting outdated mods..." if verbose?
-          delete_array.each do |mod|
-            print format("Deleting %-<name>60s", name: "'#{mod.author || "NoOne"}/#{mod.name || "Unnamed'"}") if verbose > 1
-            response = modsync.delete(mod)
-            puts format("%<status>10s", status: response ? "Success" : "Failure") if verbose > 1
-          end
-
-          puts "Deleted #{delete_array.count} outdated mods" if verbose?
-        rescue Icarus::Mod::Tools::Error => e
-          warn e.message
-        end
+            puts "Retrieving List Data..." if verbose?
+            list_array = sync.send(type)
 
-        desc "progs", "Reads from 'meta/proginfo/list' and updates the 'progs' database accordingly"
-        method_option :check, type: :boolean, default: false, desc: "Validate proginfo without applying changes"
-        def progs
-          progsync = Icarus::Mod::Tools::ProgSync.new
+            return if options[:check]
 
-          puts "Retrieving proginfo Data..." if verbose?
-          proginfo_array = progsync.proginfo_array
+            puts "Updating List Data..." if verbose?
+            info_array.each do |list|
+              verb = "Creating"
 
-          puts "Retrieving progs Data..." if verbose?
-          prog_array = progsync.progs
+              puts "Validating Info Data for #{list.uniq_name}..." if verbose > 2
+              warn "Skipping List #{list.uniq_name} due to validation errors" && next unless list.valid?
 
-          return if options[:check]
+              doc_id = sync.find(list)
+              if doc_id
+                puts "Found existing list #{list.name} at #{doc_id}" if verbose > 2
+                list.id = doc_id
+                verb = "Updating"
+              end
 
-          puts "Updating Program Data..." if verbose?
-          proginfo_array.each do |prog|
-            verb = "Creating"
+              print format("#{verb} %-<name>60s", name: "'#{list.author || "NoOne"}/#{list.name || "Unnamed"}'") if verbose > 1
 
-            puts "Validating proginfo Data for #{prog.uniq_name}..." if verbose > 2
-            warn "Skipping program #{prog.uniq_name} due to validation errors" && next unless prog.validate
+              if options[:dry_run]
+                puts "Dry run; no changes will be made" if verbose > 1
+                next
+              end
 
-            doc_id = progsync.find_prog(prog)
-            if doc_id
-              puts "Found existing program #{prog.name} at #{doc_id}" if verbose > 2
-              prog.id = doc_id
-              verb = "Updating"
+              response = sync.update(list)
+              puts format("%<status>10s", status: response ? "Success" : "Failure") if verbose > 1
             end
 
-            print format("#{verb} %-<name>60s", name: "'#{prog.author || "NoOne"}/#{prog.name || "Unnamed"}'") if verbose > 1
-
             if options[:dry_run]
-              puts "Dry run; no changes will be made" if verbose > 1
-              next
+              puts "Dry run; no changes will be made" if verbose?
+              return
             end
 
-            response = progsync.update(prog)
-            puts format("%<status>10s", status: response ? "Success" : "Failure") if verbose > 1
-          end
+            puts "Created/Updated #{info_array.count} Items" if verbose?
 
-          if options[:dry_run]
-            puts "Dry run; no changes will be made" if verbose?
-            return
-          end
-
-          puts "Created/Updated #{proginfo_array.count} Programs" if verbose?
+            delete_array = list_array.filter { |list| sync.find_info(list).nil? }
 
-          delete_array = prog_array.filter { |prog| progsync.find_proginfo(prog).nil? }
+            return unless delete_array.any?
 
-          return unless delete_array.any?
+            puts "Deleting outdated items..." if verbose?
+            delete_array.each do |list|
+              print format("Deleting %-<name>60s", name: "'#{list.author || "NoOne"}/#{list.name || "Unnamed'"}") if verbose > 1
+              response = sync.delete(list)
+              puts format("%<status>10s", status: response ? "Success" : "Failure") if verbose > 1
+            end
 
-          puts "Deleting outdated programs..." if verbose?
-          delete_array.each do |prog|
-            print format("Deleting %-<name>60s", name: "'#{prog.author || "NoOne"}/#{prog.name || "Unnamed'"}") if verbose > 1
-            response = progsync.delete(prog)
-            puts format("%<status>10s", status: response ? "Success" : "Failure") if verbose > 1
+            puts "Deleted #{delete_array.count} outdated items" if verbose?
+          rescue Icarus::Mod::Tools::Error => e
+            warn e.message
           end
-
-          puts "Deleted #{delete_array.count} outdated programs" if verbose?
-        rescue Icarus::Mod::Tools::Error => e
-          warn e.message
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "tools/modinfo_validate"
+require "tools/validator"
 
 module Icarus
   module Mod
@@ -9,35 +9,46 @@ module Icarus
       class Validate < SubcommandBase
         desc "modinfo", "Reads modinfo data from 'meta/modinfo/list' and Validates syntax of modfiles"
         def modinfo
-          exit_code = 0
-          modinfo_validate = Icarus::Mod::Tools::ModinfoValidate.new
+          validate(:modinfo)
+        end
+
+        desc "proginfo", "Reads proginfo data from 'meta/proginfo/list' and Validates syntax of progfiles"
+        def proginfo
+          validate(:proginfo)
+        end
 
-          puts "Validating Entries..." if verbose?
-          max_length = modinfo_validate.modinfo_array.map { |modinfo| modinfo.uniq_name.length }.max
+        no_commands do
+          def validate(type)
+            exit_code = 0
+            validator = Icarus::Mod::Tools::Validator.new(type)
 
-          modinfo_validate.modinfo_array.each do |modinfo|
-            print Paint[format("%s %-#{max_length}s", "Running validation steps on", modinfo.uniq_name), :cyan, :bright] if verbose > 1
+            puts "Validating Entries..." if verbose?
+            max_length = validator.array.map { |info| info.uniq_name.length }.max + 1
 
-            modinfo.validate
+            validator.array.each do |info|
+              print Paint[format("%s %-#{max_length}s", "Running validation steps on", info.uniq_name), :cyan, :bright] if verbose > 1
 
-            if modinfo.errors.empty? && modinfo.warnings.empty?
-              puts Paint["SUCCESS", :green, :bright] if verbose > 1
-              next
-            end
+              info.valid?
 
-            if modinfo.errors.any?
-              exit_code = 1
-              puts Paint["ERROR", :red, :bright] if verbose? && verbose > 1
-              warn modinfo.errors.map { |error| Paint[error, :red] }.join("\n")
+              unless info.errors? || info.warnings?
+                puts Paint["SUCCESS", :green, :bright] if verbose > 1
+                next
+              end
+
+              if info.errors?
+                exit_code = 1
+                puts Paint["ERROR", :red, :bright] if verbose? && verbose > 1
+                puts info.errors.map { |error| Paint["#{error} in #{info.uniq_name}", :red] }.join("\n")
+                puts "\n" if verbose > 1
+              end
+
+              puts Paint["WARNING", :yellow, :bright] if info.warnings.any? && verbose > 1
+              puts info.warnings.map { |warning| Paint["#{warning} in #{info.uniq_name}", :yellow] }.join("\n")
               puts "\n" if verbose > 1
             end
 
-            puts Paint["WARNING", :yellow, :bright] if modinfo.warnings.any? && verbose > 1
-            puts modinfo.warnings.map { |warning| Paint["#{warning} in #{modinfo.uniq_name}", :yellow] }.join("\n")
-            puts "\n" if verbose > 1
+            exit exit_code
           end
-
-          exit exit_code
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Icarus
     module Tools
       # Base class for Modinfo and Proginfo
       class Baseinfo
-        attr_reader :data, :errors, :id, :created_at, :updated_at, :warnings
+        attr_reader :data, :id, :created_at, :updated_at
 
         HASHKEYS = %i[name author version compatibility description fileType fileURL imageURL readmeURL].freeze
 
@@ -23,8 +23,24 @@ module Icarus
           @data = data.is_a?(String) ? JSON.parse(data, symbolize_names: true) : data
         end
 
+        def errors
+          @errors.compact.uniq
+        end
+
+        def errors?
+          @errors.compact.any?
+        end
+
+        def warnings
+          @warnings.compact.uniq
+        end
+
+        def warnings?
+          @warnings.compact.any?
+        end
+
         def uniq_name
-          "#{author}/#{name}"
+          "#{author.strip}/#{name.strip}"
         end
 
         def to_json(*args)
@@ -35,7 +51,7 @@ module Icarus
           HASHKEYS.each_with_object({}) { |key, hash| hash[key] = @data[key] }
         end
 
-        def validate
+        def valid?
           @warnings << "Version should be a version string" unless validate_version(version)
 
           %w[name author description].each do |key|
@@ -48,10 +64,10 @@ module Icarus
             @errors << "Invalid URL #{key.capitalize}: #{@data[key.to_sym] || "blank"}" unless validate_url(@data[key.to_sym])
           end
 
-          @errors.empty?
+          !errors?
         end
 
-        def method_missing(method_name, *_args, &)
+        def method_missing(method_name, *_args, &_block)
           @data[method_name.to_sym]&.strip
         end
 
@@ -61,6 +77,10 @@ module Icarus
 
         private
 
+        def filetype_pattern
+          /(zip|pak|exmodz?)/i
+        end
+
         def validate_url(url)
           return true if url.nil? || url.empty?
 
@@ -68,7 +88,7 @@ module Icarus
         end
 
         def validate_filetype(filetype)
-          %w[pak zip exmod].include?(filetype.downcase)
+          filetype.match?(filetype_pattern)
         end
 
         def validate_string(string)

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

@@ -18,8 +18,8 @@ module Icarus
           @firestore.mods
         end
 
-        def modinfo_array
-          @modinfo_array ||= @firestore.modinfo_list.map do |url|
+        def info_array
+          @info_array ||= @firestore.modinfo_list.map do |url|
             retrieve_from_url(url)[:mods].map { |mod| Modinfo.new(mod) if mod[:name] =~ /[a-z0-9]+/i }
           rescue Icarus::Mod::Tools::RequestFailed
             warn "Skipped; Failed to retrieve #{url}"
@@ -30,12 +30,12 @@ module Icarus
           end.flatten.compact
         end
 
-        def find_mod(modinfo)
+        def find(modinfo)
           @firestore.find_by_type(type: "mods", name: modinfo.name, author: modinfo.author)&.id
         end
 
-        def find_modinfo(modinfo)
-          @modinfo_array.find { |mod| mod.name == modinfo.name }
+        def find_info(modinfo)
+          @info_array.find { |mod| mod.name == modinfo.name }
         end
 
         def update(modinfo)

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

@@ -29,7 +29,7 @@ module Icarus
           retrieve_from_url(url)
         end
 
-        def modinfo_data(repositories, verbose: false)
+        def data(repositories, verbose: false)
           repositories.map do |repo|
             print "searching #{repo}..." if verbose
 

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

@@ -18,8 +18,8 @@ module Icarus
           @firestore.progs
         end
 
-        def proginfo_array
-          @proginfo_array ||= @firestore.proginfo_list.map do |url|
+        def info_array
+          @info_array ||= @firestore.proginfo_list.map do |url|
             retrieve_from_url(url)[:programs].map { |prog| Proginfo.new(prog) if prog[:name] =~ /[a-z0-9]+/i }
           rescue Icarus::Mod::Tools::RequestFailed
             warn "Skipped; Failed to retrieve #{url}"
@@ -30,12 +30,12 @@ module Icarus
           end.flatten.compact
         end
 
-        def find_prog(proginfo)
+        def find(proginfo)
           @firestore.find_by_type(type: "progs", name: proginfo.name, author: proginfo.author)&.id
         end
 
-        def find_proginfo(proginfo)
-          @proginfo_array.find { |prog| prog.name == proginfo.name }
+        def find_info(proginfo)
+          @info_array.find { |prog| prog.name == proginfo.name }
         end
 
         def update(proginfo)

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

@@ -12,6 +12,12 @@ module Icarus
           @data[:fileType] || "zip"
         end
         # rubocop:enable Naming/MethodName
+
+        private
+
+        def filetype_pattern
+          /(zip|exe)/i
+        end
       end
     end
   end

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

@@ -29,7 +29,7 @@ module Icarus
           retrieve_from_url(url)
         end
 
-        def proginfo_data(repositories, verbose: false)
+        def data(repositories, verbose: false)
           repositories.map do |repo|
             print "searching #{repo}..." if verbose
 

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Icarus
+  module Mod
+    module Tools
+      # Validate Methods
+      class Validator
+        attr_reader :array
+
+        def initialize(type)
+          @array = case type
+                   when :modinfo
+                     ModSync.new.info_array
+                   when :proginfo
+                     ProgSync.new.info_array
+                   else
+                     raise ArgumentError, "Invalid type: #{type}"
+                   end
+        end
+      end
+    end
+  end
+end

data/lib/icarus/mod/version.rb

@@ -2,6 +2,6 @@
 
 module Icarus
   module Mod
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Icarus-Mod-Tools
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Donovan Young
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-firestore
@@ -101,11 +101,11 @@ files:
 - lib/icarus/mod/tools/mod_sync.rb
 - lib/icarus/mod/tools/modinfo.rb
 - lib/icarus/mod/tools/modinfo_sync.rb
-- lib/icarus/mod/tools/modinfo_validate.rb
 - lib/icarus/mod/tools/prog_sync.rb
 - lib/icarus/mod/tools/proginfo.rb
 - lib/icarus/mod/tools/proginfo_sync.rb
 - lib/icarus/mod/tools/sync_helpers.rb
+- lib/icarus/mod/tools/validator.rb
 - lib/icarus/mod/version.rb
 - sig/database/sync/sync.rbs
 homepage: https://github.com/DonovanMods/icarus-mod-tools

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

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Icarus
-  module Mod
-    module Tools
-      # Validate Methods
-      class ModinfoValidate
-        attr_reader :modinfo_array
-
-        def initialize
-          @modinfo_array = ModSync.new.modinfo_array
-        end
-      end
-    end
-  end
-end