speatzle/morffix
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

use relative paths in file table

Browse source 
requires manual db migration
This commit is contained in:
Samuel Lorch 2024-06-22 22:16:21 +02:00
parent f5e3e89d20
commit c423676180
2 changed files with 50 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
server/file.go
View file

@ -3,6 +3,7 @@ package server
import ( import (
"log/slog" "log/slog"
"net/http" "net/http"
"path/filepath"
) )
func handleFile(w http.ResponseWriter, r *http.Request) { func handleFile(w http.ResponseWriter, r *http.Request) {
@ -13,28 +14,39 @@ func handleFile(w http.ResponseWriter, r *http.Request) {
} }
// TODO check if worker is working on a task involving this file // TODO check if worker is working on a task involving this file
var path string var fpath string
err := db.QueryRow(r.Context(), "SELECT path FROM files WHERE id = $1", id).Scan(&path) var libraryID int
err := db.QueryRow(r.Context(), "SELECT path, library_id FROM files WHERE id = $1", id).Scan(&fpath, &libraryID)
if err != nil { if err != nil {
http.Error(w, "Error Getting Path: "+err.Error(), http.StatusBadRequest) http.Error(w, "Error Getting File Path: "+err.Error(), http.StatusBadRequest)
slog.ErrorContext(r.Context(), "Getting Path", "err", err) slog.ErrorContext(r.Context(), "Getting File Path", "err", err)
return return
} }
slog.InfoContext(r.Context(), "Serving File Download", "id", id, "path", path) var lpath string
err = db.QueryRow(r.Context(), "SELECT path FROM libraries WHERE id = $1", libraryID).Scan(&lpath)
if err != nil {
http.Error(w, "Error Getting Library Path: "+err.Error(), http.StatusBadRequest)
slog.ErrorContext(r.Context(), "Getting Library Path", "err", err)
return
}
fullPath := filepath.Join(lpath, fpath)
slog.InfoContext(r.Context(), "Serving File Download", "id", id, "path", fullPath)
// had timeout issues // had timeout issues
http.ServeFile(w, r, path) http.ServeFile(w, r, fullPath)
/* /*
reader, err := os.Open(path) reader, err := os.Open(fullPath)
if err != nil { if err != nil {
http.Error(w, "Error Opening File: "+err.Error(), http.StatusInternalServerError) http.Error(w, "Error Opening File: "+err.Error(), http.StatusInternalServerError)
slog.ErrorContext(r.Context(), "Opening File", "err", err) slog.ErrorContext(r.Context(), "Opening File", "err", err)
return return
} }
w.Header().Set("Content-Disposition", "attachment;filename="+filepath.Base(path)) w.Header().Set("Content-Disposition", "attachment;filename="+filepath.Base(fullPath))
_, err = io.Copy(w, reader) _, err = io.Copy(w, reader)
if err != nil { if err != nil {
http.Error(w, "Copy File: "+err.Error(), http.StatusBadRequest) http.Error(w, "Copy File: "+err.Error(), http.StatusBadRequest)

42
server/scan.go
View file

@ -31,6 +31,8 @@ func handleScan(w http.ResponseWriter, r *http.Request) {
return return
} }
full := r.FormValue("full") == "on"
var name string var name string
var path string var path string
var enabled bool var enabled bool
@ -42,7 +44,7 @@ func handleScan(w http.ResponseWriter, r *http.Request) {
} }
scanCtx := context.Background() scanCtx := context.Background()
go scan(scanCtx, id) go scan(scanCtx, id, full)
message := "Scan Started" message := "Scan Started"
@ -77,9 +79,18 @@ func scanStatus(w http.ResponseWriter, r *http.Request) {
} }
} }
func scan(ctx context.Context, id string) { func scan(ctx context.Context, id string, full bool) {
slog.InfoContext(ctx, "Starting Scan", "id", id) slog.InfoContext(ctx, "Starting Scan", "id", id)
// TODO Scan settings:
// - Auto Queue Healthcheck for Changed Files
// - Auto Queue Healthcheck for New Files
// - Auto Queue Transcode for New Files
// - Auto Queue Transcode for Changed Files (? Instead have library setting to queue transcode for changed files on healthcheck success)
// - Auto Queue Health/Transcode for Unkown Status ? (might result in requeue loop)
// - Schedule Scans Periodically
// - Add File Monitoring for Setting Changed status and triggering tasks
var name string var name string
var lpath string var lpath string
var enabled bool var enabled bool
@ -122,9 +133,9 @@ func scan(ctx context.Context, id string) {
} }
err = filepath.Walk(lpath, err = filepath.Walk(lpath,
func(path string, info os.FileInfo, err error) error { func(fullPath string, info os.FileInfo, err error) error {
if errors.Is(err, os.ErrPermission) { if errors.Is(err, os.ErrPermission) {
slog.WarnContext(ctx, "Permission Denied While Scanning File", "path", path) slog.WarnContext(ctx, "Permission Denied While Scanning File", "path", fullPath)
return nil return nil
} else if err != nil { } else if err != nil {
return err return err
@ -135,13 +146,13 @@ func scan(ctx context.Context, id string) {
return nil return nil
} }
if !slices.Contains(videoFileExtensions, filepath.Ext(path)) { if !slices.Contains(videoFileExtensions, filepath.Ext(fullPath)) {
slog.InfoContext(ctx, "Skipping non video file", "path", path) slog.InfoContext(ctx, "Skipping non video file", "path", fullPath)
return nil return nil
} }
slog.InfoContext(ctx, "Hashing File", "path", path, "size", info.Size()) slog.InfoContext(ctx, "Hashing File", "path", fullPath, "size", info.Size())
file, err := os.Open(path) file, err := os.Open(fullPath)
if err != nil { if err != nil {
return fmt.Errorf("Opening File: %w", err) return fmt.Errorf("Opening File: %w", err)
} }
@ -152,17 +163,22 @@ func scan(ctx context.Context, id string) {
} }
newMD5 := hash.Sum(nil) newMD5 := hash.Sum(nil)
slog.InfoContext(ctx, "File MD5", "path", path, "size", info.Size(), "md5", newMD5) slog.InfoContext(ctx, "File MD5", "path", fullPath, "size", info.Size(), "md5", newMD5)
fPath, err := filepath.Rel(lpath, fullPath)
if err != nil {
return fmt.Errorf("Getting Relative Path: %w", err)
}
var fileID int var fileID int
var oldMD5 []byte var oldMD5 []byte
var health constants.FileHealth var health constants.FileHealth
err = tx.QueryRow(ctx, "SELECT id, md5, health FROM files WHERE library_id = $1 AND path = $2", id, path).Scan(&fileID, &oldMD5, &health) err = tx.QueryRow(ctx, "SELECT id, md5, health FROM files WHERE library_id = $1 AND path = $2", id, fPath).Scan(&fileID, &oldMD5, &health)
if errors.Is(err, pgx.ErrNoRows) { if errors.Is(err, pgx.ErrNoRows) {
// File Does not Exist Yet // File Does not Exist Yet
slog.InfoContext(ctx, "File is New", "path", path) slog.InfoContext(ctx, "File is New", "path", fullPath)
_, err = tx.Exec(ctx, "INSERT INTO files (library_id, path, size, status, health, md5) VALUES ($1, $2, $3, $4, $5, $6)", id, path, info.Size(), constants.FILE_STATUS_EXISTS, constants.FILE_HEALTH_UNKNOWN, newMD5) _, err = tx.Exec(ctx, "INSERT INTO files (library_id, path, size, status, health, md5) VALUES ($1, $2, $3, $4, $5, $6)", id, fullPath, info.Size(), constants.FILE_STATUS_EXISTS, constants.FILE_HEALTH_UNKNOWN, newMD5)
if err != nil { if err != nil {
return fmt.Errorf("Add New File to DB: %w", err) return fmt.Errorf("Add New File to DB: %w", err)
} }
@ -192,5 +208,7 @@ func scan(ctx context.Context, id string) {
slog.ErrorContext(ctx, "Error Committing Changes", "err", err) slog.ErrorContext(ctx, "Error Committing Changes", "err", err)
return return
} }
// TODO, create health and transcode tasks if requested
slog.InfoContext(ctx, "Scan Done", "id", id) slog.InfoContext(ctx, "Scan Done", "id", id)
} }