Skip to content

Async handling; Controller protocol; Path/handler conveniences #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
namolnad wants to merge 9 commits into
base: stable
Choose a base branch
from
Open

Async handling; Controller protocol; Path/handler conveniences #526

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7137ef3
Update Package.swift; support only macOS 10.15+
namolnad Jun 2, 2022
7f8c152
Update files to fix navigating through dirs
namolnad Jun 2, 2022
b5f01d9
Update Router/Server/ServerIO
namolnad Jun 2, 2022
4324a05
Fix test compilation
namolnad Jun 2, 2022
86cfa20
Excluce DemoServer from Swifter package
namolnad Jun 2, 2022
cb8d7cf
Add Controller protocol and convenience subscript
namolnad Jun 6, 2022
b9953ce
Allow multiple paths to be registered w/ same handler
namolnad Jun 30, 2022
3ff32c0
Drop ":" from variable/param name
namolnad Jul 31, 2022
a51ae97
Update Xcode and Swift versions
namolnad Jul 31, 2022
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
Prev Previous commit
Next Next commit
Drop ":" from variable/param name
  • Loading branch information
@namolnad
namolnad committed Jul 31, 2022
commit 3ff32c046a654259b5eda827158be254db99cb88
7 changes: 4 additions & 3 deletions Xcode/Sources/HttpRouter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,20 +125,21 @@ open class HttpRouter {
var currentIndex = index + 1
let variableNodes = node.nodes.filter { $0.0.first == ":" }
if let variableNode = variableNodes.first {
let paramName = String(variableNode.0.dropFirst())
if currentIndex == count && variableNode.1.isEndOfRoute {
// if it's the last element of the pattern and it's a variable, stop the search and
// append a tail as a value for the variable.
let tail = pattern[currentIndex..<count].joined(separator: "/")
if tail.count > 0 {
params[variableNode.0] = pathToken + "/" + tail
params[paramName] = pathToken + "/" + tail
} else {
params[variableNode.0] = pathToken
params[paramName] = pathToken
}

matchedNodes.append(variableNode.value)
return
}
params[variableNode.0] = pathToken
params[paramName] = pathToken
findHandler(&node.nodes[variableNode.0]!, params: &params, pattern: pattern, matchedNodes: &matchedNodes, index: currentIndex, count: count)
}

Expand Down