vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

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

pull/9739/head
Alexander Medvednikov 2021-04-15 06:27:24 +03:00
parent 3a134acc5a
commit a18f85c8cd
9 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/tools/gen_vc.v
View File

@ -148,7 +148,7 @@ fn new_gen_vc(flag_options FlagOptions) &GenVC {
} }
// WebhookServer init // 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()) mut fp := flag.new_flag_parser(os.args.clone())
flag_options := parse_flags(mut fp) flag_options := parse_flags(mut fp)
ws.gen_vc = new_gen_vc(flag_options) ws.gen_vc = new_gen_vc(flag_options)
@ -156,9 +156,11 @@ pub fn (mut ws WebhookServer) init_once() {
// ws.gen_vc = new_gen_vc(flag_options) // ws.gen_vc = new_gen_vc(flag_options)
} }
/*
pub fn (mut ws WebhookServer) init() { pub fn (mut ws WebhookServer) init() {
// ws.init_once() // ws.init_once()
} }
*/
pub fn (mut ws WebhookServer) index() { pub fn (mut ws WebhookServer) index() {
eprintln('WebhookServer.index() called') eprintln('WebhookServer.index() called')

2
examples/vweb/server_sent_events/server.v
View File

@ -14,7 +14,7 @@ fn main() {
vweb.run<App>(8081) 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.serve_static('/favicon.ico', 'favicon.ico', 'img/x-icon')
app.mount_static_folder_at(os.resource_abs_path('.'), '/') app.mount_static_folder_at(os.resource_abs_path('.'), '/')
} }

11
tutorials/building_a_simple_web_blog_with_vweb/README.md
View File

@ -73,11 +73,6 @@ pub fn (mut app App) index() vweb.Result {
return app.text('Hello world from vweb!') return app.text('Hello world from vweb!')
} }
pub fn (app &App) init() {
}
pub fn (app &App) init_once() {
}
``` ```
Run it with 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 ```v oksyntax
pub fn (mut app App) init_once() { pub fn (mut app App) init_server() {
db := sqlite.connect(':memory:') or { panic(err) } db := sqlite.connect(':memory:') or { panic(err) }
db.exec('create table `Article` (id integer primary key, title text default "", text text default "")') 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.")') 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. to have one DB connection for all requests.
Create a new file `article.v`: Create a new file `article.v`:

8
tutorials/building_a_simple_web_blog_with_vweb/code/blog/blog.v
View File

@ -8,7 +8,8 @@ import json
struct App { struct App {
vweb.Context vweb.Context
mut: mut:
db sqlite.DB db sqlite.DB [server_var]
user_id string
} }
fn main() { fn main() {
@ -31,7 +32,7 @@ pub fn (app &App) index() vweb.Result {
return $vweb.html() 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 = sqlite.connect('blog.db') or { panic(err) }
app.db.create_table('article', [ app.db.create_table('article', [
'id integer primary key', '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 { pub fn (mut app App) new() vweb.Result {

1
tutorials/building_a_simple_web_blog_with_vweb/code/blog/index.html
View File

@ -3,6 +3,7 @@
<title>V Blog</title> <title>V Blog</title>
</header> </header>
<body> <body>
user id = @app.user_id <br>
@for article in articles @for article in articles
<div> <div>
<b>@article.title</b> <br> <b>@article.title</b> <br>

6
vlib/v/checker/tests/fn_args.out
View File

@ -1,19 +1,19 @@
vlib/v/checker/tests/fn_args.vv:7:5: error: cannot use `&int` as `byte` in argument 1 to `u8` vlib/v/checker/tests/fn_args.vv:7:5: error: cannot use `&int` as `byte` in argument 1 to `u8`
5 | fn basic() { 5 | fn basic() {
6 | v := 4 6 | v := 4
7 | u8(&v) 7 | uu8(&v)
| ~~ | ~~
8 | arr([5]!) 8 | arr([5]!)
9 | fun(fn(i &int){}) 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` vlib/v/checker/tests/fn_args.vv:8:6: error: cannot use `[1]int` as `[]int` in argument 1 to `arr`
6 | v := 4 6 | v := 4
7 | u8(&v) 7 | uu8(&v)
8 | arr([5]!) 8 | arr([5]!)
| ~~~~ | ~~~~
9 | fun(fn(i &int){}) 9 | fun(fn(i &int){})
10 | } 10 | }
vlib/v/checker/tests/fn_args.vv:9:6: error: cannot use `fn (&int)` as `fn (int)` in argument 1 to `fun` 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]!) 8 | arr([5]!)
9 | fun(fn(i &int){}) 9 | fun(fn(i &int){})
| ~~~~~~~~~~~~ | ~~~~~~~~~~~~

4
vlib/v/checker/tests/fn_args.vv
View File

@ -1,10 +1,10 @@
fn u8(a byte) {} fn uu8(a byte) {}
fn arr(a []int) {} fn arr(a []int) {}
fn fun(a fn(int)) {} fn fun(a fn(int)) {}
fn basic() { fn basic() {
v := 4 v := 4
u8(&v) uu8(&v)
arr([5]!) arr([5]!)
fun(fn(i &int){}) fun(fn(i &int){})
} }

2
vlib/v/checker/tests/vweb_routing_checks.vv
View File

@ -27,6 +27,7 @@ pub fn (mut app App) cow() vweb.Result {
return app.html('works') return app.html('works')
} }
/*
pub fn (app App) init_once() { pub fn (app App) init_once() {
// //
} }
@ -34,6 +35,7 @@ pub fn (app App) init_once() {
pub fn (app App) init() { pub fn (app App) init() {
// //
} }
*/
pub fn (mut app App) index() { pub fn (mut app App) index() {
app.html('hello') app.html('hello')

12
vlib/vweb/vweb.v
View File

@ -79,11 +79,11 @@ struct MultiplePathAttributesError {
code int code int
} }
// declaring init_once in your App struct is optional // declaring init_server in your App struct is optional
pub fn (ctx Context) init_once() {} pub fn (ctx Context) init_server() {}
// declaring init in your App struct is optional // declaring before_request in your App struct is optional
pub fn (ctx Context) init() {} pub fn (ctx Context) before_request() {}
pub struct Cookie { pub struct Cookie {
name string name string
@ -295,7 +295,7 @@ pub fn run_app<T>(mut app T, port int) {
app.Context = Context{ app.Context = Context{
conn: 0 conn: 0
} }
app.init_once() app.init_server()
$for method in T.methods { $for method in T.methods {
$if method.return_type is Result { $if method.return_type is Result {
// check routes for validity // check routes for validity
@ -364,7 +364,7 @@ fn handle_conn<T>(mut conn net.TcpConn, mut app T) {
return return
} }
app.init() app.before_request()
// Call the right action // Call the right action
$if debug { $if debug {
println('route matching...') println('route matching...')