Просмотр исходного кода

Files handler is set in demoServer() method.

Damian Kołakowski 11 лет назад
Родитель
Сommit
19d5c3b0fb

+ 4 - 1
Common/DemoServer.swift

@@ -8,8 +8,11 @@
 
 import Foundation
 
-func demoServer() -> HttpServer {
+func demoServer(publicDir: String?) -> HttpServer {
     let server = HttpServer()
+    if let publicDir = publicDir {
+        server["/resources/(.+)"] = HttpHandlers.directory(publicDir)
+    }
     server["/test"] = { request in
         var headersInfo = ""
         for (name, value) in request.headers {

BIN
Swifter.xcodeproj/project.xcworkspace/xcuserdata/damiankolakowski.xcuserdatad/UserInterfaceState.xcuserstate


+ 21 - 5
Swifter.xcodeproj/xcuserdata/damiankolakowski.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -439,7 +439,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "101"
             endingLineNumber = "101"
-            landmarkName = "captureGroups(_:value:)"
+            landmarkName = "captureExpressionGroups(_:value:)"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -450,14 +450,30 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Common/DemoServer.swift"
-            timestampString = "437682434.3778"
+            timestampString = "437682950.226404"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "43"
-            endingLineNumber = "43"
-            landmarkName = "demoServer()"
+            startingLineNumber = "46"
+            endingLineNumber = "46"
+            landmarkName = "demoServer(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Common/HttpServer.swift"
+            timestampString = "437682692.747736"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "76"
+            endingLineNumber = "76"
+            landmarkName = "start(listenPort:error:)"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 4 - 5
Swifter/AppDelegate.swift

@@ -13,14 +13,13 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     
     var window: UIWindow?
-    let server = demoServer()
+    var server: HttpServer?
     
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: NSDictionary?) -> Bool {
-        if let resDir = NSBundle.mainBundle().resourcePath {
-            server["/resources/(.+)"] = HttpHandlers.directory(resDir)
-        }
+        let server = demoServer(NSBundle.mainBundle().resourcePath)
+        self.server = server
         var error: NSError?
-        if !server.start(error: &error) {
+        if server.start(error: &error) {
             println("Server start error: \(error)")
         }
         return true

+ 1 - 3
SwifterOSX/main.swift

@@ -8,9 +8,7 @@
 
 import Foundation
 
-let server = demoServer()
-
-server["/resources/(.+)"] = HttpHandlers.directory("~/")
+let server = demoServer("~/")
 
 var error: NSError?