From 21d4982318b198624dbcef5fb31f22b3b77d2b62 Mon Sep 17 00:00:00 2001
From: feistel <6742251-feistel@users.noreply.gitlab.com>
Date: Thu, 2 Sep 2021 08:02:36 +0000
Subject: refactor: remove vfs.ErrNotExist and switch to go native fs error

---
 internal/serving/disk/reader.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'internal/serving')

diff --git a/internal/serving/disk/reader.go b/internal/serving/disk/reader.go
index 26425063..6e77251c 100644
--- a/internal/serving/disk/reader.go
+++ b/internal/serving/disk/reader.go
@@ -2,8 +2,10 @@ package disk
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"net/http"
 	"os"
 	"strconv"
@@ -38,7 +40,7 @@ func (reader *Reader) serveRedirectsStatus(h serving.Handler, redirects *redirec
 func (reader *Reader) tryRedirects(h serving.Handler) bool {
 	ctx := h.Request.Context()
 	root, err := reader.vfs.Root(ctx, h.LookupPath.Path, h.LookupPath.SHA256)
-	if vfs.IsNotExist(err) {
+	if errors.Is(err, fs.ErrNotExist) {
 		return false
 	} else if err != nil {
 		httperrors.Serve500WithRequest(h.Writer, h.Request, "vfs.Root", err)
@@ -71,7 +73,7 @@ func (reader *Reader) tryFile(h serving.Handler) bool {
 	ctx := h.Request.Context()
 
 	root, err := reader.vfs.Root(ctx, h.LookupPath.Path, h.LookupPath.SHA256)
-	if vfs.IsNotExist(err) {
+	if errors.Is(err, fs.ErrNotExist) {
 		return false
 	} else if err != nil {
 		httperrors.Serve500WithRequest(h.Writer, h.Request,
@@ -134,7 +136,7 @@ func (reader *Reader) tryNotFound(h serving.Handler) bool {
 	ctx := h.Request.Context()
 
 	root, err := reader.vfs.Root(ctx, h.LookupPath.Path, h.LookupPath.SHA256)
-	if vfs.IsNotExist(err) {
+	if errors.Is(err, fs.ErrNotExist) {
 		return false
 	} else if err != nil {
 		httperrors.Serve500WithRequest(h.Writer, h.Request, "vfs.Root", err)
-- 
cgit v1.2.3