Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle File.extname edge case #6234

Merged
merged 7 commits into from
Jun 25, 2018
Merged

Handle File.extname edge case #6234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fbec6bd
Fix #6215. Handle File.extname edge case
bcardiff Jun 21, 2018
8c326ef
Fix typo
bcardiff Jun 21, 2018
70276fc
Use byte_slice
bcardiff Jun 21, 2018
9b00b6e
Remove local variable
bcardiff Jun 22, 2018
1d0466d
On less return in the world
bcardiff Jun 22, 2018
6298a0a
Iterate bytes
bcardiff Jun 22, 2018
46cf84e
Empty case
bcardiff Jun 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions spec/std/file_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,18 +297,22 @@ describe "File" do
end

it "gets extname" do
File.extname("/foo/bar/a.cr").should eq(".cr")
File.extname("/foo/bar/baz.cr").should eq(".cr")
File.extname("/foo/bar/baz.cr.cz").should eq(".cz")
File.extname("/foo/bar/.profile").should eq("")
File.extname("/foo/bar/.profile.sh").should eq(".sh")
File.extname("/foo/bar/foo.").should eq("")
File.extname("/foo.bar/baz").should eq("")
File.extname("a.cr").should eq(".cr")
File.extname("test.cr").should eq(".cr")
File.extname("test.cr.cz").should eq(".cz")
File.extname(".test").should eq("")
File.extname(".test.cr").should eq(".cr")
File.extname(".test.cr.cz").should eq(".cz")
File.extname("test").should eq("")
File.extname("test.").should eq("")
File.extname("").should eq("")
end

it "constructs a path from parts" do
Expand Down
37 changes: 32 additions & 5 deletions src/file.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,40 @@ class File < IO::FileDescriptor
def self.extname(filename) : String
filename.check_no_null_byte

dot_index = filename.rindex('.')
bytes = filename.to_slice

if dot_index && dot_index != filename.size - 1 && dot_index - 1 > (filename.rindex(SEPARATOR) || 0)
filename[dot_index, filename.size - dot_index]
else
""
return "" if bytes.empty?

current = bytes.size - 1

# if the pattern is foo. it has no extension
return "" if bytes[current] == '.'.ord

# position the reader at the last . or SEPARATOR
# that is not the first char
while bytes[current] != SEPARATOR.ord &&
bytes[current] != '.'.ord &&
current > 0
current -= 1
end

# if we are the beginning of the string there is no extension
# /foo or .foo have no extension
return "" unless current > 0

# otherwise we are not at the beginning, and there is a previous char.
# if current is '/', then the pattern is prefix/foo and has no extension
return "" if bytes[current] == SEPARATOR.ord

# otherwise the current_char is '.'
# if previous is '/', then the pattern is prefix/.foo and has no extension
return "" if bytes[current - 1] == SEPARATOR.ord

# So the current char is '.',
# we are not at the beginning,
# the previous char is not a '/',
# and we have an extension
String.new(bytes[current, bytes.size - current])
end

# Converts *path* to an absolute path. Relative paths are
Expand Down