emerge 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65f13db01f807a85200615394b091f5bfea4cd3bf4cf4f94ec0a742d5b93c597
-  data.tar.gz: 322a6582fd941518f080ae8d38af3555a404e295a99658083d5032a0127640d9
+  metadata.gz: 0eeb092bc3889613fa27a5e513ac667031a602ed92ea8d3da3936b4db228f816
+  data.tar.gz: a2e8f5b498adfbeda356e5ae8010826eaf21429f0556c2b65f452947df102844
 SHA512:
-  metadata.gz: 6e7adb6bafb19cec3408a3e866d9a148ebe99cf80dde147c47f9133fad0a6d8e7e655a2bfdce7ece4be9596235c650d7abf60ef07f899f30a0a700ef40eccb03
-  data.tar.gz: 9ee165532fb1443fda2f5dce215bb545b9a9997d6684cc5e36d3b18de416a73496779dad9685fac1a03735d327077f040dcd4b17050027abe1accaf7ec1562f8
+  metadata.gz: 2a5166082c6668bf0fd0c2a5d431b54a2a70ae58bef468967b6d3120173e9215576fb7ecbe94acc6f8d3ee747d85f0bff0b09232e1343666622f07532f8e783d
+  data.tar.gz: d9638a7b631a4c2831b6d676994bde76a1b4b9e0077effe211ef5c2f1a0f0cf88ebd8f908be6ec72c1ae8b49f56cad71efa82be877be891d5270cbc0944d326e

data/lib/commands/upload/snapshots/snapshots.rb

@@ -210,11 +210,14 @@ module EmergeCLI
           }
 
           used_filenames, = check_duplicate_files(image_files, client)
+          file_info_map = {}
 
           @profiler.measure('process_image_metadata') do
             image_files.each do |image_path|
               metadata_semaphore.async do
                 file_info = client.parse_file_info(image_path)
+                file_name_without_extension = File.basename(file_info[:file_name], '.*')
+                file_info_map[image_path] = file_info
 
                 dimensions = @profiler.measure('chunky_png_processing') do
                   datastream = ChunkyPNG::Datastream.from_file(image_path)
@@ -225,15 +228,14 @@ module EmergeCLI
                 end
 
                 metadata = {
-                  fileName: file_info[:file_name],
+                  fileName: file_name_without_extension,
                   groupName: file_info[:group_name],
                   displayName: file_info[:variant_name],
                   width: dimensions[:width],
                   height: dimensions[:height]
                 }
 
-                image_name = File.basename(image_path, '.*')
-                image_metadata[:images][image_name] = metadata
+                image_metadata[:images][file_name_without_extension] = metadata
               end
             end
 
@@ -246,9 +248,9 @@ module EmergeCLI
                 zipfile.get_output_stream('manifest.json') { |f| f.write(JSON.generate(image_metadata)) }
 
                 image_files.each do |image_path|
-                  filename = File.basename(image_path)
-                  # Only add files we haven't seen before
-                  zipfile.add(filename, image_path) if used_filenames[filename] == image_path
+                  file_info = file_info_map[image_path]
+                  # Only add files we haven't seen before, otherwise it will crash
+                  zipfile.add(file_info[:file_name], image_path) if used_filenames[file_info[:file_name]] == image_path
                 end
               end
             end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module EmergeCLI
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Emerge Tools
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-06 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http