jketterl/openwebrx
1
0
Fork 0
mirror of https://github.com/jketterl/openwebrx.git synced 2026-01-01 06:10:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add more transformations

Browse source
This commit is contained in:
Jakob Ketterl 2024-01-17 18:01:47 +01:00
parent 1e30e55669
commit 9ef45eefdb
2 changed files with 60 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
owrx/active/list/__init__.py
View file

@ -165,14 +165,17 @@ class ActiveListFilterListener(ActiveListListener):
end_idx = len([x for x in self.keyMap if x < change.new_index])
offset = 0
if change.old_index in self.keyMap:
self.target.move(start_idx, end_idx)
offset = 1
else:
end_idx += 1
if end_idx > start_idx:
for i in reversed(range(start_idx, end_idx + 1)):
for i in reversed(range(start_idx, end_idx)):
self.keyMap[i] = self.keyMap[i + offset] - 1
else:
for i in range(end_idx + 1, start_idx):
for i in reversed(range(end_idx, start_idx)):
self.keyMap[i] = self.keyMap[i - offset] + 1
if offset:
self.target.move(start_idx, end_idx)
def _onMonitor(self, value):
idx = self.source.index(value)
@ -221,11 +224,15 @@ class ActiveListFlattenListener(ActiveListListener):
idx = self.getOffsetForIndex(change.index)
del self.target[idx, idx + len(change.oldValue)]
elif isinstance(change, ActiveListIndexMoved):
old_index = self.getOffsetForIndex(change.old_index)
new_index = self.getOffsetForIndex(change.new_index)
moved_list = self.source[change.new_index]
for (idx, element) in enumerate(moved_list):
self.target.move(old_index + idx, new_index + idx)
if change.new_index > change.old_index:
old_index = self.getOffsetForIndex(change.old_index)
new_index = self.getOffsetForIndex(change.new_index + 1)
else:
old_index = self.getOffsetForIndex(change.old_index + 1) - 1
new_index = self.getOffsetForIndex(change.new_index)
for _ in moved_list:
self.target.move(old_index, new_index)
else:
if isinstance(change, ActiveListIndexAdded):
self.target.insert(self.getOffsetFor(source) + change.index, change.newValue)

54
test/owrx/active/list/test_active_list.py
View file

@ -389,6 +389,7 @@ class ActiveListTest(TestCase):
self.assertEqual(len(filteredList), 9)
self.assertEqual(filteredList[1], 4)
self.assertEqual(filteredList[3], 2)
self.assertEqual(list.listeners[0].keyMap, [0, 2, 3, 4, 5, 6, 7, 8, 9])
def testActiveFilterMoveReverse(self):
list = ActiveList([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
@ -397,6 +398,7 @@ class ActiveListTest(TestCase):
self.assertEqual(len(filteredList), 9)
self.assertEqual(filteredList[1], 5)
self.assertEqual(filteredList[3], 4)
self.assertEqual(list.listeners[0].keyMap, [0, 1, 2, 4, 5, 6, 7, 8, 9])
def testActiveFilterMoveFilteredItem(self):
list = ActiveList([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
@ -404,6 +406,21 @@ class ActiveListTest(TestCase):
list.move(2, 4)
self.assertEqual(len(filteredList), 9)
self.assertEqual(filteredList[2], 4)
self.assertEqual(list.listeners[0].keyMap, [0, 1, 2, 3, 5, 6, 7, 8, 9])
def testActiveFilterMoveNotification(self):
list = ActiveList([1, 2, 3, 4, 5])
filteredList = list.filter(lambda x: x != 3)
listenerMock = Mock()
filteredList.addListener(listenerMock)
list.move(1, 4)
listenerMock.onListChange.assert_called_once()
source, changes = listenerMock.onListChange.call_args.args
self.assertIs(source, filteredList)
self.assertEqual(len(changes), 1)
self.assertIsInstance(changes[0], ActiveListIndexMoved)
self.assertEqual(changes[0].old_index, 1)
self.assertEqual(changes[0].new_index, 3)
def testActiveListFlattenMove(self):
firstMember = ActiveList([1, 2, 3, 4, 5])
@ -431,12 +448,32 @@ class ActiveListTest(TestCase):
self.assertEqual(changes[0].new_index, 9)
def testActiveListFlattenListMove(self):
list = ActiveList([ActiveList([1]), ActiveList([2]), ActiveList([3]), ActiveList([4]), ActiveList([5])])
flattenedList = list.flatten()
list.move(1, 4)
self.assertEqual(len(flattenedList), 5)
self.assertEqual(flattenedList[1], 3)
self.assertEqual(flattenedList[4], 2)
listoflists = ActiveList([
ActiveList(list(range(1, 11))),
ActiveList(list(range(11, 21))),
ActiveList(list(range(21, 31))),
ActiveList(list(range(31, 41))),
ActiveList(list(range(41, 51))),
])
flattenedList = listoflists.flatten()
listoflists.move(1, 4)
self.assertEqual(len(flattenedList), 50)
self.assertEqual(flattenedList[11], 22)
self.assertEqual(flattenedList[41], 12)
def testActiveListFlattenListMoveReverse(self):
listoflists = ActiveList([
ActiveList(list(range(1, 11))),
ActiveList(list(range(11, 21))),
ActiveList(list(range(21, 31))),
ActiveList(list(range(31, 41))),
ActiveList(list(range(41, 51))),
])
flattenedList = listoflists.flatten()
listoflists.move(4, 1)
self.assertEqual(len(flattenedList), 50)
self.assertEqual(flattenedList[11], 42)
self.assertEqual(flattenedList[21], 12)
def testActiveListFlattenListMoveNotification(self):
list = ActiveList([ActiveList([1, 2, 3, 4, 5]), ActiveList([6, 7, 8, 9, 10])])
@ -449,5 +486,6 @@ class ActiveListTest(TestCase):
source, changes = listenerMock.onListChange.call_args_list[i].args
self.assertIs(source, flattenedList)
self.assertEqual(len(changes), 1)
self.assertEqual(changes[0].old_index, i)
self.assertEqual(changes[0].new_index, i + 5)
# yes, this is a bit weird, but we don't have bulk move transactions.
self.assertEqual(changes[0].old_index, 0)
self.assertEqual(changes[0].new_index, 10)