.gitignore

@@ -1,2 +1 @@
 luacov.stats.out
-nextfile-0.0.1-1.src.rock

src/nextfile.lua

@@ -3,8 +3,8 @@ local prevfile = require "prevfile"
 local nextfile = {}
 
 function nextfile.splitfilename(path)
-	name, ext = path:match("^(.*)(%.%w*)")
+	dir, name, ext = path:match("^(.*/)(.*)(%.%w*)")
-	return name, ext
+	return dir, name, ext
 end
 
 function nextfile.nextletter(letter)
@@ -19,9 +19,9 @@ function nextfile.nextfile(directory, extension)
 	local previous = prevfile.prevfile(directory)
 	if previous == nil then return nil end
 
-	local name, ext = nextfile.splitfilename(previous)
+	local dir, name, ext = nextfile.splitfilename(previous)
 
-	value = ""
+	value = dir
 	if tonumber(name) == nil then
 		local lastletter = name:sub(#name)
 		local nextletter = nextfile.nextletter(lastletter)

tests/nextfile_spec.lua

@@ -1,12 +1,21 @@
 describe("splitfilename", function()
 	local nextfile = require "nextfile"
 
-	it("should return the filename and extension of a filename", function()
+	it("should return the filename and extension of an absolute filepath", function()
-		local name, ext = nextfile.splitfilename("701.txt")
+		local dir, name, ext = nextfile.splitfilename("/testdir/701.txt")
 
+		assert.are.equal("/testdir/", dir)
 		assert.are.equal("701", name)
 		assert.are.equal(".txt", ext)
 	end)
+
+	it("should return the filename and extension of a relative filepath", function()
+		local dir, name, ext = nextfile.splitfilename("../../foo/testdir/file.mp3")
+
+		assert.are.equal("../../foo/testdir/", dir)
+		assert.are.equal("file", name)
+		assert.are.equal(".mp3", ext)
+	end)
 end)
 
 describe("nextletter", function()