- packet update and get events are separated.

yagiz · yagiz · commit 330c93c0f511 · 2019-01-13T10:37:02.000+03:00
- colors are added for http method field.
diff --git a/assets/screenshot.png b/assets/screenshot.png
diff --git a/mac/Bagel.xcworkspace/xcuserdata/yagizgurgul.xcuserdatad/UserInterfaceState.xcuserstate b/mac/Bagel.xcworkspace/xcuserdata/yagizgurgul.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/mac/Bagel.xcworkspace/xcuserdata/yagizgurgul.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/mac/Bagel.xcworkspace/xcuserdata/yagizgurgul.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -51,21 +51,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Bagel/Components/Details/DetailViewController.swift"
-            timestampString = "567899693.473048"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "118"
-            endingLineNumber = "118"
-            landmarkName = "refresh()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/mac/Bagel/Components/Details/DetailSections/DataViewController/DataViewModel.swift b/mac/Bagel/Components/Details/DetailSections/DataViewController/DataViewModel.swift
@@ -16,7 +16,6 @@ class DataViewModel: BaseViewModel {
     func register() {
         
         NotificationCenter.default.addObserver(self, selector: #selector(self.didSelectPacket), name: BagelNotifications.didSelectPacket, object: nil)
-
         NotificationCenter.default.addObserver(self, selector: #selector(self.didSelectPacket), name: BagelNotifications.didGetPacket, object: nil)
     }
     
diff --git a/mac/Bagel/Components/Details/DetailViewModel.swift b/mac/Bagel/Components/Details/DetailViewModel.swift
@@ -14,12 +14,20 @@ class DetailViewModel: BaseViewModel {
     
     func register() {
         
-        NotificationCenter.default.addObserver(self, selector: #selector(self.refreshPacket), name: BagelNotifications.didGetPacket, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(self.refreshPacket), name: BagelNotifications.didUpdatePacket, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(self.refreshPacket), name: BagelNotifications.didSelectPacket, object: nil)
     }
     
+    @objc func didUpdatePacket(notification: Notification) {
+        if let packet = notification.userInfo?["packet"] as? BagelPacket {
+            if packet.packetId == self.packet?.packetId {
+                self.packet = packet
+                self.onChange?()
+            }
+        }
+    }
+    
     @objc func refreshPacket() {
-        
         self.packet = BagelController.shared.selectedProjectController?.selectedDeviceController?.selectedPacket
         self.onChange?()
     }
diff --git a/mac/Bagel/Components/Details/Details.storyboard b/mac/Bagel/Components/Details/Details.storyboard
@@ -370,7 +370,7 @@
                                                                 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                                 <prototypeCellViews>
                                                                     <tableCellView identifier="KeyValueTableCellView" id="Ze5-kZ-luS" customClass="KeyValueTableCellView" customModule="Bagel" customModuleProvider="target">
-                                                                        <rect key="frame" x="139" y="1" width="299" height="43"/>
+                                                                        <rect key="frame" x="138.5" y="1" width="299" height="43"/>
                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                         <subviews>
                                                                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ll4-xn-DEL">
diff --git a/mac/Bagel/Components/Packets/MethodPacketTableCellView.swift b/mac/Bagel/Components/Packets/MethodPacketTableCellView.swift
@@ -23,7 +23,19 @@ class MethodPacketTableCellView: NSTableCellView {
     
     func refresh() {
         
-        self.titleTextField.textColor = ThemeColor.labelColor
+        var methodColor = ThemeColor.httpMethodDefaultColor
+        
+        if self.packet.requestInfo?.requestMethod == "GET" {
+            methodColor = ThemeColor.httpMethodGetColor
+        }else if self.packet.requestInfo?.requestMethod == "POST" {
+            methodColor = ThemeColor.httpMethodPostColor
+        }else if self.packet.requestInfo?.requestMethod == "PUT" {
+            methodColor = ThemeColor.httpMethodPutColor
+        }else if self.packet.requestInfo?.requestMethod == "DELETE" {
+            methodColor = ThemeColor.httpMethodDeleteColor
+        }
+        
+        self.titleTextField.textColor = methodColor
         self.titleTextField.stringValue = self.packet.requestInfo?.requestMethod ?? ""
     }
     
diff --git a/mac/Bagel/Themes/DarkTheme.swift b/mac/Bagel/Themes/DarkTheme.swift
@@ -83,3 +83,26 @@ extension DarkTheme {
         return NSImage(named: NSImage.Name("CopyIconDark"))!
     }
 }
+
+extension DarkTheme {
+    
+    @objc var httpMethodGetColor: NSColor {
+        return NSColor(hexString: "#00b894")
+    }
+    
+    @objc var httpMethodPostColor: NSColor {
+        return NSColor(hexString: "#fdcb6e")
+    }
+    
+    @objc var httpMethodDeleteColor: NSColor {
+        return NSColor(hexString: "#e17055")
+    }
+    
+    @objc var httpMethodPutColor: NSColor {
+        return NSColor(hexString: "#0984e3")
+    }
+    
+    @objc var httpMethodDefaultColor: NSColor {
+        return self.secondaryLabelColor
+    }
+}
diff --git a/mac/Bagel/Themes/LightTheme.swift b/mac/Bagel/Themes/LightTheme.swift
@@ -82,3 +82,27 @@ extension LightTheme {
         return NSImage(named: NSImage.Name("CopyIcon"))!
     }
 }
+
+
+extension LightTheme {
+    
+    @objc var httpMethodGetColor: NSColor {
+        return NSColor(hexString: "#00cec9")
+    }
+    
+    @objc var httpMethodPostColor: NSColor {
+        return NSColor(hexString: "#fdcb6e")
+    }
+    
+    @objc var httpMethodDeleteColor: NSColor {
+        return NSColor(hexString: "#e17055")
+    }
+    
+    @objc var httpMethodPutColor: NSColor {
+        return NSColor(hexString: "#0984e3")
+    }
+    
+    @objc var httpMethodDefaultColor: NSColor {
+        return self.secondaryLabelColor
+    }
+}
diff --git a/mac/Bagel/Themes/Theme.swift b/mac/Bagel/Themes/Theme.swift
@@ -78,3 +78,26 @@ extension ThemeColor {
         return ThemeColor.color(with: #function)
     }
 }
+
+extension ThemeColor {
+    
+    static var httpMethodGetColor: ThemeColor {
+        return ThemeColor.color(with: #function)
+    }
+    
+    static var httpMethodPostColor: ThemeColor {
+        return ThemeColor.color(with: #function)
+    }
+    
+    static var httpMethodDeleteColor: ThemeColor {
+        return ThemeColor.color(with: #function)
+    }
+    
+    static var httpMethodPutColor: ThemeColor {
+        return ThemeColor.color(with: #function)
+    }
+    
+    static var httpMethodDefaultColor: ThemeColor {
+        return ThemeColor.color(with: #function)
+    }
+}
diff --git a/mac/Bagel/Workers/BagelController/Controllers/BagelController.swift b/mac/Bagel/Workers/BagelController/Controllers/BagelController.swift
@@ -12,6 +12,7 @@ import Cocoa
 struct BagelNotifications {
     
     static let didGetPacket = NSNotification.Name("DidGetPacket")
+    static let didUpdatePacket = NSNotification.Name("DidUpdatePacket")
     static let didSelectProject = NSNotification.Name("DidSelectProject")
     static let didSelectDevice = NSNotification.Name("DidSelectDevice")
     static let didSelectPacket = NSNotification.Name("DidSelectPacket")
@@ -40,18 +41,21 @@ class BagelController: NSObject, BagelPublisherDelegate {
     
     func didGetPacket(publisher: BagelPublisher, packet: BagelPacket) {
         
-        self.addPacket(newPacket: packet)
-        NotificationCenter.default.post(name: BagelNotifications.didGetPacket, object: nil)
+        if self.addPacket(newPacket: packet) {
+            NotificationCenter.default.post(name: BagelNotifications.didGetPacket, object: nil, userInfo: ["packet": packet])
+        }else{
+            NotificationCenter.default.post(name: BagelNotifications.didUpdatePacket, object: nil, userInfo: ["packet": packet])
+        }
     }
     
-    func addPacket(newPacket: BagelPacket) {
+    @discardableResult
+    func addPacket(newPacket: BagelPacket) -> Bool {
         
         for projectController in self.projectControllers {
             
             if projectController.projectName == newPacket.project?.projectName {
                 
-                projectController.addPacket(newPacket: newPacket)
-                return
+                return projectController.addPacket(newPacket: newPacket)
             }
         }
         
@@ -69,5 +73,7 @@ class BagelController: NSObject, BagelPublisherDelegate {
             
             self.selectedProjectController = self.projectControllers.first
         }
+        
+        return true
     }
 }
diff --git a/mac/Bagel/Workers/BagelController/Controllers/BagelDeviceController.swift b/mac/Bagel/Workers/BagelController/Controllers/BagelDeviceController.swift
@@ -21,14 +21,15 @@ class BagelDeviceController: NSObject {
         }
     }
     
-    func addPacket(newPacket: BagelPacket) {
+    @discardableResult
+    func addPacket(newPacket: BagelPacket) -> Bool {
         
         for packet in self.packets {
             
             if packet.packetId == newPacket.packetId {
                 
                 packet.requestInfo = newPacket.requestInfo
-                return
+                return false
             }
         }
         
@@ -40,6 +41,8 @@ class BagelDeviceController: NSObject {
             
             self.selectedPacket = self.packets.first
         }
+        
+        return true
     }
     
     func clear() {
diff --git a/mac/Bagel/Workers/BagelController/Controllers/BagelProjectController.swift b/mac/Bagel/Workers/BagelController/Controllers/BagelProjectController.swift
@@ -19,14 +19,14 @@ class BagelProjectController: NSObject {
         }
     }
     
-    func addPacket(newPacket: BagelPacket) {
+    @discardableResult
+    func addPacket(newPacket: BagelPacket) -> Bool {
         
         for deviceController in self.deviceControllers {
             
             if deviceController.deviceId == newPacket.device?.deviceId {
                 
-                deviceController.addPacket(newPacket: newPacket)
-                return
+                return deviceController.addPacket(newPacket: newPacket)
             }
         }
         
@@ -44,5 +44,7 @@ class BagelProjectController: NSObject {
             
             self.selectedDeviceController = self.deviceControllers.first
         }
+        
+        return true
     }
 }
diff --git a/mac/Bagel/Workers/BagelController/Models/BagelPacket.swift b/mac/Bagel/Workers/BagelController/Models/BagelPacket.swift
@@ -16,6 +16,7 @@ class BagelPacket: Codable {
     
     var project: BagelProjectModel?
     var device: BagelDeviceModel?
+    
 }
 
 
diff --git a/mac/Bagel/Workers/BagelController/Publisher/BagelPublisher.swift b/mac/Bagel/Workers/BagelController/Publisher/BagelPublisher.swift
@@ -26,7 +26,7 @@ class BagelPublisher: NSObject {
         
         self.sockets = []
         
-        self.mainSocket = GCDAsyncSocket(delegate: self, delegateQueue: DispatchQueue.main)
+        self.mainSocket = GCDAsyncSocket(delegate: self, delegateQueue: DispatchQueue.global(qos: .background))
 
         do {
             
@@ -62,7 +62,10 @@ class BagelPublisher: NSObject {
         do {
             
             let bagelPacket = try jsonDecoder.decode(BagelPacket.self, from: data)
-            delegate?.didGetPacket(publisher: self, packet: bagelPacket)
+            
+            DispatchQueue.main.async {
+                self.delegate?.didGetPacket(publisher: self, packet: bagelPacket)
+            }
             
         } catch {
             

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ class DataViewModel: BaseViewModel {`
`16`	`16`	`func register() {`
`17`	`17`
`18`	`18`	`NotificationCenter.default.addObserver(self, selector: #selector(self.didSelectPacket), name: BagelNotifications.didSelectPacket, object: nil)`
`19`		`-`
`20`	`19`	`NotificationCenter.default.addObserver(self, selector: #selector(self.didSelectPacket), name: BagelNotifications.didGetPacket, object: nil)`
`21`	`20`	`}`
`22`	`21`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import Cocoa`
`12`	`12`	`struct BagelNotifications {`
`13`	`13`
`14`	`14`	`static let didGetPacket = NSNotification.Name("DidGetPacket")`
	`15`	`+ static let didUpdatePacket = NSNotification.Name("DidUpdatePacket")`
`15`	`16`	`static let didSelectProject = NSNotification.Name("DidSelectProject")`
`16`	`17`	`static let didSelectDevice = NSNotification.Name("DidSelectDevice")`
`17`	`18`	`static let didSelectPacket = NSNotification.Name("DidSelectPacket")`
`@@ -40,18 +41,21 @@ class BagelController: NSObject, BagelPublisherDelegate {`
`40`	`41`
`41`	`42`	`func didGetPacket(publisher: BagelPublisher, packet: BagelPacket) {`
`42`	`43`
`43`		`- self.addPacket(newPacket: packet)`
`44`		`- NotificationCenter.default.post(name: BagelNotifications.didGetPacket, object: nil)`
	`44`	`+ if self.addPacket(newPacket: packet) {`
	`45`	`+ NotificationCenter.default.post(name: BagelNotifications.didGetPacket, object: nil, userInfo: ["packet": packet])`
	`46`	`+ }else{`
	`47`	`+ NotificationCenter.default.post(name: BagelNotifications.didUpdatePacket, object: nil, userInfo: ["packet": packet])`
	`48`	`+ }`
`45`	`49`	`}`
`46`	`50`
`47`		`- func addPacket(newPacket: BagelPacket) {`
	`51`	`+ @discardableResult`
	`52`	`+ func addPacket(newPacket: BagelPacket) -> Bool {`
`48`	`53`
`49`	`54`	`for projectController in self.projectControllers {`
`50`	`55`
`51`	`56`	`if projectController.projectName == newPacket.project?.projectName {`
`52`	`57`
`53`		`- projectController.addPacket(newPacket: newPacket)`
`54`		`- return`
	`58`	`+ return projectController.addPacket(newPacket: newPacket)`
`55`	`59`	`}`
`56`	`60`	`}`
`57`	`61`
`@@ -69,5 +73,7 @@ class BagelController: NSObject, BagelPublisherDelegate {`
`69`	`73`
`70`	`74`	`self.selectedProjectController = self.projectControllers.first`
`71`	`75`	`}`
	`76`	`+`
	`77`	`+ return true`
`72`	`78`	`}`
`73`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,15 @@ class BagelDeviceController: NSObject {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`- func addPacket(newPacket: BagelPacket) {`
	`24`	`+ @discardableResult`
	`25`	`+ func addPacket(newPacket: BagelPacket) -> Bool {`
`25`	`26`
`26`	`27`	`for packet in self.packets {`
`27`	`28`
`28`	`29`	`if packet.packetId == newPacket.packetId {`
`29`	`30`
`30`	`31`	`packet.requestInfo = newPacket.requestInfo`
`31`		`- return`
	`32`	`+ return false`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`
`@@ -40,6 +41,8 @@ class BagelDeviceController: NSObject {`
`40`	`41`
`41`	`42`	`self.selectedPacket = self.packets.first`
`42`	`43`	`}`
	`44`	`+`
	`45`	`+ return true`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`func clear() {`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ class BagelProjectController: NSObject {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`- func addPacket(newPacket: BagelPacket) {`
	`22`	`+ @discardableResult`
	`23`	`+ func addPacket(newPacket: BagelPacket) -> Bool {`
`23`	`24`
`24`	`25`	`for deviceController in self.deviceControllers {`
`25`	`26`
`26`	`27`	`if deviceController.deviceId == newPacket.device?.deviceId {`
`27`	`28`
`28`		`- deviceController.addPacket(newPacket: newPacket)`
`29`		`- return`
	`29`	`+ return deviceController.addPacket(newPacket: newPacket)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -44,5 +44,7 @@ class BagelProjectController: NSObject {`
`44`	`44`
`45`	`45`	`self.selectedDeviceController = self.deviceControllers.first`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ return true`
`47`	`49`	`}`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class BagelPacket: Codable {`
`16`	`16`
`17`	`17`	`var project: BagelProjectModel?`
`18`	`18`	`var device: BagelDeviceModel?`
	`19`	`+`
`19`	`20`	`}`
`20`	`21`
`21`	`22`