Index: Refactor file size check #3227
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
parent
5b727dd86a
commit
9362604853
|
@ -69,6 +69,10 @@ func StartIndexing(router *gin.RouterGroup) {
|
|||
|
||||
log.Infof("index: updated %s [%s]", english.Plural(updated, "file", "files"), time.Since(indexStart))
|
||||
|
||||
event.Publish("index.updating", event.Data{
|
||||
"step": "purge",
|
||||
})
|
||||
|
||||
RemoveFromFolderCache(entity.RootOriginals)
|
||||
|
||||
// Configure purge options.
|
||||
|
|
|
@ -227,15 +227,15 @@ func (ind *Index) Start(o IndexOptions) (found fs.Done, updated int) {
|
|||
|
||||
var files MediaFiles
|
||||
|
||||
if related.Main == nil {
|
||||
if f := related.Main; f == nil {
|
||||
// Nothing to do.
|
||||
return nil
|
||||
} else if limitErr, fileSize := related.Main.ExceedsBytes(o.ByteLimit); fileSize == 0 {
|
||||
found[fileName] = fs.Found
|
||||
} else if limitErr, fileSize := f.ExceedsBytes(o.ByteLimit); fileSize == 0 {
|
||||
found[f.FileName()] = fs.Found
|
||||
return nil
|
||||
} else if limitErr != nil {
|
||||
log.Warnf("index: %s", limitErr)
|
||||
found[fileName] = fs.Processed
|
||||
found[f.FileName()] = fs.Processed
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -1968,7 +1968,7 @@ func TestMediaFile_ExceedsBytes(t *testing.T) {
|
|||
} else {
|
||||
err, actual := f.ExceedsBytes(-1)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(0), actual)
|
||||
assert.Equal(t, int64(128471), actual)
|
||||
assert.True(t, f.Ok())
|
||||
assert.False(t, f.Empty())
|
||||
}
|
||||
|
@ -1979,7 +1979,7 @@ func TestMediaFile_ExceedsBytes(t *testing.T) {
|
|||
} else {
|
||||
err, actual := f.ExceedsBytes(0)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(0), actual)
|
||||
assert.Equal(t, int64(162877), actual)
|
||||
assert.True(t, f.Ok())
|
||||
assert.False(t, f.Empty())
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue