emerge 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409fec8581e499747b3c9ca5cd80e0f9c9e491ca0d94688bc1e0d299a974a95b
-  data.tar.gz: 64863c523c84b25f5ff21a9bbda0863f13ef7a5165d5437aeb66d60211e7fe84
+  metadata.gz: 65f13db01f807a85200615394b091f5bfea4cd3bf4cf4f94ec0a742d5b93c597
+  data.tar.gz: 322a6582fd941518f080ae8d38af3555a404e295a99658083d5032a0127640d9
 SHA512:
-  metadata.gz: 5a6dc2be9e2ad1f3078c9f6703d35c2f1e70d5630d14a2f682216fb949c1111b7bc236702e2e9698714f4662e5e7a70bcb67118c510542b61d1b58c00f13dc1e
-  data.tar.gz: 76f622ef6797a7c420d1406e9f43ddceb9f075180641ae6e5b78cbb63a3a18489d883d63346d973f9ff8e6b225281d2d0671e6ad33d5ff667b5c7d347c8ba769
+  metadata.gz: 6e7adb6bafb19cec3408a3e866d9a148ebe99cf80dde147c47f9133fad0a6d8e7e655a2bfdce7ece4be9596235c650d7abf60ef07f899f30a0a700ef40eccb03
+  data.tar.gz: 9ee165532fb1443fda2f5dce215bb545b9a9997d6684cc5e36d3b18de416a73496779dad9685fac1a03735d327077f040dcd4b17050027abe1accaf7ec1562f8

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

@@ -68,7 +68,7 @@ module EmergeCLI
 
               image_files = @profiler.measure('find_image_files') { find_image_files(client) }
 
-              @profiler.measure('check_duplicate_files') { check_duplicate_files(image_files, client) }
+              check_duplicate_files(image_files, client)
 
               run_id = @profiler.measure('create_run') { create_run }
 
@@ -130,18 +130,26 @@ module EmergeCLI
           found_images
         end
 
-        def check_duplicate_files(image_files, client)
+        def check_duplicate_files(image_files, _client)
           seen_files = {}
+          duplicate_files = {}
+
           image_files.each do |image_path|
-            file_name = client.parse_file_info(image_path)[:file_name]
+            file_name = File.basename(image_path)
 
             if seen_files[file_name]
-              Logger.warn "Duplicate file name detected: '#{file_name}'. " \
-                          "Previous occurrence: '#{seen_files[file_name]}'. " \
-                          'This upload will overwrite the previous one.'
+              duplicate_files[file_name] ||= []
+              duplicate_files[file_name] << image_path
+            else
+              seen_files[file_name] = image_path
             end
-            seen_files[file_name] = image_path
           end
+
+          duplicate_files.each do |filename, paths|
+            Logger.warn "Found #{paths.length} duplicate(s) of '#{filename}'. Duplicates: #{paths.join(', ')}"
+          end
+
+          [seen_files, duplicate_files]
         end
 
         def create_run
@@ -201,6 +209,8 @@ module EmergeCLI
             errors: []
           }
 
+          used_filenames, = check_duplicate_files(image_files, client)
+
           @profiler.measure('process_image_metadata') do
             image_files.each do |image_path|
               metadata_semaphore.async do
@@ -236,8 +246,9 @@ module EmergeCLI
                 zipfile.get_output_stream('manifest.json') { |f| f.write(JSON.generate(image_metadata)) }
 
                 image_files.each do |image_path|
-                  image_name = File.basename(image_path)
-                  zipfile.add(image_name, 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
                 end
               end
             end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Emerge Tools