Update line on _buffer_line_data_changed

ubergeek42 · Dec 7, 2024 · 963f7a4 · 963f7a4
1 parent e0e2b3f
commit 963f7a4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Buffer.kt b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Buffer.kt
@@ -218,6 +218,14 @@ class Buffer @WorkerThread constructor(
         }
    }
 
+    @WorkerThread @Synchronized fun replaceLine(line: Line) {
+        if (isOpen) line.ensureSpannable()
+
+        synchronized(this) {
+            lines.replaceLine(line)
+        }
+    }
+
     @WorkerThread fun addLineBottom(line: Line) {
         if (isOpen) line.ensureSpannable()
 

diff --git a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/BufferList.kt b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/BufferList.kt
@@ -394,6 +394,16 @@ object BufferList {
             }
         }
 
+        add("_buffer_line_data_changed") { obj, _ ->
+            obj.forEach { entry ->
+                val spec = LineSpec(entry)
+                findByPointer(spec.bufferPointer)?.let { buffer ->
+                    buffer.replaceLine(spec.toLine())
+                    buffer.onLinesListed()
+                }
+            }
+        }
+
         return handlers
     }
 

diff --git a/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Lines.kt b/app/src/main/java/com/ubergeek42/WeechatAndroid/relay/Lines.kt
@@ -10,6 +10,7 @@ import com.ubergeek42.WeechatAndroid.utils.invalidatableLazy
 import com.ubergeek42.weechat.Color
 import java.util.*
 import kotlin.properties.Delegates.observable
+import kotlin.collections.ArrayDeque;
 
 // this class is supposed to be synchronized by Buffer
 class Lines {
@@ -97,6 +98,16 @@ class Lines {
         }
     }
 
+    fun replaceLine(line: Line) {
+        val index = unfiltered.indexOfFirst { l -> l.pointer == line.pointer }
+        if (index == -1) return
+        filtered.clear();
+        unfiltered[index] = line
+        for (l in unfiltered) {
+            if (l.isVisible) filtered.add(l)
+        }
+    }
+
     fun addLast(line: Line) {
         if (shouldAddSquiggleOnNewLine) {
             shouldAddSquiggleOnNewLine = false
@@ -164,7 +175,7 @@ class Lines {
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
 
-    val descendingFilteredIterator: Iterator<Line> get() = filtered.descendingIterator()
+    val descendingFilteredIterator: Iterator<Line> get() = filtered.asReversed().iterator()
 
 
     fun invalidateSpannables() {
@@ -197,7 +208,7 @@ class Lines {
     fun rememberCurrentSkipsOffset() {
         skipFilteredOffset = skipFiltered
         skipUnfilteredOffset = skipUnfiltered
-        if (unfiltered.size > 0) _lastSeenLine = unfiltered.last.pointer
+        if (unfiltered.size > 0) _lastSeenLine = unfiltered.last().pointer
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -216,7 +227,7 @@ class Lines {
         var indexFiltered = 0
         var indexUnfiltered = 0
 
-        unfiltered.descendingIterator().forEach { line ->
+        unfiltered.asReversed().iterator().forEach { line ->
             if (line.pointer == _lastSeenLine) {
                 skipFiltered = indexFiltered
                 skipUnfiltered = indexUnfiltered