Commit 3f0c18f8 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Simplify encoding related implementation in artifacts metadata

parent a9783c43
...@@ -10,8 +10,7 @@ module Gitlab ...@@ -10,8 +10,7 @@ module Gitlab
attr_reader :file, :path, :full_version attr_reader :file, :path, :full_version
def initialize(file, path) def initialize(file, path)
@file = file @file, @path = file, path
@path = path.force_encoding('ASCII-8BIT')
@full_version = read_version @full_version = read_version
end end
...@@ -36,7 +35,7 @@ module Gitlab ...@@ -36,7 +35,7 @@ module Gitlab
end end
def to_path def to_path
Path.new(@path.dup.force_encoding('UTF-8'), *match!) Path.new(@path, *match!)
end end
private private
...@@ -48,11 +47,11 @@ module Gitlab ...@@ -48,11 +47,11 @@ module Gitlab
until gz.eof? do until gz.eof? do
begin begin
path = read_string(gz) path = read_string(gz).force_encoding('UTF-8')
meta = read_string(gz) meta = read_string(gz).force_encoding('UTF-8')
next unless path.valid_encoding? && meta.valid_encoding?
next unless path =~ match_pattern next unless path =~ match_pattern
next unless path.force_encoding('UTF-8').valid_encoding?
next if path =~ invalid_pattern next if path =~ invalid_pattern
paths.push(path) paths.push(path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment