implement review suggestions

Author: rammodhvadia

app/jobs/upload_job.rb

@@ -170,13 +170,11 @@ def scratch_file_component(file, project_dir, locale, repository, owner)
   end
 
   def media(file, project_dir, locale, repository, owner)
-    filename = file.name
-    { filename:, io: URI.parse(file_url(file, project_dir, locale, repository, owner)).open }
+    { filename: file.name, io: URI.parse(file_url(file, project_dir, locale, repository, owner)).open }
   end
 
   def file_url(file, project_dir, locale, repository, owner)
-    directory = project_dir.name
-    "https://github.com/#{owner}/#{repository}/raw/#{ENV.fetch('GITHUB_WEBHOOK_REF')}/#{locale}/code/#{directory}/#{file.name}"
+    "https://github.com/#{owner}/#{repository}/raw/#{ENV.fetch('GITHUB_WEBHOOK_REF')}/#{locale}/code/#{project_dir.name}/#{file.name}"
   end
 
   def repository(payload)

app/models/filesystem_project.rb

@@ -12,7 +12,6 @@ def self.import_all!
       proj_config = YAML.safe_load_file(dir.join(PROJECT_CONFIG).to_s)
 
       files = dir.children.reject { |file| file.basename.to_s == PROJECT_CONFIG }
-      files = configured_scratch_files(files, proj_config) if proj_config['TYPE'] == Project::Types::CODE_EDITOR_SCRATCH
       categorized_files = categorize_files(files, dir)
 
       project_importer = ProjectImporter.new(name: proj_config['NAME'], identifier: proj_config['IDENTIFIER'],
@@ -54,13 +53,6 @@ def self.categorize_files(files, dir)
     categories
   end
 
-  def self.configured_scratch_files(files, proj_config)
-    configured_locations = Array(proj_config['COMPONENTS']).pluck('location')
-    return files if configured_locations.empty?
-
-    files.reject { |file| File.extname(file) == '.sb3' && configured_locations.exclude?(file.basename.to_s) }
-  end
-
   def self.component(file, dir)
     name = File.basename(file, '.*')
     extension = File.extname(file).delete('.')

lib/sb3_parser.rb

@@ -36,9 +36,9 @@ def open_zip(&)
     return Zip::File.open(file_path, &) if file_path
 
     io.rewind if io.respond_to?(:rewind)
-    result = nil
-    Zip::File.open_buffer(io.read) { |zip_file| result = yield zip_file }
-    result
+    Zip::File.open_buffer(io.read) do |zip_file|
+      return yield zip_file
+    end
   end
 
   def project_json_entry(zip_file)