mirror of
https://github.com/halejohn/Cloudreve.git
synced 2026-01-26 09:34:57 +08:00
fix: create directory now ignore conflict error, it will return the existed folder
This commit is contained in:
@@ -23,11 +23,15 @@ type Folder struct {
|
||||
|
||||
// Create 创建目录
|
||||
func (folder *Folder) Create() (uint, error) {
|
||||
if err := DB.Create(folder).Error; err != nil {
|
||||
tx := DB.Begin()
|
||||
if err := tx.FirstOrCreate(folder, *folder).Error; err != nil {
|
||||
tx.Rollback()
|
||||
util.Log().Warning("无法插入目录记录, %s", err)
|
||||
return 0, err
|
||||
}
|
||||
return folder.ID, nil
|
||||
|
||||
err := tx.Commit().Error
|
||||
return folder.ID, err
|
||||
}
|
||||
|
||||
// GetChild 返回folder下名为name的子目录,不存在则返回错误
|
||||
|
||||
Reference in New Issue
Block a user