update
This commit is contained in:
parent
b4107ca70d
commit
a538a7c654
|
@ -281,6 +281,8 @@ func AddMediaToQueue(mediaPath string) error {
|
||||||
if err := global_scanner_queue.db.Where("path = ?", albumPath).Find(&parentAlbum).Error; err != nil {
|
if err := global_scanner_queue.db.Where("path = ?", albumPath).Find(&parentAlbum).Error; err != nil {
|
||||||
return errors.Wrap(err, "parentalbum by path database query")
|
return errors.Wrap(err, "parentalbum by path database query")
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
album = &media.Album
|
||||||
}
|
}
|
||||||
|
|
||||||
var userAlbumOwner []*models.User
|
var userAlbumOwner []*models.User
|
||||||
|
@ -288,7 +290,7 @@ func AddMediaToQueue(mediaPath string) error {
|
||||||
return errors.Wrap(err, "find owners for album")
|
return errors.Wrap(err, "find owners for album")
|
||||||
}
|
}
|
||||||
|
|
||||||
if parentAlbum.ID == 0 {
|
if parentAlbum != nil && parentAlbum.ID == 0 {
|
||||||
parentAlbum = nil
|
parentAlbum = nil
|
||||||
}
|
}
|
||||||
/*scanQueue := list.New()
|
/*scanQueue := list.New()
|
||||||
|
|
|
@ -135,5 +135,6 @@ func (t ProcessPhotoTask) ProcessMedia(ctx scanner_task.TaskContext, mediaData *
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ctx.GetDB().Save(mediaData.Media)
|
||||||
return updatedURLs, nil
|
return updatedURLs, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,7 +80,7 @@ func (ws watcherScanner) processWatchEvents() {
|
||||||
}
|
}
|
||||||
log.Println("event:", event)
|
log.Println("event:", event)
|
||||||
var media *models.Media
|
var media *models.Media
|
||||||
if event.Has(fsnotify.Create) {
|
if event.Has(fsnotify.Create) || event.Has(fsnotify.Write) {
|
||||||
scanner_queue.AddMediaToQueue(event.Name)
|
scanner_queue.AddMediaToQueue(event.Name)
|
||||||
log.Println("create event ", event.Name, event.Op)
|
log.Println("create event ", event.Name, event.Op)
|
||||||
} else if event.Has(fsnotify.Remove) {
|
} else if event.Has(fsnotify.Remove) {
|
||||||
|
|
Loading…
Reference in New Issue