jmb/scanfile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better error messages in fileView

Browse source
This commit is contained in:
Johannes Bülow 2025-07-25 12:42:12 +02:00
parent 3e2f93d754
commit dd4a5ec941
Signed by: jmb
GPG key ID: B56971CF7B8F83A6
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/web/fileView.go
View file

@ -12,13 +12,17 @@ func FileViewWebHandler(w http.ResponseWriter, r *http.Request) {
file, err := database.GetFileByID(r.PathValue("uuid")) file, err := database.GetFileByID(r.PathValue("uuid"))
if err != nil { if err != nil {
slog.Error("Error getting File in FileViewWebHandler", "error", err, "file-uuid", r.PathValue("uuid")) slog.Error("Error getting File in FileViewWebHandler", "error", err, "file-uuid", r.PathValue("uuid"))
if err.Error() == "no rows in result set" {
http.Error(w, err.Error(), http.StatusNotFound)
} else {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
}
return return
} }
fileProperties, err := database.GetFileProperties(file.ID) fileProperties, err := database.GetFileProperties(file.ID)
if err != nil { if err != nil {
slog.Error("Error getting FileProperties in FileViewWebHandler", "error", err, "file-uuid", r.PathValue("uuid")) slog.Error("Error getting FileProperties in FileViewWebHandler", "error", err, "file-uuid", r.PathValue("uuid"))
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
component := FileView(file, fileProperties) component := FileView(file, fileProperties)
@ -48,9 +52,17 @@ func FileViewMSOWebHandler(w http.ResponseWriter, r *http.Request) {
func FileViewDeleteWebHandler(w http.ResponseWriter, r *http.Request) { func FileViewDeleteWebHandler(w http.ResponseWriter, r *http.Request) {
fileID := r.PathValue("uuid") fileID := r.PathValue("uuid")
err := store.DeleteFile(fileID) err := database.DeleteFileByID(fileID)
if err != nil { if err != nil {
slog.Error("Error deleting File in FileViewDeleteHandler", "error", err, "file-uuid", fileID) slog.Error("Error deleting File in FileViewDeleteHandler", "error", err, "file-uuid", fileID)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
err = store.DeleteFile(fileID)
if err != nil {
slog.Error("Error deleting File in FileViewDeleteHandler", "error", err, "file-uuid", fileID)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
} }
w.Header().Set("HX-Redirect", "/") w.Header().Set("HX-Redirect", "/")