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

Backend: Query package refactoring

Browse Source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer
2020-05-08 15:41:01 +02:00
parent 695294fc58
commit 842da9f09b
66 changed files with 1153 additions and 1229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/workers/share.go
View File

@@ -39,11 +39,8 @@ func (s *Share) Start() (err error) {
Share: true,
}
db := s.conf.Db()
q := query.New(db)
// Find accounts for which sharing is enabled
accounts, err := q.Accounts(f)
accounts, err := query.Accounts(f)
// Upload newly shared files
for _, a := range accounts {
@@ -55,7 +52,7 @@ func (s *Share) Start() (err error) {
continue
}
files, err := q.FileShares(a.ID, entity.FileShareNew)
files, err := query.FileShares(a.ID, entity.FileShareNew)
if err != nil {
log.Errorf("share: %s", err.Error())
@@ -121,7 +118,7 @@ func (s *Share) Start() (err error) {
return nil
}
if err := db.Save(&file).Error; err != nil {
if err := entity.Db().Save(&file).Error; err != nil {
log.Errorf("share: %s", err.Error())
}
}
@@ -137,7 +134,7 @@ func (s *Share) Start() (err error) {
continue
}
files, err := q.ExpiredFileShares(a)
files, err := query.ExpiredFileShares(a)
if err != nil {
log.Errorf("share: %s", err.Error())
@@ -166,7 +163,7 @@ func (s *Share) Start() (err error) {
file.Status = entity.FileShareRemoved
}
if err := db.Save(&file).Error; err != nil {
if err := entity.Db().Save(&file).Error; err != nil {
log.Errorf("share: %s", err.Error())
}
}