vweb: minor fixes
Alexander Medvednikov
parent
fbd9fedbfb
commit
61bfecfa09
|
|
@ -13,10 +13,8 @@ pub mut:
|
|||
}
|
||||
|
||||
fn main() {
|
||||
mut app := App{}
|
||||
app.vweb = vweb.Context{}
|
||||
vweb.run(mut app, port)
|
||||
//vweb.run<App>(Port)
|
||||
println('noice')
|
||||
vweb.run<App>(port)
|
||||
}
|
||||
|
||||
pub fn (app mut App) init() {
|
||||
|
|
@ -32,6 +30,9 @@ pub fn (app mut App) index() {
|
|||
$vweb.html()
|
||||
}
|
||||
|
||||
pub fn (app mut App) reset() {
|
||||
}
|
||||
|
||||
pub fn (app mut App) text() {
|
||||
app.vweb.text('Hello world')
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1146,9 +1146,8 @@ pub fn vfmt(args []string) {
|
|||
exit(1)
|
||||
}
|
||||
println('WIP')
|
||||
/*
|
||||
vexe := vexe_path()
|
||||
//launch_tool('vfmt', '-d vfmt')
|
||||
// launch_tool('vfmt', '-d vfmt')
|
||||
vroot := os.dir(vexe)
|
||||
os.chdir(vroot)
|
||||
ret := os.system('$vexe -o $vroot/tools/vfmt -d vfmt v.v')
|
||||
|
|
@ -1156,10 +1155,10 @@ pub fn vfmt(args []string) {
|
|||
println('err')
|
||||
return
|
||||
}
|
||||
os.exec('$vroot/tools/vfmt $file') or { panic(err) }
|
||||
//if !os.exists('
|
||||
*/
|
||||
|
||||
os.exec('$vroot/tools/vfmt $file')or{
|
||||
panic(err)
|
||||
}
|
||||
// if !os.exists('
|
||||
}
|
||||
|
||||
pub fn create_symlink() {
|
||||
|
|
|
|||
|
|
@ -1584,6 +1584,7 @@ fn (p mut Parser) var_decl() {
|
|||
p.check(.comma)
|
||||
if p.tok == .key_mut {
|
||||
p.check(.key_mut)
|
||||
p.fspace()
|
||||
var_mut << true
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
225
vlib/vweb/vweb.v
225
vlib/vweb/vweb.v
|
|
@ -122,14 +122,26 @@ fn (ctx &Context) get_header(key string) string {
|
|||
return ctx.req.headers[key]
|
||||
}
|
||||
|
||||
//pub fn run<T>(port int) {
|
||||
pub fn run<T>(app mut T, port int) {
|
||||
//fn handle_conn(conn net.Socket) {
|
||||
//println('handle')
|
||||
|
||||
//}
|
||||
|
||||
pub fn foo<T>() {
|
||||
|
||||
}
|
||||
|
||||
pub fn run<T>(port int) {
|
||||
//pub fn run<T>(app mut T, port int) {
|
||||
println('Running a Vweb app on http://localhost:$port ...')
|
||||
l := net.listen(port) or { panic('failed to listen') }
|
||||
//mut app := T{}
|
||||
mut app := T{}
|
||||
app.vweb = Context{}
|
||||
app.init()
|
||||
//app.reset()
|
||||
for {
|
||||
conn := l.accept() or { panic('accept() failed') }
|
||||
handle_conn(conn, mut app)
|
||||
//foobar<T>()
|
||||
// TODO move this to handle_conn<T>(conn, app)
|
||||
//message := readall(conn)
|
||||
|
|
@ -153,119 +165,122 @@ pub fn run<T>(app mut T, port int) {
|
|||
continue
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
//first_line := strip(lines[0])
|
||||
first_line := conn.read_line()
|
||||
println('firstline="$first_line"')
|
||||
$if debug { println(first_line) }
|
||||
// Parse the first line
|
||||
// "GET / HTTP/1.1"
|
||||
//first_line := s.all_before('\n')
|
||||
vals := first_line.split(' ')
|
||||
if vals.len < 2 {
|
||||
println('no vals for http')
|
||||
conn.send_string(HTTP_500) or {}
|
||||
conn.close() or {}
|
||||
continue
|
||||
}
|
||||
mut headers := []string
|
||||
mut body := ''
|
||||
mut in_headers := true
|
||||
mut len := 0
|
||||
mut body_len := 0
|
||||
//for line in lines[1..] {
|
||||
for j := 0; j < 100; j++ {
|
||||
//println(j)
|
||||
line := conn.read_line()
|
||||
sline := strip(line)
|
||||
if sline == '' {
|
||||
//if in_headers {
|
||||
// End of headers, no body => exit
|
||||
if len == 0 {
|
||||
break
|
||||
}
|
||||
//} //else {
|
||||
// End of body
|
||||
//break
|
||||
//}
|
||||
//println('HHH')
|
||||
in_headers = false
|
||||
}
|
||||
if in_headers {
|
||||
//println(sline)
|
||||
headers << sline
|
||||
if sline.starts_with('Content-Length') {
|
||||
len = sline.all_after(': ').int()
|
||||
//println('GOT CL=$len')
|
||||
}
|
||||
} else {
|
||||
body += sline + '\r\n'
|
||||
body_len += body.len
|
||||
if body_len >= len {
|
||||
fn handle_conn<T>(conn net.Socket, app mut T) {
|
||||
//first_line := strip(lines[0])
|
||||
first_line := conn.read_line()
|
||||
println('firstline="$first_line"')
|
||||
$if debug { println(first_line) }
|
||||
// Parse the first line
|
||||
// "GET / HTTP/1.1"
|
||||
//first_line := s.all_before('\n')
|
||||
vals := first_line.split(' ')
|
||||
if vals.len < 2 {
|
||||
println('no vals for http')
|
||||
conn.send_string(HTTP_500) or {}
|
||||
conn.close() or {}
|
||||
return
|
||||
//continue
|
||||
}
|
||||
mut headers := []string
|
||||
mut body := ''
|
||||
mut in_headers := true
|
||||
mut len := 0
|
||||
mut body_len := 0
|
||||
//for line in lines[1..] {
|
||||
for j := 0; j < 100; j++ {
|
||||
//println(j)
|
||||
line := conn.read_line()
|
||||
sline := strip(line)
|
||||
if sline == '' {
|
||||
//if in_headers {
|
||||
// End of headers, no body => exit
|
||||
if len == 0 {
|
||||
break
|
||||
}
|
||||
//println('body:$body')
|
||||
//} //else {
|
||||
// End of body
|
||||
//break
|
||||
//}
|
||||
//println('HHH')
|
||||
in_headers = false
|
||||
}
|
||||
if in_headers {
|
||||
//println(sline)
|
||||
headers << sline
|
||||
if sline.starts_with('Content-Length') {
|
||||
len = sline.all_after(': ').int()
|
||||
//println('GOT CL=$len')
|
||||
}
|
||||
}
|
||||
|
||||
mut action := vals[1][1..].all_before('/')
|
||||
if action.contains('?') {
|
||||
action = action.all_before('?')
|
||||
}
|
||||
if action == '' {
|
||||
action = 'index'
|
||||
}
|
||||
req := http.Request{
|
||||
headers: http.parse_headers(headers) //s.split_into_lines())
|
||||
ws_func: 0
|
||||
user_ptr: 0
|
||||
method: vals[0]
|
||||
url: vals[1]
|
||||
}
|
||||
$if debug {
|
||||
println('req.headers = ')
|
||||
println(req.headers)
|
||||
println('vweb action = "$action"')
|
||||
}
|
||||
//mut app := T{
|
||||
app.vweb = Context{
|
||||
req: req
|
||||
conn: conn
|
||||
form: map[string]string
|
||||
static_files: map[string]string
|
||||
static_mime_types: map[string]string
|
||||
}
|
||||
//}
|
||||
if req.method in methods_with_form {
|
||||
body = strip(body)
|
||||
println('body="$body"' )
|
||||
app.vweb.parse_form(body)
|
||||
}
|
||||
if vals.len < 2 {
|
||||
$if debug {
|
||||
println('no vals for http')
|
||||
} else {
|
||||
body += sline + '\r\n'
|
||||
body_len += body.len
|
||||
if body_len >= len {
|
||||
break
|
||||
}
|
||||
conn.close() or {}
|
||||
continue
|
||||
//println('body:$body')
|
||||
}
|
||||
}
|
||||
|
||||
// Serve a static file if it's one
|
||||
// if app.vweb.handle_static() {
|
||||
// conn.close()
|
||||
// continue
|
||||
// }
|
||||
|
||||
// Call the right action
|
||||
mut action := vals[1][1..].all_before('/')
|
||||
if action.contains('?') {
|
||||
action = action.all_before('?')
|
||||
}
|
||||
if action == '' {
|
||||
action = 'index'
|
||||
}
|
||||
req := http.Request{
|
||||
headers: http.parse_headers(headers) //s.split_into_lines())
|
||||
ws_func: 0
|
||||
user_ptr: 0
|
||||
method: vals[0]
|
||||
url: vals[1]
|
||||
}
|
||||
$if debug {
|
||||
println('req.headers = ')
|
||||
println(req.headers)
|
||||
println('vweb action = "$action"')
|
||||
}
|
||||
//mut app := T{
|
||||
app.vweb = Context{
|
||||
req: req
|
||||
conn: conn
|
||||
form: map[string]string
|
||||
static_files: map[string]string
|
||||
static_mime_types: map[string]string
|
||||
}
|
||||
//}
|
||||
if req.method in methods_with_form {
|
||||
body = strip(body)
|
||||
println('body="$body"' )
|
||||
app.vweb.parse_form(body)
|
||||
}
|
||||
if vals.len < 2 {
|
||||
$if debug {
|
||||
println('action=$action')
|
||||
}
|
||||
app.$action() or {
|
||||
conn.send_string(HTTP_404) or {}
|
||||
println('no vals for http')
|
||||
}
|
||||
conn.close() or {}
|
||||
reset := 'reset'
|
||||
app.$reset()
|
||||
return
|
||||
//continue
|
||||
}
|
||||
|
||||
// Serve a static file if it's one
|
||||
// if app.vweb.handle_static() {
|
||||
// conn.close()
|
||||
// continue
|
||||
// }
|
||||
|
||||
// Call the right action
|
||||
$if debug {
|
||||
println('action=$action')
|
||||
}
|
||||
app.$action() or {
|
||||
conn.send_string(HTTP_404) or {}
|
||||
}
|
||||
conn.close() or {}
|
||||
app.reset()
|
||||
}
|
||||
|
||||
fn (ctx mut Context) parse_form(s string) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue