Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/packages/nuget/check_duplicates_service.rb')
-rw-r--r--app/services/packages/nuget/check_duplicates_service.rb30
1 files changed, 10 insertions, 20 deletions
diff --git a/app/services/packages/nuget/check_duplicates_service.rb b/app/services/packages/nuget/check_duplicates_service.rb
index 7ad9038d7c1..33a66c2bce1 100644
--- a/app/services/packages/nuget/check_duplicates_service.rb
+++ b/app/services/packages/nuget/check_duplicates_service.rb
@@ -49,40 +49,30 @@ module Packages
strong_memoize_attr :existing_package
def metadata
- if remote_package_file?
- ExtractMetadataContentService
+ if params[:remote_url].present?
+ ::Packages::Nuget::ExtractMetadataContentService
.new(nuspec_file_content)
.execute
.payload
else # to cover the case when package file is on disk not in object storage
- MetadataExtractionService
- .new(mock_package_file)
- .execute
- .payload
+ Zip::InputStream.open(params[:file]) do |zip|
+ ::Packages::Nuget::MetadataExtractionService
+ .new(zip)
+ .execute
+ .payload
+ end
end
end
strong_memoize_attr :metadata
- def remote_package_file?
- params[:remote_url].present?
- end
-
def nuspec_file_content
- ExtractRemoteMetadataFileService
+ ::Packages::Nuget::ExtractRemoteMetadataFileService
.new(params[:remote_url])
.execute
.payload
- rescue ExtractRemoteMetadataFileService::ExtractionError => e
+ rescue ::Packages::Nuget::ExtractRemoteMetadataFileService::ExtractionError => e
raise ExtractionError, e.message
end
-
- def mock_package_file
- ::Packages::PackageFile.new(
- params
- .slice(:file, :file_name)
- .merge(package: ::Packages::Package.nuget.build)
- )
- end
end
end
end