From 160b7509a21c321c305e676159b6c977e46e5284 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 20 Nov 2023 18:59:37 +0000 Subject: [PATCH] Fix nextfile expecting full path from prevfile --- src/nextfile.lua | 8 ++++---- tests/nextfile_spec.lua | 13 ++----------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/nextfile.lua b/src/nextfile.lua index be7cd5d..9f2f844 100644 --- a/src/nextfile.lua +++ b/src/nextfile.lua @@ -3,8 +3,8 @@ local prevfile = require "prevfile" local nextfile = {} function nextfile.splitfilename(path) - dir, name, ext = path:match("^(.*/)(.*)(%.%w*)") - return dir, name, ext + name, ext = path:match("^(.*)(%.%w*)") + return 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 dir, name, ext = nextfile.splitfilename(previous) + local name, ext = nextfile.splitfilename(previous) - value = dir + value = "" if tonumber(name) == nil then local lastletter = name:sub(#name) local nextletter = nextfile.nextletter(lastletter) diff --git a/tests/nextfile_spec.lua b/tests/nextfile_spec.lua index 3e7735e..9056dd0 100644 --- a/tests/nextfile_spec.lua +++ b/tests/nextfile_spec.lua @@ -1,21 +1,12 @@ describe("splitfilename", function() local nextfile = require "nextfile" - it("should return the filename and extension of an absolute filepath", function() - local dir, name, ext = nextfile.splitfilename("/testdir/701.txt") + it("should return the filename and extension of a filename", function() + local name, ext = nextfile.splitfilename("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()