Added button actions to filter IPv4 and IPv6 interfaces on and off

Steve Trease · Steve Trease · commit 0677d34fb694 · 2017-10-26T16:45:09.000+01:00
diff --git a/IP Address/Base.lproj/Main.storyboard b/IP Address/Base.lproj/Main.storyboard
@@ -69,6 +69,9 @@
                                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="fill" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4D9-QY-Z7f">
                                                         <rect key="frame" x="38" y="0.0" width="51" height="0.0"/>
                                                         <color key="onTintColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <connections>
+                                                            <action selector="switchToggled:" destination="BYZ-38-t0r" eventType="primaryActionTriggered" id="5Ua-gF-yFX"/>
+                                                        </connections>
                                                     </switch>
                                                 </subviews>
                                             </stackView>
@@ -84,6 +87,9 @@
                                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="fill" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k1l-3t-xif">
                                                         <rect key="frame" x="38" y="0.0" width="51" height="0.0"/>
                                                         <color key="onTintColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <connections>
+                                                            <action selector="switchToggled:" destination="BYZ-38-t0r" eventType="primaryActionTriggered" id="gnG-yw-32a"/>
+                                                        </connections>
                                                     </switch>
                                                 </subviews>
                                             </stackView>
@@ -127,6 +133,8 @@
                         </connections>
                     </view>
                     <connections>
+                        <outlet property="IPv4filterSwitch" destination="4D9-QY-Z7f" id="isA-GW-TSe"/>
+                        <outlet property="IPv6filterSwitch" destination="k1l-3t-xif" id="lvu-W6-Qvh"/>
                         <outlet property="tableView" destination="ATv-ck-YdY" id="aCH-cM-tuT"/>
                     </connections>
                 </viewController>
diff --git a/IP Address/ViewController.swift b/IP Address/ViewController.swift
@@ -12,17 +12,16 @@ import UIKit
 class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
     
     @IBOutlet var tableView: UITableView!
+    @IBOutlet var IPv4filterSwitch: UISwitch!
+    @IBOutlet var IPv6filterSwitch: UISwitch!
+    
         
     var interfaces = Interface.allInterfaces()
 
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        interfaces = Interface.allInterfaces()
-        interfaces.sort {
-            if $0.description == $1.description { return $0.address! < $1.address! }
-            return $0.description < $1.description
-        }
+        refreshAndSortAndFilterData()
     }
     
 
@@ -33,7 +32,6 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
     
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        print (interfaces.count)
         return interfaces.count
     }
     
@@ -49,15 +47,42 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
         return cell
     }
     
+    @IBAction func switchToggled(_ sender: UISwitch) {
+        print (NSURL (fileURLWithPath: "\(#file)").lastPathComponent!, "\(#function)")
+        refreshAndSortAndFilterData()
+        self.tableView.reloadData()
+    }
+    
     
     // screen tap to refresh 
     @IBAction func screenTappedTriggered(sender: AnyObject) {
         print (NSURL (fileURLWithPath: "\(#file)").lastPathComponent!, "\(#function)")
+        refreshAndSortAndFilterData()
+        self.tableView.reloadData()
+    }
+    
+    
+    func refreshAndSortAndFilterData () {
         interfaces = Interface.allInterfaces()
+        
+        let IPv4Interfaces = interfaces.filter { $0.family == .ipv4 }
+        let IPv6Interfaces = interfaces.filter { $0.family == .ipv6 }
+        
+        print ("\(IPv4Interfaces.count) \(IPv6Interfaces.count) \(interfaces.count)")
+        
+        interfaces = []
+        if (IPv4filterSwitch.isOn) {
+            interfaces = interfaces + IPv4Interfaces
+        }
+        if (IPv6filterSwitch.isOn) {
+            interfaces = interfaces + IPv6Interfaces
+        }
+        
+        print (interfaces.count)
+        
         interfaces.sort {
             if $0.description == $1.description { return $0.address! < $1.address! }
             return $0.description < $1.description
         }
-        self.tableView.reloadData()
     }
 }
