vweb: init_once() => init_server(); init() => before_request()

medvednikov · medvednikov · commit a18f85c8cd71 · 2021-04-15T06:27:24.000+03:00
diff --git a/cmd/tools/gen_vc.v b/cmd/tools/gen_vc.v
@@ -148,17 +148,19 @@ fn new_gen_vc(flag_options FlagOptions) &GenVC {
 }
 
 // WebhookServer init
-pub fn (mut ws WebhookServer) init_once() {
+pub fn (mut ws WebhookServer) init_server() {
 	mut fp := flag.new_flag_parser(os.args.clone())
 	flag_options := parse_flags(mut fp)
 	ws.gen_vc = new_gen_vc(flag_options)
 	ws.gen_vc.init()
 	// ws.gen_vc = new_gen_vc(flag_options)
 }
 
+/*
 pub fn (mut ws WebhookServer) init() {
 	// ws.init_once()
 }
+*/
 
 pub fn (mut ws WebhookServer) index() {
 	eprintln('WebhookServer.index() called')
diff --git a/examples/vweb/server_sent_events/server.v b/examples/vweb/server_sent_events/server.v
@@ -14,7 +14,7 @@ fn main() {
 	vweb.run<App>(8081)
 }
 
-pub fn (mut app App) init_once() {
+pub fn (mut app App) init_server() {
 	app.serve_static('/favicon.ico', 'favicon.ico', 'img/x-icon')
 	app.mount_static_folder_at(os.resource_abs_path('.'), '/')
 }
diff --git a/tutorials/building_a_simple_web_blog_with_vweb/README.md b/tutorials/building_a_simple_web_blog_with_vweb/README.md
@@ -73,11 +73,6 @@ pub fn (mut app App) index() vweb.Result {
 	return app.text('Hello world from vweb!')
 }
 
-pub fn (app &App) init() {
-}
-
-pub fn (app &App) init_once() {
-}
 ```
 
 Run it with
@@ -228,10 +223,10 @@ mut:
 
 
 
-Modify the `init_once()` method we created earlier to connect to a database:
+Add the `init_server()` method where we'll connect to a database:
 
 ```v oksyntax
-pub fn (mut app App) init_once() {
+pub fn (mut app App) init_server() {
 	db := sqlite.connect(':memory:') or { panic(err) }
 	db.exec('create table `Article` (id integer primary key, title text default "", text text default "")')
 	db.exec('insert into Article (title, text) values ("Hello, world!", "V is great.")')
@@ -240,7 +235,7 @@ pub fn (mut app App) init_once() {
 }
 ```
 
-Code in the `init_once()` function is run only once during app's startup, so we are going
+Code in the `init_server()` function is run only once during app's startup, so we are going
 to have one DB connection for all requests.
 
 Create a new file `article.v`:
diff --git a/tutorials/building_a_simple_web_blog_with_vweb/code/blog/blog.v b/tutorials/building_a_simple_web_blog_with_vweb/code/blog/blog.v
@@ -8,7 +8,8 @@ import json
 struct App {
 	vweb.Context
 mut:
-	db sqlite.DB
+	db      sqlite.DB [server_var]
+	user_id string
 }
 
 fn main() {
@@ -31,7 +32,7 @@ pub fn (app &App) index() vweb.Result {
 	return $vweb.html()
 }
 
-pub fn (mut app App) init_once() {
+pub fn (mut app App) init_server() {
 	app.db = sqlite.connect('blog.db') or { panic(err) }
 	app.db.create_table('article', [
 		'id integer primary key',
@@ -40,7 +41,8 @@ pub fn (mut app App) init_once() {
 	])
 }
 
-pub fn (mut app App) init() {
+pub fn (mut app App) before_request() {
+	app.user_id = app.get_cookie('id') or { '0' }
 }
 
 pub fn (mut app App) new() vweb.Result {
diff --git a/tutorials/building_a_simple_web_blog_with_vweb/code/blog/index.html b/tutorials/building_a_simple_web_blog_with_vweb/code/blog/index.html
@@ -3,6 +3,7 @@
 	<title>V Blog</title>
 </header>
 <body>
+    user id = @app.user_id <br>
 	@for article in articles
 		<div>
 			<b>@article.title</b> <br>
diff --git a/vlib/v/checker/tests/fn_args.out b/vlib/v/checker/tests/fn_args.out
@@ -1,19 +1,19 @@
 vlib/v/checker/tests/fn_args.vv:7:5: error: cannot use `&int` as `byte` in argument 1 to `u8`
     5 | fn basic() {
     6 |     v := 4
-    7 |     u8(&v)
+    7 |     uu8(&v)
       |        ~~
     8 |     arr([5]!)
     9 |     fun(fn(i &int){})
 vlib/v/checker/tests/fn_args.vv:8:6: error: cannot use `[1]int` as `[]int` in argument 1 to `arr`
     6 |     v := 4
-    7 |     u8(&v)
+    7 |     uu8(&v)
     8 |     arr([5]!)
       |         ~~~~
     9 |     fun(fn(i &int){})
    10 | }
 vlib/v/checker/tests/fn_args.vv:9:6: error: cannot use `fn (&int)` as `fn (int)` in argument 1 to `fun`
-    7 |     u8(&v)
+    7 |     uu8(&v)
     8 |     arr([5]!)
     9 |     fun(fn(i &int){})
       |         ~~~~~~~~~~~~
diff --git a/vlib/v/checker/tests/fn_args.vv b/vlib/v/checker/tests/fn_args.vv
@@ -1,10 +1,10 @@
-fn u8(a byte) {}
+fn uu8(a byte) {}
 fn arr(a []int) {}
 fn fun(a fn(int)) {}
 
 fn basic() {
 	v := 4
-	u8(&v)
+	uu8(&v)
 	arr([5]!)
 	fun(fn(i &int){})
 }
diff --git a/vlib/v/checker/tests/vweb_routing_checks.vv b/vlib/v/checker/tests/vweb_routing_checks.vv
@@ -27,13 +27,15 @@ pub fn (mut app App) cow() vweb.Result {
 	return app.html('works')
 }
 
+/*
 pub fn (app App) init_once() {
 	//
 }
 
 pub fn (app App) init() {
 	//
 }
+*/
 
 pub fn (mut app App) index() {
 	app.html('hello')
diff --git a/vlib/vweb/vweb.v b/vlib/vweb/vweb.v
@@ -79,11 +79,11 @@ struct MultiplePathAttributesError {
 	code int
 }
 
-// declaring init_once in your App struct is optional
-pub fn (ctx Context) init_once() {}
+// declaring init_server in your App struct is optional
+pub fn (ctx Context) init_server() {}
 
-// declaring init in your App struct is optional
-pub fn (ctx Context) init() {}
+// declaring before_request in your App struct is optional
+pub fn (ctx Context) before_request() {}
 
 pub struct Cookie {
 	name      string
@@ -295,7 +295,7 @@ pub fn run_app<T>(mut app T, port int) {
 	app.Context = Context{
 		conn: 0
 	}
-	app.init_once()
+	app.init_server()
 	$for method in T.methods {
 		$if method.return_type is Result {
 			// check routes for validity
@@ -364,7 +364,7 @@ fn handle_conn<T>(mut conn net.TcpConn, mut app T) {
 		return
 	}
 
-	app.init()
+	app.before_request()
 	// Call the right action
 	$if debug {
 		println('route matching...')

Original file line number	Diff line number	Diff line change
`@@ -148,17 +148,19 @@ fn new_gen_vc(flag_options FlagOptions) &GenVC {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`// WebhookServer init`
`151`		`-pub fn (mut ws WebhookServer) init_once() {`
	`151`	`+pub fn (mut ws WebhookServer) init_server() {`
`152`	`152`	`mut fp := flag.new_flag_parser(os.args.clone())`
`153`	`153`	`flag_options := parse_flags(mut fp)`
`154`	`154`	`ws.gen_vc = new_gen_vc(flag_options)`
`155`	`155`	`ws.gen_vc.init()`
`156`	`156`	`// ws.gen_vc = new_gen_vc(flag_options)`
`157`	`157`	`}`
`158`	`158`
	`159`	`+/*`
`159`	`160`	`pub fn (mut ws WebhookServer) init() {`
`160`	`161`	`// ws.init_once()`
`161`	`162`	`}`
	`163`	`+*/`
`162`	`164`
`163`	`165`	`pub fn (mut ws WebhookServer) index() {`
`164`	`166`	`eprintln('WebhookServer.index() called')`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ fn main() {`
`14`	`14`	`vweb.run<App>(8081)`
`15`	`15`	`}`
`16`	`16`
`17`		`-pub fn (mut app App) init_once() {`
	`17`	`+pub fn (mut app App) init_server() {`
`18`	`18`	`app.serve_static('/favicon.ico', 'favicon.ico', 'img/x-icon')`
`19`	`19`	`app.mount_static_folder_at(os.resource_abs_path('.'), '/')`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ import json`
`8`	`8`	`struct App {`
`9`	`9`	`vweb.Context`
`10`	`10`	`mut:`
`11`		`- db sqlite.DB`
	`11`	`+ db sqlite.DB [server_var]`
	`12`	`+ user_id string`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`fn main() {`
`@@ -31,7 +32,7 @@ pub fn (app &App) index() vweb.Result {`
`31`	`32`	`return $vweb.html()`
`32`	`33`	`}`
`33`	`34`
`34`		`-pub fn (mut app App) init_once() {`
	`35`	`+pub fn (mut app App) init_server() {`
`35`	`36`	`app.db = sqlite.connect('blog.db') or { panic(err) }`
`36`	`37`	`app.db.create_table('article', [`
`37`	`38`	`'id integer primary key',`
`@@ -40,7 +41,8 @@ pub fn (mut app App) init_once() {`
`40`	`41`	`])`
`41`	`42`	`}`
`42`	`43`
`43`		`-pub fn (mut app App) init() {`
	`44`	`+pub fn (mut app App) before_request() {`
	`45`	`+ app.user_id = app.get_cookie('id') or { '0' }`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`pub fn (mut app App) new() vweb.Result {`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,15 @@ pub fn (mut app App) cow() vweb.Result {`
`27`	`27`	`return app.html('works')`
`28`	`28`	`}`
`29`	`29`
	`30`	`+/*`
`30`	`31`	`pub fn (app App) init_once() {`
`31`	`32`	`//`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`pub fn (app App) init() {`
`35`	`36`	`//`
`36`	`37`	`}`
	`38`	`+*/`
`37`	`39`
`38`	`40`	`pub fn (mut app App) index() {`
`39`	`41`	`app.html('hello')`