mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-09-01 10:23:15 +00:00
Merge pull request #523 from facebook/DataControllerSerialization
Clean up organization and naming of methods internal to ASDataController.
This commit is contained in:
appleguy
commit
1563c5e577
@ -127,7 +127,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)performDataFetchingWithBlock:(dispatch_block_t)block {
|
- (void)accessDataSourceWithBlock:(dispatch_block_t)block {
|
||||||
if (_asyncDataFetchingEnabled) {
|
if (_asyncDataFetchingEnabled) {
|
||||||
[_dataSource dataControllerLockDataSource];
|
[_dataSource dataControllerLockDataSource];
|
||||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
|
||||||
@ -141,175 +141,9 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - Initial Data Loading
|
#pragma mark - Cell Layout
|
||||||
|
|
||||||
- (void)initialDataLoadingWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions {
|
- (void)_layoutNodes:(NSArray *)nodes
|
||||||
[self performDataFetchingWithBlock:^{
|
|
||||||
NSMutableArray *indexPaths = [NSMutableArray array];
|
|
||||||
NSUInteger sectionNum = [_dataSource dataControllerNumberOfSections:self];
|
|
||||||
|
|
||||||
// insert sections
|
|
||||||
[self insertSections:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, sectionNum)] withAnimationOptions:0];
|
|
||||||
|
|
||||||
for (NSUInteger i = 0; i < sectionNum; i++) {
|
|
||||||
NSIndexPath *indexPath = [[NSIndexPath alloc] initWithIndex:i];
|
|
||||||
|
|
||||||
NSUInteger rowNum = [_dataSource dataController:self rowsInSection:i];
|
|
||||||
for (NSUInteger j = 0; j < rowNum; j++) {
|
|
||||||
[indexPaths addObject:[indexPath indexPathByAddingIndex:j]];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// insert elements
|
|
||||||
[self insertRowsAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
|
||||||
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
|
|
||||||
#pragma mark - Data Update
|
|
||||||
|
|
||||||
- (void)beginUpdates
|
|
||||||
{
|
|
||||||
dispatch_async([[self class] sizingQueue], ^{
|
|
||||||
[self asyncUpdateDataWithBlock:^{
|
|
||||||
_batchUpdateCounter++;
|
|
||||||
}];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)endUpdates {
|
|
||||||
[self endUpdatesWithCompletion:NULL];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)endUpdatesWithCompletion:(void (^)(BOOL))completion
|
|
||||||
{
|
|
||||||
dispatch_async([[self class] sizingQueue], ^{
|
|
||||||
dispatch_async(dispatch_get_main_queue(), ^{
|
|
||||||
_batchUpdateCounter--;
|
|
||||||
|
|
||||||
if (!_batchUpdateCounter) {
|
|
||||||
[_delegate dataControllerBeginUpdates:self];
|
|
||||||
[_pendingBlocks enumerateObjectsUsingBlock:^(dispatch_block_t block, NSUInteger idx, BOOL *stop) {
|
|
||||||
block();
|
|
||||||
}];
|
|
||||||
[_pendingBlocks removeAllObjects];
|
|
||||||
[_delegate dataControllerEndUpdates:self completion:completion];
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)insertSections:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
|
||||||
[self performDataFetchingWithBlock:^{
|
|
||||||
__block int nodeTotalCnt = 0;
|
|
||||||
NSMutableArray *nodeCounts = [NSMutableArray arrayWithCapacity:indexSet.count];
|
|
||||||
[indexSet enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
|
|
||||||
NSUInteger cnt = [_dataSource dataController:self rowsInSection:idx];
|
|
||||||
[nodeCounts addObject:@(cnt)];
|
|
||||||
nodeTotalCnt += cnt;
|
|
||||||
}];
|
|
||||||
|
|
||||||
NSMutableArray *nodes = [NSMutableArray arrayWithCapacity:nodeTotalCnt];
|
|
||||||
NSMutableArray *indexPaths = [NSMutableArray arrayWithCapacity:nodeTotalCnt];
|
|
||||||
|
|
||||||
__block NSUInteger idx = 0;
|
|
||||||
[indexSet enumerateIndexesUsingBlock:^(NSUInteger sectionIdx, BOOL *stop) {
|
|
||||||
NSUInteger cnt = [nodeCounts[idx++] unsignedIntegerValue];
|
|
||||||
|
|
||||||
for (int i = 0; i < cnt; i++) {
|
|
||||||
NSIndexPath *indexPath = [NSIndexPath indexPathForItem:i inSection:sectionIdx];
|
|
||||||
[indexPaths addObject:indexPath];
|
|
||||||
|
|
||||||
ASCellNode *node = [_dataSource dataController:self nodeAtIndexPath:indexPath];
|
|
||||||
[nodes addObject:node];
|
|
||||||
}
|
|
||||||
}];
|
|
||||||
|
|
||||||
dispatch_async([[self class] sizingQueue], ^{
|
|
||||||
[self syncUpdateDataWithBlock:^{
|
|
||||||
NSMutableArray *sectionArray = [NSMutableArray arrayWithCapacity:indexSet.count];
|
|
||||||
for (NSUInteger i = 0; i < indexSet.count; i++) {
|
|
||||||
[sectionArray addObject:[NSMutableArray array]];
|
|
||||||
}
|
|
||||||
[self _insertSections:sectionArray atIndexSet:indexSet withAnimationOptions:animationOptions];
|
|
||||||
}];
|
|
||||||
|
|
||||||
[self _batchInsertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
|
||||||
});
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)deleteSections:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
|
||||||
dispatch_async([[self class] sizingQueue], ^{
|
|
||||||
[self asyncUpdateDataWithBlock:^{
|
|
||||||
// remove elements
|
|
||||||
NSArray *indexPaths = ASIndexPathsForMultidimensionalArrayAtIndexSet(_nodes, indexSet);
|
|
||||||
|
|
||||||
[self _deleteNodesAtIndexPaths:indexPaths animationOptions:animationOptions];
|
|
||||||
[self _deleteSectionsAtIndexSet:indexSet withAnimationOptions:animationOptions];
|
|
||||||
}];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)reloadSections:(NSIndexSet *)sections withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
|
||||||
[self performDataFetchingWithBlock:^{
|
|
||||||
// We need to keep data query on data source in the calling thread.
|
|
||||||
NSMutableArray *updatedIndexPaths = [[NSMutableArray alloc] init];
|
|
||||||
NSMutableArray *updatedNodes = [[NSMutableArray alloc] init];
|
|
||||||
|
|
||||||
[sections enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
|
|
||||||
NSUInteger rowNum = [_dataSource dataController:self rowsInSection:idx];
|
|
||||||
|
|
||||||
NSIndexPath *sectionIndex = [[NSIndexPath alloc] initWithIndex:idx];
|
|
||||||
for (NSUInteger i = 0; i < rowNum; i++) {
|
|
||||||
NSIndexPath *indexPath = [sectionIndex indexPathByAddingIndex:i];
|
|
||||||
[updatedIndexPaths addObject:indexPath];
|
|
||||||
[updatedNodes addObject:[_dataSource dataController:self nodeAtIndexPath:indexPath]];
|
|
||||||
}
|
|
||||||
}];
|
|
||||||
|
|
||||||
// Dispatch to sizing queue in order to guarantee that any in-progress sizing operations from prior edits have completed.
|
|
||||||
// For example, if an initial -reloadData call is quickly followed by -reloadSections, sizing the initial set may not be done
|
|
||||||
// at this time. Thus _nodes could be empty and crash in ASIndexPathsForMultidimensional[...]
|
|
||||||
dispatch_async([ASDataController sizingQueue], ^{
|
|
||||||
[self syncUpdateDataWithBlock:^{
|
|
||||||
// remove elements
|
|
||||||
NSArray *indexPaths = ASIndexPathsForMultidimensionalArrayAtIndexSet(_nodes, sections);
|
|
||||||
[self _deleteNodesAtIndexPaths:indexPaths animationOptions:animationOptions];
|
|
||||||
}];
|
|
||||||
|
|
||||||
// reinsert the elements
|
|
||||||
[self _batchInsertNodes:updatedNodes atIndexPaths:updatedIndexPaths withAnimationOptions:animationOptions];
|
|
||||||
});
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
|
||||||
dispatch_async([ASDataController sizingQueue], ^{
|
|
||||||
[self asyncUpdateDataWithBlock:^{
|
|
||||||
// remove elements
|
|
||||||
NSArray *indexPaths = ASIndexPathsForMultidimensionalArrayAtIndexSet(_nodes, [NSIndexSet indexSetWithIndex:section]);
|
|
||||||
NSArray *nodes = ASFindElementsInMultidimensionalArrayAtIndexPaths(_nodes, indexPaths);
|
|
||||||
[self _deleteNodesAtIndexPaths:indexPaths animationOptions:animationOptions];
|
|
||||||
|
|
||||||
// update the section of indexpaths
|
|
||||||
NSIndexPath *sectionIndexPath = [[NSIndexPath alloc] initWithIndex:newSection];
|
|
||||||
NSMutableArray *updatedIndexPaths = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
|
|
||||||
[indexPaths enumerateObjectsUsingBlock:^(NSIndexPath *indexPath, NSUInteger idx, BOOL *stop) {
|
|
||||||
[updatedIndexPaths addObject:[sectionIndexPath indexPathByAddingIndex:[indexPath indexAtPosition:indexPath.length - 1]]];
|
|
||||||
}];
|
|
||||||
|
|
||||||
// Don't re-calculate size for moving
|
|
||||||
[self _insertNodes:nodes atIndexPaths:updatedIndexPaths animationOptions:animationOptions];
|
|
||||||
}];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)_insertNodes:(NSArray *)nodes
|
|
||||||
atIndexPaths:(NSArray *)indexPaths
|
atIndexPaths:(NSArray *)indexPaths
|
||||||
withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
{
|
{
|
||||||
@ -343,7 +177,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
|
|
||||||
[self asyncUpdateDataWithBlock:^{
|
[self asyncUpdateDataWithBlock:^{
|
||||||
// Insert finished nodes into data storage
|
// Insert finished nodes into data storage
|
||||||
[self _insertNodes:nodes atIndexPaths:indexPaths animationOptions:animationOptions];
|
[self _insertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -354,7 +188,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)_batchInsertNodes:(NSArray *)nodes
|
- (void)_batchLayoutNodes:(NSArray *)nodes
|
||||||
atIndexPaths:(NSArray *)indexPaths
|
atIndexPaths:(NSArray *)indexPaths
|
||||||
withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
{
|
{
|
||||||
@ -366,74 +200,84 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
NSArray *batchedIndexPaths = [indexPaths subarrayWithRange:batchedRange];
|
NSArray *batchedIndexPaths = [indexPaths subarrayWithRange:batchedRange];
|
||||||
NSArray *batchedNodes = [nodes subarrayWithRange:batchedRange];
|
NSArray *batchedNodes = [nodes subarrayWithRange:batchedRange];
|
||||||
|
|
||||||
[self _insertNodes:batchedNodes atIndexPaths:batchedIndexPaths withAnimationOptions:animationOptions];
|
[self _layoutNodes:batchedNodes atIndexPaths:batchedIndexPaths withAnimationOptions:animationOptions];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
#pragma mark - Internal Data Editing
|
||||||
|
|
||||||
|
- (void)_insertNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
{
|
{
|
||||||
[self performDataFetchingWithBlock:^{
|
if (indexPaths.count == 0)
|
||||||
// sort indexPath to avoid messing up the index when inserting in several batches
|
return;
|
||||||
NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)];
|
if (_delegateWillInsertNodes)
|
||||||
NSMutableArray *nodes = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
|
[_delegate dataController:self willInsertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
for (NSUInteger i = 0; i < sortedIndexPaths.count; i++) {
|
ASInsertElementsIntoMultidimensionalArrayAtIndexPaths(_nodes, indexPaths, nodes);
|
||||||
[nodes addObject:[_dataSource dataController:self nodeAtIndexPath:sortedIndexPaths[i]]];
|
if (_delegateDidInsertNodes)
|
||||||
|
[_delegate dataController:self didInsertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
}
|
}
|
||||||
|
|
||||||
[self _batchInsertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
- (void)_deleteNodesAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
}];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
{
|
||||||
// sort indexPath in order to avoid messing up the index when deleting
|
if (indexPaths.count == 0)
|
||||||
NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)];
|
return;
|
||||||
|
if (_delegateWillDeleteNodes)
|
||||||
dispatch_async([ASDataController sizingQueue], ^{
|
[_delegate dataController:self willDeleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
[self asyncUpdateDataWithBlock:^{
|
ASDeleteElementsInMultidimensionalArrayAtIndexPaths(_nodes, indexPaths);
|
||||||
[self _deleteNodesAtIndexPaths:sortedIndexPaths animationOptions:animationOptions];
|
if (_delegateDidDeleteNodes)
|
||||||
}];
|
[_delegate dataController:self didDeleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
- (void)_insertSections:(NSArray *)sections atIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
{
|
{
|
||||||
// Reloading requires re-fetching the data. Load it on the current calling thread, locking the data source.
|
if (indexSet.count == 0)
|
||||||
[self performDataFetchingWithBlock:^{
|
return;
|
||||||
NSMutableArray *nodes = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
|
if (_delegateWillInsertSections)
|
||||||
[indexPaths sortedArrayUsingSelector:@selector(compare:)];
|
[_delegate dataController:self willInsertSections:sections atIndexSet:indexSet withAnimationOptions:animationOptions];
|
||||||
[indexPaths enumerateObjectsUsingBlock:^(NSIndexPath *indexPath, NSUInteger idx, BOOL *stop) {
|
[_nodes insertObjects:sections atIndexes:indexSet];
|
||||||
[nodes addObject:[_dataSource dataController:self nodeAtIndexPath:indexPath]];
|
if (_delegateDidInsertSections)
|
||||||
}];
|
[_delegate dataController:self didInsertSections:sections atIndexSet:indexSet withAnimationOptions:animationOptions];
|
||||||
|
|
||||||
dispatch_async([ASDataController sizingQueue], ^{
|
|
||||||
[self syncUpdateDataWithBlock:^{
|
|
||||||
[self _deleteNodesAtIndexPaths:indexPaths animationOptions:animationOptions];
|
|
||||||
}];
|
|
||||||
|
|
||||||
[self _batchInsertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
|
||||||
});
|
|
||||||
}];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
- (void)_deleteSectionsAtIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
{
|
{
|
||||||
dispatch_async([ASDataController sizingQueue], ^{
|
if (indexSet.count == 0)
|
||||||
[self asyncUpdateDataWithBlock:^{
|
return;
|
||||||
NSArray *nodes = ASFindElementsInMultidimensionalArrayAtIndexPaths(_nodes, [NSArray arrayWithObject:indexPath]);
|
if (_delegateWillDeleteSections)
|
||||||
NSArray *indexPaths = [NSArray arrayWithObject:indexPath];
|
[_delegate dataController:self willDeleteSectionsAtIndexSet:indexSet withAnimationOptions:animationOptions];
|
||||||
[self _deleteNodesAtIndexPaths:indexPaths animationOptions:animationOptions];
|
[_nodes removeObjectsAtIndexes:indexSet];
|
||||||
|
if (_delegateDidDeleteSections)
|
||||||
|
[_delegate dataController:self didDeleteSectionsAtIndexSet:indexSet withAnimationOptions:animationOptions];
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma mark - Initial Load & Full Reload (External API)
|
||||||
|
|
||||||
|
- (void)initialDataLoadingWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions {
|
||||||
|
[self accessDataSourceWithBlock:^{
|
||||||
|
NSMutableArray *indexPaths = [NSMutableArray array];
|
||||||
|
NSUInteger sectionNum = [_dataSource dataControllerNumberOfSections:self];
|
||||||
|
|
||||||
|
// insert sections
|
||||||
|
[self insertSections:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, sectionNum)] withAnimationOptions:0];
|
||||||
|
|
||||||
|
for (NSUInteger i = 0; i < sectionNum; i++) {
|
||||||
|
NSIndexPath *indexPath = [[NSIndexPath alloc] initWithIndex:i];
|
||||||
|
|
||||||
|
NSUInteger rowNum = [_dataSource dataController:self rowsInSection:i];
|
||||||
|
for (NSUInteger j = 0; j < rowNum; j++) {
|
||||||
|
[indexPaths addObject:[indexPath indexPathByAddingIndex:j]];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// insert elements
|
||||||
|
[self insertRowsAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
|
||||||
// Don't re-calculate size for moving
|
|
||||||
NSArray *newIndexPaths = [NSArray arrayWithObject:newIndexPath];
|
|
||||||
[self _insertNodes:nodes atIndexPaths:newIndexPaths animationOptions:animationOptions];
|
|
||||||
}];
|
}];
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)reloadDataWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions completion:(void (^)())completion
|
- (void)reloadDataWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions completion:(void (^)())completion
|
||||||
{
|
{
|
||||||
[self performDataFetchingWithBlock:^{
|
[self accessDataSourceWithBlock:^{
|
||||||
// Fetching data in calling thread
|
// Fetching data in calling thread
|
||||||
NSMutableArray *updatedNodes = [[NSMutableArray alloc] init];
|
NSMutableArray *updatedNodes = [[NSMutableArray alloc] init];
|
||||||
NSMutableArray *updatedIndexPaths = [[NSMutableArray alloc] init];
|
NSMutableArray *updatedIndexPaths = [[NSMutableArray alloc] init];
|
||||||
@ -454,7 +298,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
[self syncUpdateDataWithBlock:^{
|
[self syncUpdateDataWithBlock:^{
|
||||||
// Remove everything that existed before the reload, now that we're ready to insert replacements
|
// Remove everything that existed before the reload, now that we're ready to insert replacements
|
||||||
NSArray *indexPaths = ASIndexPathsForMultidimensionalArray(_nodes);
|
NSArray *indexPaths = ASIndexPathsForMultidimensionalArray(_nodes);
|
||||||
[self _deleteNodesAtIndexPaths:indexPaths animationOptions:animationOptions];
|
[self _deleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
|
||||||
NSMutableIndexSet *indexSet = [[NSMutableIndexSet alloc] initWithIndexesInRange:NSMakeRange(0, _nodes.count)];
|
NSMutableIndexSet *indexSet = [[NSMutableIndexSet alloc] initWithIndexesInRange:NSMakeRange(0, _nodes.count)];
|
||||||
[self deleteSections:indexSet withAnimationOptions:animationOptions];
|
[self deleteSections:indexSet withAnimationOptions:animationOptions];
|
||||||
@ -468,7 +312,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
[self _insertSections:sections atIndexSet:[[NSIndexSet alloc] initWithIndexesInRange:NSMakeRange(0, sectionNum)] withAnimationOptions:animationOptions];
|
[self _insertSections:sections atIndexSet:[[NSIndexSet alloc] initWithIndexesInRange:NSMakeRange(0, sectionNum)] withAnimationOptions:animationOptions];
|
||||||
}];
|
}];
|
||||||
|
|
||||||
[self _batchInsertNodes:updatedNodes atIndexPaths:updatedIndexPaths withAnimationOptions:animationOptions];
|
[self _batchLayoutNodes:updatedNodes atIndexPaths:updatedIndexPaths withAnimationOptions:animationOptions];
|
||||||
|
|
||||||
if (completion) {
|
if (completion) {
|
||||||
dispatch_async(dispatch_get_main_queue(), completion);
|
dispatch_async(dispatch_get_main_queue(), completion);
|
||||||
@ -477,7 +321,215 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - Data Querying
|
#pragma mark - Batching (External API)
|
||||||
|
|
||||||
|
- (void)beginUpdates
|
||||||
|
{
|
||||||
|
dispatch_async([[self class] sizingQueue], ^{
|
||||||
|
[self asyncUpdateDataWithBlock:^{
|
||||||
|
_batchUpdateCounter++;
|
||||||
|
}];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)endUpdates {
|
||||||
|
[self endUpdatesWithCompletion:NULL];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)endUpdatesWithCompletion:(void (^)(BOOL))completion
|
||||||
|
{
|
||||||
|
dispatch_async([[self class] sizingQueue], ^{
|
||||||
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
|
_batchUpdateCounter--;
|
||||||
|
|
||||||
|
if (!_batchUpdateCounter) {
|
||||||
|
[_delegate dataControllerBeginUpdates:self];
|
||||||
|
[_pendingBlocks enumerateObjectsUsingBlock:^(dispatch_block_t block, NSUInteger idx, BOOL *stop) {
|
||||||
|
block();
|
||||||
|
}];
|
||||||
|
[_pendingBlocks removeAllObjects];
|
||||||
|
[_delegate dataControllerEndUpdates:self completion:completion];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma mark - Section Editing (External API)
|
||||||
|
|
||||||
|
- (void)insertSections:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
|
{
|
||||||
|
[self accessDataSourceWithBlock:^{
|
||||||
|
__block int nodeTotalCnt = 0;
|
||||||
|
NSMutableArray *nodeCounts = [NSMutableArray arrayWithCapacity:indexSet.count];
|
||||||
|
[indexSet enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
|
||||||
|
NSUInteger cnt = [_dataSource dataController:self rowsInSection:idx];
|
||||||
|
[nodeCounts addObject:@(cnt)];
|
||||||
|
nodeTotalCnt += cnt;
|
||||||
|
}];
|
||||||
|
|
||||||
|
NSMutableArray *nodes = [NSMutableArray arrayWithCapacity:nodeTotalCnt];
|
||||||
|
NSMutableArray *indexPaths = [NSMutableArray arrayWithCapacity:nodeTotalCnt];
|
||||||
|
|
||||||
|
__block NSUInteger idx = 0;
|
||||||
|
[indexSet enumerateIndexesUsingBlock:^(NSUInteger sectionIdx, BOOL *stop) {
|
||||||
|
NSUInteger cnt = [nodeCounts[idx++] unsignedIntegerValue];
|
||||||
|
|
||||||
|
for (int i = 0; i < cnt; i++) {
|
||||||
|
NSIndexPath *indexPath = [NSIndexPath indexPathForItem:i inSection:sectionIdx];
|
||||||
|
[indexPaths addObject:indexPath];
|
||||||
|
|
||||||
|
ASCellNode *node = [_dataSource dataController:self nodeAtIndexPath:indexPath];
|
||||||
|
[nodes addObject:node];
|
||||||
|
}
|
||||||
|
}];
|
||||||
|
|
||||||
|
dispatch_async([[self class] sizingQueue], ^{
|
||||||
|
[self syncUpdateDataWithBlock:^{
|
||||||
|
NSMutableArray *sectionArray = [NSMutableArray arrayWithCapacity:indexSet.count];
|
||||||
|
for (NSUInteger i = 0; i < indexSet.count; i++) {
|
||||||
|
[sectionArray addObject:[NSMutableArray array]];
|
||||||
|
}
|
||||||
|
[self _insertSections:sectionArray atIndexSet:indexSet withAnimationOptions:animationOptions];
|
||||||
|
}];
|
||||||
|
|
||||||
|
[self _batchLayoutNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
});
|
||||||
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)deleteSections:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
|
{
|
||||||
|
dispatch_async([[self class] sizingQueue], ^{
|
||||||
|
[self asyncUpdateDataWithBlock:^{
|
||||||
|
// remove elements
|
||||||
|
NSArray *indexPaths = ASIndexPathsForMultidimensionalArrayAtIndexSet(_nodes, indexSet);
|
||||||
|
|
||||||
|
[self _deleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
[self _deleteSectionsAtIndexSet:indexSet withAnimationOptions:animationOptions];
|
||||||
|
}];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)reloadSections:(NSIndexSet *)sections withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
|
{
|
||||||
|
[self accessDataSourceWithBlock:^{
|
||||||
|
// We need to keep data query on data source in the calling thread.
|
||||||
|
NSMutableArray *updatedIndexPaths = [[NSMutableArray alloc] init];
|
||||||
|
NSMutableArray *updatedNodes = [[NSMutableArray alloc] init];
|
||||||
|
|
||||||
|
[sections enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
|
||||||
|
NSUInteger rowNum = [_dataSource dataController:self rowsInSection:idx];
|
||||||
|
|
||||||
|
NSIndexPath *sectionIndex = [[NSIndexPath alloc] initWithIndex:idx];
|
||||||
|
for (NSUInteger i = 0; i < rowNum; i++) {
|
||||||
|
NSIndexPath *indexPath = [sectionIndex indexPathByAddingIndex:i];
|
||||||
|
[updatedIndexPaths addObject:indexPath];
|
||||||
|
[updatedNodes addObject:[_dataSource dataController:self nodeAtIndexPath:indexPath]];
|
||||||
|
}
|
||||||
|
}];
|
||||||
|
|
||||||
|
// Dispatch to sizing queue in order to guarantee that any in-progress sizing operations from prior edits have completed.
|
||||||
|
// For example, if an initial -reloadData call is quickly followed by -reloadSections, sizing the initial set may not be done
|
||||||
|
// at this time. Thus _nodes could be empty and crash in ASIndexPathsForMultidimensional[...]
|
||||||
|
dispatch_async([ASDataController sizingQueue], ^{
|
||||||
|
[self syncUpdateDataWithBlock:^{
|
||||||
|
// remove elements
|
||||||
|
NSArray *indexPaths = ASIndexPathsForMultidimensionalArrayAtIndexSet(_nodes, sections);
|
||||||
|
[self _deleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
}];
|
||||||
|
|
||||||
|
// reinsert the elements
|
||||||
|
[self _batchLayoutNodes:updatedNodes atIndexPaths:updatedIndexPaths withAnimationOptions:animationOptions];
|
||||||
|
});
|
||||||
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
|
{
|
||||||
|
dispatch_async([ASDataController sizingQueue], ^{
|
||||||
|
[self asyncUpdateDataWithBlock:^{
|
||||||
|
// remove elements
|
||||||
|
NSArray *indexPaths = ASIndexPathsForMultidimensionalArrayAtIndexSet(_nodes, [NSIndexSet indexSetWithIndex:section]);
|
||||||
|
NSArray *nodes = ASFindElementsInMultidimensionalArrayAtIndexPaths(_nodes, indexPaths);
|
||||||
|
[self _deleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
|
||||||
|
// update the section of indexpaths
|
||||||
|
NSIndexPath *sectionIndexPath = [[NSIndexPath alloc] initWithIndex:newSection];
|
||||||
|
NSMutableArray *updatedIndexPaths = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
|
||||||
|
[indexPaths enumerateObjectsUsingBlock:^(NSIndexPath *indexPath, NSUInteger idx, BOOL *stop) {
|
||||||
|
[updatedIndexPaths addObject:[sectionIndexPath indexPathByAddingIndex:[indexPath indexAtPosition:indexPath.length - 1]]];
|
||||||
|
}];
|
||||||
|
|
||||||
|
// Don't re-calculate size for moving
|
||||||
|
[self _insertNodes:nodes atIndexPaths:updatedIndexPaths withAnimationOptions:animationOptions];
|
||||||
|
}];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma mark - Row Editing (External API)
|
||||||
|
|
||||||
|
- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
|
{
|
||||||
|
[self accessDataSourceWithBlock:^{
|
||||||
|
// sort indexPath to avoid messing up the index when inserting in several batches
|
||||||
|
NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)];
|
||||||
|
NSMutableArray *nodes = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
|
||||||
|
for (NSUInteger i = 0; i < sortedIndexPaths.count; i++) {
|
||||||
|
[nodes addObject:[_dataSource dataController:self nodeAtIndexPath:sortedIndexPaths[i]]];
|
||||||
|
}
|
||||||
|
|
||||||
|
[self _batchLayoutNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
|
{
|
||||||
|
// sort indexPath in order to avoid messing up the index when deleting
|
||||||
|
NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)];
|
||||||
|
|
||||||
|
dispatch_async([ASDataController sizingQueue], ^{
|
||||||
|
[self asyncUpdateDataWithBlock:^{
|
||||||
|
[self _deleteNodesAtIndexPaths:sortedIndexPaths withAnimationOptions:animationOptions];
|
||||||
|
}];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
|
{
|
||||||
|
// Reloading requires re-fetching the data. Load it on the current calling thread, locking the data source.
|
||||||
|
[self accessDataSourceWithBlock:^{
|
||||||
|
NSMutableArray *nodes = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
|
||||||
|
[indexPaths sortedArrayUsingSelector:@selector(compare:)];
|
||||||
|
[indexPaths enumerateObjectsUsingBlock:^(NSIndexPath *indexPath, NSUInteger idx, BOOL *stop) {
|
||||||
|
[nodes addObject:[_dataSource dataController:self nodeAtIndexPath:indexPath]];
|
||||||
|
}];
|
||||||
|
|
||||||
|
dispatch_async([ASDataController sizingQueue], ^{
|
||||||
|
[self syncUpdateDataWithBlock:^{
|
||||||
|
[self _deleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
}];
|
||||||
|
|
||||||
|
[self _batchLayoutNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
});
|
||||||
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
||||||
|
{
|
||||||
|
dispatch_async([ASDataController sizingQueue], ^{
|
||||||
|
[self asyncUpdateDataWithBlock:^{
|
||||||
|
NSArray *nodes = ASFindElementsInMultidimensionalArrayAtIndexPaths(_nodes, [NSArray arrayWithObject:indexPath]);
|
||||||
|
NSArray *indexPaths = [NSArray arrayWithObject:indexPath];
|
||||||
|
[self _deleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
||||||
|
|
||||||
|
// Don't re-calculate size for moving
|
||||||
|
NSArray *newIndexPaths = [NSArray arrayWithObject:newIndexPath];
|
||||||
|
[self _insertNodes:nodes atIndexPaths:newIndexPaths withAnimationOptions:animationOptions];
|
||||||
|
}];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma mark - Data Querying (External API)
|
||||||
|
|
||||||
- (NSUInteger)numberOfSections
|
- (NSUInteger)numberOfSections
|
||||||
{
|
{
|
||||||
@ -512,52 +564,6 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
|
|||||||
return ASFindElementsInMultidimensionalArrayAtIndexPaths(_nodes, [indexPaths sortedArrayUsingSelector:@selector(compare:)]);
|
return ASFindElementsInMultidimensionalArrayAtIndexPaths(_nodes, [indexPaths sortedArrayUsingSelector:@selector(compare:)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - Internal Data Updating
|
|
||||||
|
|
||||||
- (void)_insertNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths animationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
|
||||||
if (indexPaths.count == 0)
|
|
||||||
return;
|
|
||||||
if (_delegateWillInsertNodes)
|
|
||||||
[_delegate dataController:self willInsertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
|
||||||
ASInsertElementsIntoMultidimensionalArrayAtIndexPaths(_nodes, indexPaths, nodes);
|
|
||||||
if (_delegateDidInsertNodes)
|
|
||||||
[_delegate dataController:self didInsertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)_deleteNodesAtIndexPaths:(NSArray *)indexPaths animationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
|
||||||
if (indexPaths.count == 0)
|
|
||||||
return;
|
|
||||||
if (_delegateWillDeleteNodes)
|
|
||||||
[_delegate dataController:self willDeleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
|
||||||
ASDeleteElementsInMultidimensionalArrayAtIndexPaths(_nodes, indexPaths);
|
|
||||||
if (_delegateDidDeleteNodes)
|
|
||||||
[_delegate dataController:self didDeleteNodesAtIndexPaths:indexPaths withAnimationOptions:animationOptions];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)_insertSections:(NSArray *)sections atIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
|
||||||
if (indexSet.count == 0)
|
|
||||||
return;
|
|
||||||
if (_delegateWillInsertSections)
|
|
||||||
[_delegate dataController:self willInsertSections:sections atIndexSet:indexSet withAnimationOptions:animationOptions];
|
|
||||||
[_nodes insertObjects:sections atIndexes:indexSet];
|
|
||||||
if (_delegateDidInsertSections)
|
|
||||||
[_delegate dataController:self didInsertSections:sections atIndexSet:indexSet withAnimationOptions:animationOptions];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)_deleteSectionsAtIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
|
|
||||||
{
|
|
||||||
if (indexSet.count == 0)
|
|
||||||
return;
|
|
||||||
if (_delegateWillDeleteSections)
|
|
||||||
[_delegate dataController:self willDeleteSectionsAtIndexSet:indexSet withAnimationOptions:animationOptions];
|
|
||||||
[_nodes removeObjectsAtIndexes:indexSet];
|
|
||||||
if (_delegateDidDeleteSections)
|
|
||||||
[_delegate dataController:self didDeleteSectionsAtIndexSet:indexSet withAnimationOptions:animationOptions];
|
|
||||||
}
|
|
||||||
|
|
||||||
#pragma mark - Dealloc
|
#pragma mark - Dealloc
|
||||||
|
|
||||||
- (void)dealloc {
|
- (void)dealloc {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user