Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b58274a
fix compiler warnings
nickhingston Apr 20, 2018
6d01f54
update project settings (fix compiler warnings)
nickhingston Apr 22, 2018
7fc16d0
Merge pull request #1 from naimaudio/APP-1472
nickhingston Jun 21, 2018
f18b17b
Create CODEOWNERS
Jan 4, 2019
61168bc
Merge pull request #3 from naimaudio/stevewadsworth-patch-1
Jan 4, 2019
45b547b
APP-2203: [ios] Standardise indentation across iOS projects
garycnewell Jan 4, 2019
cb86039
APP-2720 fix compiler warnings
nickhingston May 7, 2019
d1733c2
APP-2737 remove primary event source
nickhingston May 9, 2019
cccc08d
Merge pull request #4 from naimaudio/APP-2737-ssekit-remove-primary-s…
nickhingston May 10, 2019
0062e12
APP-2737 make connect method public
nickhingston May 10, 2019
d1c8174
APP-2737 dont require closure on removeAllEventSources
nickhingston May 10, 2019
7573c57
APP-2737 fix issues with error states and add test cases
nickhingston May 10, 2019
4edf4ba
Merge pull request #5 from naimaudio/APP-2737-ssekit-remove-primary-s…
nickhingston May 10, 2019
10b6c8a
APP-2788 support swift5
nickhingston Jun 10, 2019
4aacec9
Reduced amount of default logging
Jun 13, 2019
b08e56d
Merge pull request #7 from naimaudio/tj-quieter-logs
tomjnaim Jun 18, 2019
e226202
Merge pull request #6 from naimaudio/APP-2788-swift5
nickhingston Jun 27, 2019
b2affd9
APP-3077 SSE event logging support
nickhingston Aug 27, 2019
40a3435
Merge pull request #8 from naimaudio/APP-3077-discovery-speed-issues
nickhingston Aug 27, 2019
535da5b
APP-4585 fix xcode 12 compiler warnings
nickhingston Nov 18, 2020
1d33147
Merge pull request #9 from naimaudio/APP-4585-xcode-12-settings
nickhingston Nov 19, 2020
d7bbb10
APP-5030 fix potential of SSEKit getting stuck in wrong state
nickhingston Feb 12, 2021
6f880e6
APP-5030 remove extra console logs
nickhingston Feb 12, 2021
d665860
Merge pull request #10 from naimaudio/APP-5030-connection-issues
nickhingston Feb 12, 2021
bb5f31c
APP-5893: SSEKit logging working.
JoshParadroid Oct 28, 2021
ba43c03
APP-5893: Added IP address into the log object.
JoshParadroid Nov 1, 2021
c4a9059
Merge pull request #11 from naimaudio/APP-5893-LeoKit-SSEKit-logging-…
JoshParadroid Nov 1, 2021
5e97cc4
APP-5893: Fixed missing unwrap.
JoshParadroid Nov 2, 2021
34ebf02
Merge pull request #12 from naimaudio/APP-5893-LeoKit-SSEKit-logging-…
JoshParadroid Nov 2, 2021
dceebbe
APP-5893: Changed shadowing issue and added dependency of NaimKit.
JoshParadroid Nov 2, 2021
257a5bb
Merge pull request #13 from naimaudio/APP-5893-LeoKit-SSEKit-logging-…
JoshParadroid Nov 2, 2021
42a703a
APP-6004 remove embedded NaimKit
nickhingston Nov 12, 2021
16188cb
Merge pull request #14 from naimaudio/APP-6004-NaimKit-issues
nickhingston Nov 12, 2021
a514716
APP-6121 builds with carthage --use-xcframeworks
nickhingston Dec 10, 2021
6544c66
APP-6121 don't embed NaimKit
nickhingston Dec 10, 2021
a912e25
Merge pull request #15 from naimaudio/xc-frameworks-build
nickhingston Dec 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @naimaudio/apps
42 changes: 21 additions & 21 deletions Playgrounds/Scratch.playground/Contents.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,51 @@ import UIKit

