Refined page loading

Refactored RefreshPages -> RefreshSpreads
Only call RefreshSpreads when the model.spreadIndex is moved outside the
bounds of buffered pages

Author: mftb0

cmd/cbxv/messagehandlers.go

@@ -32,7 +32,9 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
         if m.SpreadIndex < len(m.Spreads)-1 {
             m.SpreadIndex++
             m.PageIndex = m.Spreads[m.SpreadIndex].VersoPage()
-            m.RefreshPages()
+            if !m.SpreadLoaded(m.SpreadIndex) {
+                m.RefreshSpreads()
+            }
         } else {
             handlers.List["nextFile"]("")
         }
@@ -42,7 +44,9 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
         if m.SpreadIndex > 0 {
             m.SpreadIndex--
             m.PageIndex = m.Spreads[m.SpreadIndex].VersoPage()
-            m.RefreshPages()
+            if !m.SpreadLoaded(m.SpreadIndex) {
+                m.RefreshSpreads()
+            }
         } else {
             handlers.List["previousFile"]("")
         }
@@ -51,13 +55,13 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
     handlers.List["firstPage"] = func(data string) {
         m.SpreadIndex = 0
         m.PageIndex = m.Spreads[m.SpreadIndex].VersoPage()
-        m.RefreshPages()
+        m.RefreshSpreads()
     }
 
     handlers.List["lastPage"] = func(data string) {
         m.SpreadIndex = (len(m.Spreads) - 1)
         m.PageIndex = m.Spreads[m.SpreadIndex].VersoPage()
-        m.RefreshPages()
+        m.RefreshSpreads()
     }
 
     handlers.List["lastBookmark"] = func(data string) {
@@ -68,7 +72,7 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
                 m.SpreadIndex = m.PageToSpread(bkmk.PageIndex)
                 m.PageIndex = bkmk.PageIndex
             }
-            m.RefreshPages()
+            m.RefreshSpreads()
         }
     }
 
@@ -89,22 +93,22 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
         m.LayoutMode = model.ONE_PAGE
         m.NewSpreads()
         m.SpreadIndex = m.PageToSpread(m.PageIndex)
-        m.RefreshPages()
+        m.RefreshSpreads()
     }
 
     handlers.List["setLayoutModeTwoPage"] = func(data string) {
         m.LayoutMode = model.TWO_PAGE
         m.NewSpreads()
         m.SpreadIndex = m.PageToSpread(m.PageIndex)
-        m.RefreshPages()
+        m.RefreshSpreads()
     }
 
     handlers.List["setLayoutModeLongStrip"] = func(data string) {
         m.LayoutMode = model.LONG_STRIP
         m.NewSpreads()
         m.SpreadIndex = 0
         m.PageIndex = m.Spreads[m.SpreadIndex].VersoPage()
-        m.RefreshPages()
+        m.RefreshSpreads()
     }
 
     handlers.List["toggleDirection"] = func(data string) {
@@ -223,7 +227,7 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
             } else {
                 p.Span = model.SINGLE
             }
-            m.RefreshPages()
+            m.RefreshSpreads()
             m.NewSpreads()
             m.StoreLayout()
             m.SpreadIndex = m.PageToSpread(pi)
@@ -241,7 +245,7 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
         p.Hidden = true
 
         // Recalculate layout
-        m.RefreshPages()
+        m.RefreshSpreads()
         m.NewSpreads()
         m.StoreLayout()
 
@@ -273,7 +277,7 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
         // Recalculate layout
         p := &m.Pages[i]
         p.Hidden = false
-        m.RefreshPages()
+        m.RefreshSpreads()
         m.NewSpreads()
         m.StoreLayout()
 
@@ -283,7 +287,7 @@ func NewMessageHandlers(m *model.Model, u *ui.UI) *MessageHandlerList {
     }
 
     handlers.List["loadAllPages"] = func(data string) {
-        m.RefreshPages()
+        m.RefreshSpreads()
         m.NewSpreads()
     }
 

internal/model/model.go

@@ -490,8 +490,22 @@ func (m *Model) CloseCbxFile() {
     debug.FreeOSMemory()
 }
 
-// Walk the layout and load/unload pages as needed
-func (m *Model) RefreshPages() {
+// Test if a given spread is fully loaded
+func (m *Model) SpreadLoaded(spreadIndex int) bool {
+    m.printLoaded()
+
+    spread := m.Spreads[spreadIndex]
+    for i := range spread.Pages {
+        if !spread.Pages[i].Loaded {
+            return false
+        }
+    }
+    return true
+ }
+
+// Iterate over spreads and load/unload pages as needed
+// based on the current spread index
+func (m *Model) RefreshSpreads() {
     if m.LayoutMode != LONG_STRIP {
         start := int(math.Max(0, float64(m.SpreadIndex-(MAX_LOAD/2)+1)))
         end := int(math.Min(float64(m.SpreadIndex+(MAX_LOAD/2)-1), float64(len(m.Spreads)-1)))
@@ -516,9 +530,7 @@ func (m *Model) RefreshPages() {
             }
         }
 
-        if util.DEBUG {
-            m.printLoaded()
-        }
+        m.printLoaded()
     } else {
         // load all pages
         for i := range m.Pages {
@@ -678,6 +690,6 @@ func (m *Model) printLoaded() {
             }
         }
     }
-    fmt.Printf("%s\n", buf)
+    util.Log("%s\n", buf)
 }