johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Download: Add Disabled, Originals, MediaRaw & MediaSidecar Flags #2234

Browse Source 
Extends DownloadSettings with 4 additional options:
- Name: File name pattern for downloaded files (existed)
- Disabled: Disables downloads
- Originals: Only download files stored in "originals" folder
- MediaRaw: Include RAW image files
- MediaSidecar: Include metadata sidecar files (JSON, XMP, YAML)
This commit is contained in:
Michael Mayer
2022-04-15 09:42:07 +02:00
parent 0a9f6a72bc
commit 92e6c4fe1e
335 changed files with 3606 additions and 2708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/entity/label.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/photoprism/photoprism/internal/classify"
"github.com/photoprism/photoprism/internal/event"
"github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/rnd"
"github.com/photoprism/photoprism/pkg/sanitize"
"github.com/photoprism/photoprism/pkg/txt"
)
@@ -47,11 +47,11 @@ func (Label) TableName() string {
// BeforeCreate creates a random UID if needed before inserting a new row to the database.
func (m *Label) BeforeCreate(scope *gorm.Scope) error {
if rnd.IsUID(m.LabelUID, 'l') {
if rnd.ValidID(m.LabelUID, 'l') {
return nil
}
return scope.SetColumn("LabelUID", rnd.PPID('l'))
return scope.SetColumn("LabelUID", rnd.GenerateUID('l'))
}
// NewLabel returns a new label.
@@ -164,7 +164,7 @@ func (m *Label) AfterCreate(scope *gorm.Scope) error {
// SetName changes the label name.
func (m *Label) SetName(name string) {
name = sanitize.Name(name)
name = clean.Name(name)
if name == "" {
return
@@ -221,7 +221,7 @@ func (m *Label) UpdateClassify(label classify.Label) error {
}
if err := db.Model(m).Association("LabelCategories").Append(sn).Error; err != nil {
log.Debugf("index: failed saving label category %s (%s)", sanitize.Log(category), err)
log.Debugf("index: failed saving label category %s (%s)", clean.Log(category), err)
}
}
}