tgdrive/teldrive
1
1
Fork 0
mirror of https://github.com/tgdrive/teldrive.git synced 2024-12-31 04:13:01 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: add option to prevent error from get_file_from_path

Browse source
This commit is contained in:
divyam234 2024-07-18 16:57:09 +05:30
parent 932eaa65bf
commit a28d203090
2 changed files with 65 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
internal/database/migrations/20240718164345_function.sql Normal file
View file

@ -0,0 +1,61 @@
-- +goose Up
-- +goose StatementBegin
DROP FUNCTION IF EXISTS teldrive.get_file_from_path;
CREATE OR REPLACE FUNCTION teldrive.get_file_from_path(full_path text, u_id bigint,throw_error boolean DEFAULT false)
RETURNS SETOF teldrive.files
LANGUAGE plpgsql
AS $function$
DECLARE
target_id text;
begin
IF full_path = '/' then
full_path := '';
END IF;
WITH RECURSIVE dir_hierarchy AS (
SELECT
root.id,
root.name,
root.parent_id,
0 AS depth,
'' as path
FROM
teldrive.files as root
WHERE
root.parent_id = 'root' AND root.user_id = u_id
UNION ALL
SELECT
f.id,
f.name,
f.parent_id,
dh.depth + 1 AS depth,
dh.path || '/' || f.name
FROM
teldrive.files f
JOIN
dir_hierarchy dh ON dh.id = f.parent_id
WHERE f.type = 'folder' AND f.user_id = u_id
)
SELECT id into target_id FROM dir_hierarchy dh
WHERE dh.path = full_path
ORDER BY dh.depth DESC
LIMIT 1;
IF throw_error IS true AND target_id IS NULL THEN
RAISE EXCEPTION 'file not found for path: %', full_path;
END IF;
RETURN QUERY select * from teldrive.files where id=target_id;
END;
$function$
;
-- +goose StatementEnd

8
pkg/services/file.go
View file

@ -206,7 +206,7 @@ func (fs *FileService) ListFiles(userId int64, fquery *schemas.FileQuery) (*sche
if fquery.Op == "list" {
if fquery.Path != "" && fquery.ParentID == "" {
query.Where("parent_id in (SELECT id FROM teldrive.get_file_from_path(?, ?))", fquery.Path, userId)
query.Where("parent_id in (SELECT id FROM teldrive.get_file_from_path(?, ?, ?))", fquery.Path, userId, true)
}
if fquery.ParentID != "" {
query.Where("parent_id = ?", fquery.ParentID)
@ -273,7 +273,7 @@ func (fs *FileService) ListFiles(userId int64, fquery *schemas.FileQuery) (*sche
query.Where("parent_id = ?", fquery.ParentID)
}
if fquery.ParentID == "" && fquery.Path != "" && fquery.Query == "" {
query.Where("parent_id in (SELECT id FROM teldrive.get_file_from_path(?, ?))", fquery.Path, userId)
query.Where("parent_id in (SELECT id FROM teldrive.get_file_from_path(?, ?, ?))", fquery.Path, userId, true)
}
if fquery.Type != "" {
query.Where("type = ?", fquery.Type)
@ -307,7 +307,7 @@ func (fs *FileService) ListFiles(userId int64, fquery *schemas.FileQuery) (*sche
if fquery.DeepSearch && fquery.Query != "" && fquery.Path != "" {
fileQuery = fs.db.Clauses(exclause.With{Recursive: true, CTEs: []exclause.CTE{{Name: "subdirs",
Subquery: exclause.Subquery{DB: fs.db.Model(&models.File{}).Select("id", "parent_id").
Where("id in (SELECT id FROM teldrive.get_file_from_path(?, ?))", fquery.Path, userId).
Where("id in (SELECT id FROM teldrive.get_file_from_path(?, ?, ?))", fquery.Path, userId, true).
Clauses(exclause.NewUnion("ALL ?",
fs.db.Table("teldrive.files as f").Select("f.id", "f.parent_id").
Joins("inner join subdirs ON f.parent_id = subdirs.id")))}}}})
@ -354,7 +354,7 @@ func (fs *FileService) getFileFromPath(path string, userId int64) (*models.File,
var res []models.File
if err := fs.db.Raw("select * from teldrive.get_file_from_path(?, ?)", path, userId).
if err := fs.db.Raw("select * from teldrive.get_file_from_path(?, ?, ?)", path, userId, true).
Scan(&res).Error; err != nil {
return nil, err