Icarus-Mod-Tools 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78fcf7a73092b07f142e4d227f108081a5dbadeeeef6a972ec1cb0f9ba064233
-  data.tar.gz: 88139f274dcf2fc0a716cc17b58b8a7f89364aa7dd1f9f7209aafaa9280952fa
+  metadata.gz: 6116efa6067d7083fa0bd8702fa0b5e69f3fb5050b4fb9e8109c5d058e2b44ed
+  data.tar.gz: f9b7796983c16913ac855ff74c7cd519765a431678ab6d08f03fab14474d6e93
 SHA512:
-  metadata.gz: 835fa42f41b672cc7b025f3aca5e58e39b398ea0ed38889b34094446c21c3611d06304936d42cea5fe8602563b2d70fa3adeda1114ae18023fd64fe335745267
-  data.tar.gz: 2b315fb5e807cd0ba223544a1ffa47f5c64aa452228047f75e507b3522b4b9c85580c10b21c844bee1778978b66d42ca061a1b5ca2b4a28f20c2c3d386c0499f
+  metadata.gz: 22fedc2ac796efe006680fc5248c33fb01f003b03af14e59a1332fc586b7341dcdda36219e0ec0f00db9d5b790a1fe37062208c5d84ea604d585c391a32dc18c
+  data.tar.gz: ffc80856c30d74b07aa1b5255cfc304f9eb30d9b1277866d862f7ebb833db8cc04e16d67c6f784ad7b9257df8804183b4c6ded9586cfad8d99b93d4740acd6ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Icarus-Mod-Tools (1.3.2)
+    Icarus-Mod-Tools (1.3.4)
       google-cloud-firestore (~> 2.7)
       octokit (~> 6.0)
       thor (~> 1.2)

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

@@ -32,12 +32,12 @@ module Icarus
             filter_field = options[:filter].first&.to_sym
             filter_value = options[:filter].last&.to_s
 
-            raise "Invalid filter option" 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 "Invalid filter field '#{filter_field}'" unless filter_field && valid_keys.include?(filter_field)
+            raise Icarus::Mod::Tools::Error, "Invalid filter field '#{filter_field}'" unless filter_field && valid_keys.include?(filter_field)
           end
 
-          raise "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
@@ -76,7 +76,7 @@ module Icarus
           end
 
           puts "Total: #{mods.count}" if verbose?
-        rescue StandardError => e
+        rescue Icarus::Mod::Tools::Error => e
           puts e.message
           exit 1
         end

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

@@ -15,12 +15,12 @@ module Icarus
           puts "Retrieving repository Data..." if verbose?
           repositories = modinfo_sync.repositories
 
-          raise "Unable to find any repositories!" unless repositories.any?
+          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 "Unable to find any modinfo.json files!" unless modinfo_array&.any?
+          raise Icarus::Mod::Tools::Error, "Unable to find any modinfo.json files!" unless modinfo_array&.any?
 
           puts "Saving to Firestore..." if verbose?
           response = modinfo_sync.update(modinfo_array)
@@ -67,6 +67,9 @@ module Icarus
           end
 
           puts "Deleted #{delete_array.count} outdated mods" if verbose?
+        rescue Icarus::Mod::Tools::Error => e
+          warn e.message
+          exit 1
         end
       end
     end

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

@@ -21,7 +21,10 @@ module Icarus
         def modinfo_array
           @modinfo_array ||= @firestore.modinfo_array.map do |url|
             retrieve_from_url(url)[:mods].map { |mod| Modinfo.new(mod) }
-          end.flatten
+          rescue RequestFailed => e
+            warn "Failed to retrieve modinfo: #{e.message}"
+            next
+          end.flatten.compact
         end
 
         def find_mod(modinfo)

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

@@ -9,10 +9,12 @@ module Icarus
     module Tools
       # Sync helper methods
       module SyncHelpers
+        class RequestFailed < StandardError; end
+
         def retrieve_from_url(url)
           res = Net::HTTP.get_response(URI(url))
 
-          raise "HTTP Request failed (#{res.code}): #{res.message}" unless res&.code == "200"
+          raise RequestFailed, "HTTP Request failed for #{url} (#{res.code}): #{res.message}" unless res&.code == "200"
 
           JSON.parse(res.body, symbolize_names: true)
         end

data/lib/icarus/mod/version.rb

@@ -2,6 +2,6 @@
 
 module Icarus
   module Mod
-    VERSION = "1.3.2"
+    VERSION = "1.3.4"
   end
 end

metadata

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