owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move gridview mutex out of state

Browse Source
This commit is contained in:
Drew Weymouth
2023-07-08 11:58:22 -07:00
parent d76fc41230
commit 5622554842
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/widgets/gridview.go
+15 -13
View File
@@ -71,6 +71,7 @@ func NewGridViewAlbumIterator(iter mediaprovider.AlbumIterator) GridViewIterator
type GridView struct { type GridView struct {
widget.BaseWidget widget.BaseWidget
stateMutex sync.RWMutex
GridViewState GridViewState
grid *xwidget.GridWrap grid *xwidget.GridWrap
@@ -78,7 +79,6 @@ type GridView struct {
type GridViewState struct { type GridViewState struct {
items []GridViewItemModel items []GridViewItemModel
itemsMutex sync.RWMutex
iter GridViewIterator iter GridViewIterator
imageFetcher ImageFetcher imageFetcher ImageFetcher
placeholder fyne.Resource placeholder fyne.Resource
@@ -129,7 +129,9 @@ func NewGridView(iter GridViewIterator, fetch ImageFetcher, placeholder fyne.Res
} }
func (g *GridView) SaveToState() GridViewState { func (g *GridView) SaveToState() GridViewState {
g.stateMutex.RLock()
s := g.GridViewState s := g.GridViewState
g.stateMutex.RUnlock()
s.scrollPos = g.grid.GetScrollOffset() s.scrollPos = g.grid.GetScrollOffset()
return s return s
} }
@@ -144,8 +146,8 @@ func NewGridViewFromState(state GridViewState) *GridView {
} }
func (g *GridView) Clear() { func (g *GridView) Clear() {
g.itemsMutex.Lock() g.stateMutex.Lock()
defer g.itemsMutex.Unlock() defer g.stateMutex.Unlock()
g.items = nil g.items = nil
g.done = true g.done = true
} }
@@ -155,12 +157,12 @@ func (g *GridView) Reset(iter GridViewIterator) {
g.fetchCancel() g.fetchCancel()
g.fetchCancel = nil g.fetchCancel = nil
} }
g.itemsMutex.Lock() g.stateMutex.Lock()
g.items = nil g.items = nil
g.done = false g.done = false
g.highestShown = 0 g.highestShown = 0
g.iter = iter g.iter = iter
g.itemsMutex.Unlock() g.stateMutex.Unlock()
g.fetchMoreItems(36) g.fetchMoreItems(36)
} }
@@ -169,12 +171,12 @@ func (g *GridView) ResetFixed(items []GridViewItemModel) {
g.fetchCancel() g.fetchCancel()
g.fetchCancel = nil g.fetchCancel = nil
} }
g.itemsMutex.Lock() g.stateMutex.Lock()
g.items = items g.items = items
g.itemsMutex.Unlock()
g.done = true g.done = true
g.highestShown = 0 g.highestShown = 0
g.iter = nil g.iter = nil
g.stateMutex.Unlock()
} }
func (g *GridView) GetScrollOffset() float32 { func (g *GridView) GetScrollOffset() float32 {
@@ -238,13 +240,13 @@ func (g *GridView) doUpdateItemCard(itemIdx int, card *GridViewItem) {
g.highestShown = itemIdx g.highestShown = itemIdx
} }
var item GridViewItemModel var item GridViewItemModel
g.itemsMutex.RLock() g.stateMutex.RLock()
// itemIdx can rarely be out of range if the data is being updated // itemIdx can rarely be out of range if the data is being updated
// as the view is requested to refresh // as the view is requested to refresh
if itemIdx < len(g.items) { if itemIdx < len(g.items) {
item = g.items[itemIdx] item = g.items[itemIdx]
} }
g.itemsMutex.RUnlock() g.stateMutex.RUnlock()
if card.PrevID == item.ID { if card.PrevID == item.ID {
// nothing to do // nothing to do
return return
@@ -290,8 +292,8 @@ func (g *GridView) doUpdateItemCard(itemIdx int, card *GridViewItem) {
} }
func (g *GridView) lenItems() int { func (g *GridView) lenItems() int {
g.itemsMutex.RLock() g.stateMutex.RLock()
defer g.itemsMutex.RUnlock() defer g.stateMutex.RUnlock()
return len(g.items) return len(g.items)
} }
@@ -314,9 +316,9 @@ func (g *GridView) fetchMoreItems(count int) {
case <-ctx.Done(): case <-ctx.Done():
return return
default: default:
g.itemsMutex.Lock() g.stateMutex.Lock()
g.items = append(g.items, items...) g.items = append(g.items, items...)
g.itemsMutex.Unlock() g.stateMutex.Unlock()
if len(items) < batchFetchSize { if len(items) < batchFetchSize {
g.done = true g.done = true
} }