Fixes for new_async version of Jester.

captchas.nim

@@ -11,7 +11,7 @@ import cairo, os, strutils, jester
 proc getCaptchaFilename*(i: int): string {.inline.} =
   result = "public/captchas/capture_" & $i & ".png"
 
-proc getCaptchaUrl*(req: var TRequest, i: int): string =
+proc getCaptchaUrl*(req: PRequest, i: int): string =
   result = req.makeUri("/captchas/capture_" & $i & ".png", absolute = false)
 
 proc createCaptcha*(file, text: string) =

forum.nim

@@ -8,7 +8,7 @@
 
 import
   os, strutils, times, md5, strtabs, cgi, math, db_sqlite, matchers,
-  rst, rstgen, captchas, sockets, scgi, jester
+  rst, rstgen, captchas, scgi, jester, asyncdispatch, asyncnet
 
 from htmlgen import tr, th, td, span
 
@@ -33,7 +33,7 @@ type
   TPost = tuple[subject, content: string]
 
   TForumData = object of TSession
-    req: TRequest
+    req: PRequest
     userid: string
     actionContent: string
     errorMsg, loginErrorMsg: string
@@ -651,23 +651,24 @@ template createTFD(): stmt =
   if request.cookies.len > 0:
     checkLoggedIn(c)
 
-get "/":
+routes:
+  get "/":
     createTFD()
     c.isThreadsList = true
     var count = 0
     resp genMain(c, genThreadsList(c, count),
                  additionalHeaders = genRSSHeaders(c), showRssLinks = true)
 
-get "/threadActivity.xml":
+  get "/threadActivity.xml":
     createTFD()
     c.isThreadsList = true
     resp genThreadsRSS(c), "application/atom+xml"
 
-get "/postActivity.xml":
+  get "/postActivity.xml":
     createTFD()
     resp genPostsRSS(c), "application/atom+xml"
 
-get "/t/@threadid/?@page?/?":
+  get "/t/@threadid/?@page?/?":
     createTFD()
     parseInt(@"threadid", c.threadId, -1..1000_000)
     if @"page".len > 0:
@@ -705,7 +706,7 @@ get "/t/@threadid/?@page?/?":
       cond count != 0
       resp genMain(c, posts, pSubject & " - Nimrod Forum")
 
-get "/page/@page/?":
+  get "/page/@page/?":
     createTFD()
     c.isThreadsList = true
     cond (@"page" != "")
@@ -718,7 +719,7 @@ get "/page/@page/?":
     resp genMain(c, list, "Page " & $c.pageNum & " - Nimrod Forum",
                  genRSSHeaders(c), showRssLinks = true)
 
-get "/profile/@nick/?":
+  get "/profile/@nick/?":
     createTFD()
     cond (@"nick" != "")
     var userinfo: TUserInfo
@@ -728,45 +729,45 @@ get "/profile/@nick/?":
     else:
       halt()
 
-get "/login/?":
+  get "/login/?":
     createTFD()
     resp genMain(c, genFormLogin(c), "Log in - Nimrod Forum")
 
-get "/logout/?":
+  get "/logout/?":
     createTFD()
     logout(c)
     redirect(uri("/"))
 
-get "/register/?":
+  get "/register/?":
     createTFD()
     resp genMain(c, genFormRegister(c), "Register - Nimrod Forum")
 
-template readIDs(): stmt =
+  template readIDs(): stmt =
     # Retrieve the threadid, postid and pagenum
     if (@"threadid").len > 0:
       parseInt(@"threadid", c.threadId, -1..1000_000)
     if (@"postid").len > 0:
       parseInt(@"postid", c.postId, -1..1000_000)
 
-template finishLogin(): stmt = 
+  template finishLogin(): stmt = 
     setCookie("sid", c.userpass, daysForward(7))
     redirect(uri("/"))
 
-template handleError(action: string, topText: string, isEdit: bool): stmt =
+  template handleError(action: string, topText: string, isEdit: bool): stmt =
     if c.isPreview:
       body.add genPostPreview(c, @"subject", @"content", 
                               c.userName, $getGMTime(getTime()))
     body.add genFormPost(c, action, topText, reuseText, reuseText, isEdit)
     resp genMain(c, body(), "Nimrod Forum - Error")
 
-post "/dologin":
+  post "/dologin":
     createTFD()
     if login(c, @"name", @"password"):
       finishLogin()
     else:
       resp c.genMain(genFormLogin(c))
 
-post "/doregister":
+  post "/doregister":
     createTFD()
     if c.register(@"name", @"new_password", @"antibot", @"email"):
       discard c.login(@"name", @"new_password")
@@ -774,7 +775,7 @@ post "/doregister":
     else:
       resp c.genMain(genFormRegister(c))
 
-post "/donewthread":
+  post "/donewthread":
     createTFD()
     if newThread(c):
       redirect(uri("/"))
@@ -782,7 +783,7 @@ post "/donewthread":
       body = ""
       handleError("donewthread", "New thread", false)
 
-post "/doreply":
+  post "/doreply":
     createTFD()
     readIDs()
     if reply(c):
@@ -794,7 +795,7 @@ post "/doreply":
       body = genPostsList(c, $c.threadId, count)
       handleError("doreply", "Reply", false)
 
-post "/doedit":
+  post "/doedit":
     createTFD()
     readIDs()
     if edit(c, c.postId):
@@ -803,13 +804,13 @@ post "/doedit":
       body = ""
       handleError("doedit", "Edit", true)
 
-get "/newthread/?":
+  get "/newthread/?":
     createTFD()
     resp genMain(c, genFormPost(c, "donewthread", "New thread", "", "", false),
                  "New Thread - Nimrod Forum")
 
-const licenseRst = slurp("static/license.rst")
+  const licenseRst = slurp("static/license.rst")
-get "/license":
+  get "/license":
     createTFD()
     resp genMain(c, rstToHtml(licenseRst), "Content license - Nimrod Forum")
 
@@ -822,6 +823,11 @@ when isMainModule:
   if paramCount() > 0:
     if paramStr(1) == "scgi":
       http = false
-  run("", port = TPort(9000), http = http)
+  
+  #run("", port = TPort(9000), http = http)
+  var settings = newSettings()
+  settings.port = TPort(8080)
+  jester.serve(settings, match)
+  runForever()
   db.close()
 

nimforum.babel

@@ -0,0 +1,11 @@
+[Package]
+name          = "nimforum"
+version       = "0.1.0"
+author        = "Dominik Picheta"
+description   = "Nimrod forum"
+license       = "MIT"
+
+bin = "forum"
+
+[Deps]
+Requires: "nimrod >= 0.9.2, cairo#head, jester#head"

nimrod.cfg

@@ -3,4 +3,3 @@
 --path:"$nimrod/lib/packages/docutils"
 
 --path:"$nimrod"
---path:"../jester"