tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix NoteUnits front insertion logic

Browse Source 
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-09-13 14:28:03 -04:00
parent 391900d393
commit 563fbb9c4b
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
crates/notedeck_columns/src/timeline/note_units.rs
View File

@@ -101,28 +101,37 @@ impl NoteUnits {
let inserted_new = new_order.len(); let inserted_new = new_order.len();
let front_insertion = inserted_new > 0 let front_insertion = if self.order.is_empty() || new_order.is_empty() {
&& if self.order.is_empty() || new_order.is_empty() { !new_order.is_empty()
true } else if self.reversed {
} else if !self.reversed { // reversed is true, sorting should occur less recent to most recent (oldest to newest, opposite of `self.order`)
let first_new = *new_order.first().unwrap(); let first_new = *new_order.first().unwrap(); // most recent unit of the new order
let last_old = *self.order.last().unwrap(); let last_old = *self.order.last().unwrap(); // least recent unit of the current order
self.storage[first_new] >= self.storage[last_old]
} else { // if the most recent unit of the new order is less recent than the least recent unit of the current order,
let last_new = *new_order.last().unwrap(); // all current order units are less recent than the new order units.
let first_old = *self.order.first().unwrap(); // In other words, they are all being inserted in the front
self.storage[last_new] <= self.storage[first_old] self.storage[first_new] >= self.storage[last_old]
}; } else {
// reversed is false, sorting should occur most recent to least recent (newest to oldest, as it is in `self.order`)
let last_new = *new_order.last().unwrap(); // least recent unit of the new order
let first_old = *self.order.first().unwrap(); // most recent unit of the current order
// if the least recent unit of the new order is more recent than the most recent unit of the current order,
// all new units are more recent than the current units.
// In other words, they are all being inserted in the front
self.storage[last_new] <= self.storage[first_old]
};
let mut merged = Vec::with_capacity(self.order.len() + new_order.len()); let mut merged = Vec::with_capacity(self.order.len() + new_order.len());
let (mut i, mut j) = (0, 0); let (mut i, mut j) = (0, 0);
while i < self.order.len() && j < new_order.len() { while i < self.order.len() && j < new_order.len() {
let index_left = self.order[i]; let index_left = self.order[i];
let index_right = new_order[j]; let index_right = new_order[j];
let left_item = &self.storage[index_left]; let left_unit = &self.storage[index_left];
let right_item = &self.storage[index_right]; let right_unit = &self.storage[index_right];
if left_item <= right_item { if left_unit <= right_unit {
// left_item is newer than right_item // the left unit is more recent than (or the same recency as) the right unit
merged.push(index_left); merged.push(index_left);
i += 1; i += 1;
} else { } else {