func extractValue(scanner: NSScanner) -> (String?, String?) {

var field: NSString?
scanner.scanUpToString(":", intoString: &field)
scanner.scanString(":", intoString: nil)
var field: NSString?
scanner.scanUpToString(":", intoString: &field)
scanner.scanString(":", intoString: nil)

var value: NSString?
scanner.scanUpToString("\n", intoString: &value)
var value: NSString?
scanner.scanUpToString("\n", intoString: &value)

return (field?.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), value?.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()))
return (field?.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), value?.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()))
}

func extractValue(forField field: String, scanner: NSScanner) -> String? {

scanner.scanUpToString(field, intoString: nil)
scanner.scanString(field, intoString: nil)
scanner.scanUpToString(field, intoString: nil)
scanner.scanString(field, intoString: nil)

var value: NSString?
scanner.scanUpToString("\n", intoString: &value)
var value: NSString?
scanner.scanUpToString("\n", intoString: &value)

return value as? String
return value as? String
}

var str = "id: 88e92600-e220-11e5-8f19-6b8864780aab\n\rdata: I'm busy"
var str2 = "id: 8ab35eb0-e220-11e5-8f19-6b8864780aab\n\revent: user-connected\n\rdata: Martin"

for event in [str, str2] {

let scanner = NSScanner(string: event as String)
scanner.charactersToBeSkipped = NSCharacterSet.whitespaceCharacterSet()
let scanner = NSScanner(string: event as String)
scanner.charactersToBeSkipped = NSCharacterSet.whitespaceCharacterSet()


// let identifier = extractValue(forField: "id:", scanner: scanner)
// let event = extractValue(forField: "event:", scanner: scanner)
// let data = extractValue(forField: "data:", scanner: scanner)

var entity: (String?, String?)
var entity: (String?, String?)

repeat {
repeat {

entity = extractValue(scanner)
entity = extractValue(scanner)

if entity.1 != nil {
print("\(entity.0!):\t\(entity.1!)")
}
if entity.1 != nil {
print("\(entity.0!):\t\(entity.1!)")
}

} while(entity.0 != nil && entity.1 != nil)
} while(entity.0 != nil && entity.1 != nil)


// let identifier = extractValue(scanner)
Expand All @@ -67,5 +67,5 @@ for event in [str, str2] {
// print("DATA:\t\(data.1!)")
// }

print("---------------------------------------------------------------")
print("---------------------------------------------------------------")
}
12 changes: 6 additions & 6 deletions Projects/MacSSE/MacSSE/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {



func applicationDidFinishLaunching(aNotification: NSNotification) {
// Insert code here to initialize your application
}
func applicationDidFinishLaunching(aNotification: NSNotification) {
// Insert code here to initialize your application
}

func applicationWillTerminate(aNotification: NSNotification) {
// Insert code here to tear down your application
}
func applicationWillTerminate(aNotification: NSNotification) {
// Insert code here to tear down your application
}


}
Expand Down
26 changes: 13 additions & 13 deletions Projects/MacSSE/MacSSE/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ import Cocoa

class ViewController: NSViewController {

@IBOutlet weak var logviewer: NSScrollView!
@IBOutlet weak var ipAddress: NSTextField!
@IBOutlet weak var logviewer: NSScrollView!
@IBOutlet weak var ipAddress: NSTextField!

override func viewDidLoad() {
super.viewDidLoad()
override func viewDidLoad() {
super.viewDidLoad()

// Do any additional setup after loading the view.
}
// Do any additional setup after loading the view.
}

override var representedObject: AnyObject? {
didSet {
// Update the view, if already loaded.
}
}
override var representedObject: AnyObject? {
didSet {
// Update the view, if already loaded.
}
}

@IBAction func onConnect(sender: NSButton) {
@IBAction func onConnect(sender: NSButton) {

}
}


}
Expand Down
Loading