only changed items in the full network list are updated now

This commit is contained in:
Grant Limberg 2016-11-15 16:55:24 -08:00
parent bab75186f5
commit 456c7ca661
4 changed files with 103 additions and 4 deletions

View File

@ -59,4 +59,10 @@ enum NetworkType {
- (NSString*)statusString;
- (NSString*)typeString;
- (BOOL)hasSameNetworkId:(UInt64)networkId;
- (BOOL)isEqualToNetwork:(Network*)network;
- (BOOL)isEqual:(id)object;
- (NSUInteger)hash;
@end

View File

@ -275,4 +275,63 @@ NSString *NetworkAllowDefaultKey = @"allowDefault";
}
}
- (BOOL)hasSameNetworkId:(UInt64)networkId
{
return self.nwid == networkId;
}
- (BOOL)isEqualToNetwork:(Network*)network
{
return [self.assignedAddresses isEqualToArray:network.assignedAddresses] &&
self.bridge == network.bridge &&
self.broadcastEnabled == network.broadcastEnabled &&
self.dhcp == network.dhcp &&
[self.mac isEqualToString:network.mac] &&
self.mtu == network.mtu &&
self.netconfRevision == network.netconfRevision &&
[self.name isEqualToString:network.name] &&
self.nwid == network.nwid &&
[self.portDeviceName isEqualToString:network.portDeviceName] &&
self.status == network.status &&
self.type == network.type &&
self.allowManaged == network.allowManaged &&
self.allowGlobal == network.allowGlobal &&
self.allowDefault == network.allowDefault &&
self.connected == network.connected;
}
- (BOOL)isEqual:(id)object
{
if (self == object) {
return YES;
}
if (![object isKindOfClass:[Network class]]) {
return NO;
}
return [self isEqualToNetwork:object];
}
- (NSUInteger)hash
{
return [self.assignedAddresses hash] ^
self.bridge ^
self.broadcastEnabled ^
self.dhcp ^
[self.mac hash] ^
self.mtu ^
self.netconfRevision ^
[self.name hash] ^
self.nwid ^
[self.portDeviceName hash] ^
self.portError ^
self.status ^
self.type ^
self.allowManaged ^
self.allowGlobal ^
self.allowDefault ^
self.connected;
}
@end

View File

@ -23,7 +23,7 @@
@interface ShowNetworksViewController : NSViewController<NSTableViewDelegate, NSTableViewDataSource>
@property (nonatomic) NSArray<Network*> *networkList;
@property (nonatomic) NSMutableArray<Network*> *networkList;
@property (nonatomic) NetworkMonitor *netMonitor;
@property (nonatomic) BOOL visible;

View File

@ -21,6 +21,17 @@
#import "NetworkInfoCell.h"
#import "Network.h"
BOOL hasNetworkWithID(NSArray<Network*> *list, UInt64 nwid)
{
for(Network *n in list) {
if(n.nwid == nwid) {
return YES;
}
}
return NO;
}
@interface ShowNetworksViewController ()
@end
@ -30,6 +41,8 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.networkList = [NSMutableArray array];
[self.tableView setDelegate:self];
[self.tableView setDataSource:self];
[self.tableView setBackgroundColor:[NSColor clearColor]];
@ -50,9 +63,30 @@
}
- (void)setNetworks:(NSArray<Network *> *)list {
_networkList = list;
if(_visible) {
[_tableView reloadData];
for (Network *n in list) {
if ([_networkList containsObject:n]) {
// don't need to do anything here. Already an identical object in the list
continue;
}
else {
// network not in the list based on equality. Did an object change? or is it a new item?
if (hasNetworkWithID(_networkList, n.nwid)) {
for (int i = 0; i < [_networkList count]; ++i) {
Network *n2 = [_networkList objectAtIndex:i];
if (n.nwid == n2.nwid)
{
[_networkList replaceObjectAtIndex:i withObject:n];
[_tableView reloadDataForRowIndexes:[NSIndexSet indexSetWithIndex:i]
columnIndexes:[NSIndexSet indexSetWithIndex:0]];
}
}
}
else {
[_networkList addObject:n];
[_tableView reloadData];
}
}
}
}